加载页优化

pages/agent/fragment/index.js

@@ -76,6 +76,13 @@ Component({
       } else if(message.what == 888){
         this.setData({ orderList: [], tabIndex: this.data.tabIndex, ['form.pageNum']: 1, loading: true, finished: false })
         this.fetchPapersList()
+        if(app.globalData.userInfo){
+          hasActivity().then(result => {
+            this.setData({ hasActivity: result.data })
+          })
+        } else {
+          this.setData({ hasActivity: false })
+        }
       }
     },
     searchList: function(){
@@ -127,7 +134,7 @@ Component({
       if (this.data.requesting || this.data.finished) {
         return
       }
-      this.setData({ requesting: true })
+      this.data.requesting = true
       getFactoryPrice(this.data.form).then(result => {
         if (result.data.records.length) {
           var respList = result.data.records
@@ -135,30 +142,14 @@ Component({
           var num = result.data.current
           var finished = result.data.current >= result.data.pages
           if (this.data.form.pageNum == 1) {
-            this.setData({
-              [nowList]: respList,
-              total: result.data.total,
-              ['form.pageNum']: (num + 1),
-              top: 0,
-              finished,
-              requesting: false,
-              loading: false
-            })
+            this.setData({[nowList]: respList,total: result.data.total,['form.pageNum']: (num + 1),top: 0,finished,requesting: false,loading: false})
           } else {
-            this.setData({
-              [nowList]: respList,
-              total: result.data.total,
-              ['form.pageNum']: (num + 1),
-              finished,
-              requesting: false,
-              loading: false
-            })
+            this.setData({ [nowList]: respList, total: result.data.total, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false })
           }
         } else {
           this.setData({ requesting: false, finished: true, loading: false, })
         }
       }).catch(err => {
-        //异常回调
         this.setData({ requesting: false, finished: true, loading: false, })
       })
     }

pages/agent/fragment/index.json

@@ -2,7 +2,6 @@
   "component": true,
   "usingComponents": {
     "wux-skeleton": "/components/skeleton/index",
-    "wux-skeleton-avatar": "/components/skeleton-avatar/index",
     "wux-skeleton-paragraph": "/components/skeleton-paragraph/index",
     "wux-button": "/components/button/index",
     "refresh-view": "/components/refresher/index",

pages/agent/fragment/index.wxml

@@ -17,13 +17,21 @@
 		<text class="cuIcon-right text-blue" style="padding-top: 4rpx;"></text>
 	</view>
 </view>
-<view class="bg-white" style="height: 90rpx;" wx:else></view>
+<wux-skeleton active wx:else>
+	<view class="flex bg-white" style="height: 90rpx;padding:32rpx">
+		<wux-skeleton-paragraph rounded rows="1" wux-class="case3-class" />
+	</view>
+</wux-skeleton>
 
 <refresh-view bind:refresh="onRefreshList" height="{{height}}" triggered="{{requesting}}" scrollTop="{{top}}" bind:scrolltolower="fetchPapersList">
-	<view class="bg-white list-empty" style="height:{{height}}rpx" wx:if="{{!orderList.length}}">
-		<view class="load-spinner text-gray" style="margin-bottom:24px" wx:if="{{loading}}" />
-		<image class="img-empty" src="/assets/image/list_empty.png" wx:else></image>
-		<view class="text-empty">{{loading? '正在加载' : '暂无数据'}}</view>
+	<wux-skeleton active wx:if="{{loading}}">
+		<view class="flex bg-white" style="height:{{height}}rpx;padding:32rpx">
+			<wux-skeleton-paragraph rounded rows="12" wux-class="case3-class" />
+		</view>
+	</wux-skeleton>
+	<view class="bg-white list-empty" style="height:{{height}}rpx" bindtap="onRefreshList" wx:elif="{{!orderList.length && !loading}}">
+		<image class="img-empty" src="/assets/image/list_empty.png"></image>
+		<view class="text-empty">暂无数据，点击重新加载</view>
 	</view>
 	<view wx:else>
 		<view class="bg-white" wx:if="{{hasActivity}}" bindtap="toAbility">

pages/agent/fragment/index.wxss

@@ -1,4 +1,8 @@
 /* pages/agent/index/index.wxss */
 .top-bg{
   background-image: linear-gradient(127deg, rgba(0,122,255,0.67) 0%, rgba(13,100,227,0.95) 100%);
+}
+
+.case3-class {
+  width: 680rpx;
 }

pages/moment/moment-item/index.js

@@ -35,8 +35,8 @@ Component({
         return
       }
       this.setData({ loading: true })
-      userPushFollowMill({ paperMillId: 1, follow: true }).then(result => {
-        this.setData({ loading: false })
+      userPushFollowMill({ paperMillId: this.data.item.paperMillId, follow: !this.data.item.hasFollowed }).then(result => {
+        this.setData({ loading: false, ['item.hasFollowed']: !this.data.item.hasFollowed })
       }).catch(err => {
         this.setData({ loading: false })
       })

pages/moment/moment-item/index.wxml

@@ -1,8 +1,8 @@
 <!--pages/main/index.wxml-->
-<view style="height: 64rpx;line-height: 64rpx;text-align: center;background-color: #F7F8FA;color: #888888;">明天(2021-09-15)</view>
+<view style="height: 64rpx;line-height: 64rpx;text-align: center;background-color: #F7F8FA;color: #888888;" wx:if="{{item.tipsTime}}">{{item.tipsTime}}</view>
 <view class="bg-white flex flex-justify" style="padding:18rpx 24rpx">
   <view style="width: 25%;">
-	  <view class="text-df text-black text-cut">东莞金洲</view>
+	  <view class="text-df text-black text-cut">{{item.shortName}}</view>
 		<!-- <view class="attention-bg" bindtap="onAttentionChange">
 			<text class="{{item.hasFollowed ? 'text-blue' : 'text-red'}}">{{item.hasFollowed ? '关注' : '已关注'}}</text>
 		</view> -->
@@ -10,13 +10,13 @@
 	</view>
 	<view style="width: 35%;">
 	  <view class="flex flex-center">
-		  <text class="text-lg text-red">2560</text>
+		  <text class="text-lg text-red">{{item.typicalFloatingQuotedPrice}}</text>
 			<text class="cuIcon-refresharrow text-red" style="font-size:12px;margin-left: 4rpx;"></text>
 		</view>
 		<view class="text-gray text-sm" style="margin-top: 4rpx;text-align: center">更新时间09-09</view>
 	</view>
-	<view style="flex: 1;">+20</view>
-	<view style="flex: 1;">+20</view>
+	<view style="flex: 1;">{{item.retainedReceivedQuantity || '- -'}}</view>
+	<view style="flex: 1;">{{item.startDeductionPoints}}</view>
 	<text class="cuIcon-triangle{{unflod ? 'upfill': 'downfill'}}" style="font-size:48rpx;padding-top: 4rpx;color: #ccc;" bindtap="onFlodTap"></text>
 </view>
 <view style="display: {{ unflod ? 'block' : 'none'}};padding:16rpx 24rpx;">

pages/moment/recommend/index.js

@@ -71,12 +71,31 @@ Component({
       getInformationList(this.data.form).then(result => {
         if (result.data && result.data.records.length) {
           var respList = result.data.records
+          var lastTime = null
+          // 对返回的消息列表进行处理，将同一天的消息显示在一起
+          for (let i = 0; i < respList.length; i++) {
+            if (util.isEmpty(lastTime)) {
+              lastTime = respList[i].latestQuoteTime
+              if (lastTime.length > 10) {
+                lastTime = lastTime.substring(0, 10)
+              }
+              respList[i].tipsTime = lastTime
+            } else {
+              var itemTime = respList[i].latestQuoteTime
+              if (itemTime.length > 10) {
+                itemTime = itemTime.substring(0, 10)
+              }
+              if (lastTime !== itemTime) {
+                respList[i].tipsTime = itemTime
+              }
+              lastTime = itemTime
+            }
+          }
           let nowList = `orderList[${this.data.orderList.length}]`
           var num = this.data.form.pageNum
           var finished = this.data.form.pageNum >= result.data.pages
           this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false, token: this.data.token })
         } else {
-          
           this.setData({ finished: true, requesting: false, loading: false, token: this.data.token })
         }
       }).catch(err => {