lijj 2 gadi atpakaļ
vecāks
revīzija
171013703e

+ 1 - 1
admin/src/main/java/org/springblade/modules/ycwh/controller/pc/InformationInfoController.java

@@ -82,7 +82,7 @@ public class InformationInfoController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入informationInfo")
 	public R<IPage<InformationInfoVO>> list(@ApiIgnore @RequestParam Map<String, Object> informationInfo, Query query) {
-		IPage<InformationInfoEntity> pages = informationInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(informationInfo, InformationInfoEntity.class));
+		IPage<InformationInfoEntity> pages = informationInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(informationInfo, InformationInfoEntity.class).orderByAsc("sort"));
 		return R.data(InformationInfoWrapper.build().pageVO(pages));
 	}
 

+ 1 - 1
admin/src/main/java/org/springblade/modules/ycwh/controller/wx/WXInformationController.java

@@ -86,7 +86,7 @@ public class WXInformationController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入informationInfo")
 	public R<IPage<InformationInfoVO>> list(@ApiIgnore @RequestParam Map<String, Object> informationInfo, Query query) {
-		IPage<InformationInfoEntity> pages = informationInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(informationInfo, InformationInfoEntity.class));
+		IPage<InformationInfoEntity> pages = informationInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(informationInfo, InformationInfoEntity.class).orderByAsc("sort"));
 		/** 列表置空content */
 		pages.getRecords().stream().forEach(e -> e.setContent(null));
 		return R.data(InformationInfoWrapper.build().pageVO(pages));

+ 1 - 1
admin_ui/src/axios.js

@@ -19,7 +19,7 @@ import { Base64 } from 'js-base64';
 import { baseUrl } from '@/config/env';
 import crypto from '@/utils/crypto';
 
-axios.defaults.timeout = 10000;
+axios.defaults.timeout = 30000;
 //返回其他状态吗
 axios.defaults.validateStatus = function (status) {
   return status >= 200 && status <= 500; // 默认的

+ 26 - 5
miniapp/pages/yuecai/home/index.vue

@@ -45,14 +45,17 @@
 
       </view>
       <view class="info-list">
-        <view class="dis-flex flex-x-between info-item" v-for="(item, index) in list" :key="index"  @click="goDetail(item.id)">
+        <view class="dis-flex flex-x-between info-item" v-for="(item, index) in list" :key="index"
+          @click="goDetail(item.id)">
           <view class="info-pic">
             <u-image width="96px" height="96px" mode="aspectFill" :src="item.cover"></u-image>
           </view>
           <view class="info-view">
             <view class="info-title">
-              {{item.subTitle}}
+              {{item.title}}
             </view>
+            <!-- <view class="info-subTitle" v-html="item.subTitle"></view> -->
+            <text class="info-subTitle">{{item.subTitle}}</text>
             <view class="dis-flex info-bottom">
               <view style="margin-right: 20rpx;">{{item.createTime?item.createTime.substring(0,10):''}}</view>
               <u-icon name="thumb-up" color="#7f7f7f" size="18"></u-icon>
@@ -250,13 +253,13 @@
       .info-view {
         width: calc(100% - 105px);
 
-        .info-title {
-          height: 75px;
+        .info-subTitle {
+          height: 50px;
           word-break: break-all;
           color: #65371b;
           font-size: 24rpx;
           font-weight: 300;
-          line-height: 47rpx;
+          line-height: 34rpx;
           word-spacing: 2rpx;
           overflow: hidden;
           text-overflow: -o-ellipsis-lastline;
@@ -268,6 +271,24 @@
           -webkit-box-orient: vertical;
         }
 
+        .info-title {
+          height: 50rpx;
+          word-break: break-all;
+          color: #65371b;
+          font-size: 24rpx;
+          font-weight: bold;
+          line-height: 50rpx;
+          word-spacing: 2rpx;
+          overflow: hidden;
+          text-overflow: -o-ellipsis-lastline;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 1;
+          line-clamp: 1;
+          -webkit-box-orient: vertical;
+        }
+
         .info-bottom {
           color: #7f7f7f;
           font-size: 24rpx;