From 834ca25f2300d612ad12ddf8717776ba5392072f Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 24 Sep 2021 15:20:30 +0800
Subject: [PATCH] no message

---
 pages/home/index/index.js      |  1 +
 pages/mall/fragment/index.js   | 15 ++++++---------
 pages/mall/fragment/index.wxml | 21 +++++++++++++--------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index c223f51..ef4f9da 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -67,6 +67,7 @@ Component({
         return
       }
       getBaseInfo().then(result => {
+        app.globalData.userInfo = result.data
         var nickname = ''
         if (app.globalData.userInfo.isAuth) {
           nickname = result.data.realName.substring(0, 14)
diff --git a/pages/mall/fragment/index.js b/pages/mall/fragment/index.js
index b12e937..3d14831 100644
--- a/pages/mall/fragment/index.js
+++ b/pages/mall/fragment/index.js
@@ -29,15 +29,15 @@ Component({
     momentList: [],
     tabList: [],
     tabIndex: 0,
-    requesting: false,
+    requesting: true,
     orderList: [],
     popover: false,
     sortList: [
-      {sort: 1, text: '更新时间'}, 
-      {sort: 2, text: '价格升序'}, 
-      {sort: 3, text: '价格降序'}, 
-      {sort: 4, text: '排队升序'},
-      {sort: 5, text: '排队降序'}
+      {sort: 0, text: '更新时间'}, 
+      {sort: 1, text: '价格升序'}, 
+      {sort: 2, text: '价格降序'}, 
+      {sort: 3, text: '排队升序'},
+      {sort: 4, text: '排队降序'}
     ],
     sortIndex: 0,
     messageNumber: 0
@@ -159,9 +159,6 @@ Component({
     },
     //*************************************************fetchAgentList************************************************//
     fetchAgentList: function () {
-      if (this.data.requesting) {
-        return
-      }
       this.setData({ requesting: true, orderList: [] })
       getMomentList(form).then(result => {
         if (result.data.records.length) {
diff --git a/pages/mall/fragment/index.wxml b/pages/mall/fragment/index.wxml
index a9b2e3b..4e72142 100644
--- a/pages/mall/fragment/index.wxml
+++ b/pages/mall/fragment/index.wxml
@@ -78,20 +78,25 @@
 			<wux-tabi tab-data="{{tabList}}" tab-index="{{tabIndex}}" disable="{{requesting}}" padding="{{12}}" line-height="{{3}}" bind:change="onTabChange"></wux-tabi>
 		</view>
 	</view>
-	<wux-skeleton active wx:if="{{!orderList.length}}">
+	<wux-skeleton active wx:if="{{requesting}}">
 		<view class="flex bg-white" style="padding: 24rpx">
 			<wux-skeleton-paragraph rounded rows="10" wux-class="case3-class" />
 		</view>
 	</wux-skeleton>
-	<view wx:for="{{orderList}}" wx:key="index">
-		<view class="bg-white" style="padding: 0rpx 32rpx" wx:if="{{index != 0 }}">
-			<wux-divider show-text="{{ false }}"></wux-divider>
+	<view wx:elif="{{orderList.length}}">
+		<view wx:for="{{orderList}}" wx:key="index">
+			<view class="bg-white" style="padding: 0rpx 32rpx" wx:if="{{index != 0 }}">
+				<wux-divider show-text="{{ false }}"></wux-divider>
+			</view>
+			<information-item item="{{item}}"></information-item>
+		</view>
+		<view class="flex flex-center" style="padding: 24rpx;">
+			<wux-button id="moment" outline type="stable" size="small" bind:click="gridTap">查看更多行情</wux-button>
 		</view>
-		<information-item item="{{item}}"></information-item>
 	</view>
-	<view class="flex flex-center" style="padding: 24rpx;" wx:if="{{orderList.length}}">
-	  <wux-button id="moment" outline type="stable" size="small" bind:click="gridTap">查看更多行情</wux-button>
+	<view class="bg-white list-empty" style="height: 480rpx;margin-bottom: 24rpx;border-radius: 0rpx 0rpx 24rpx 24rpx" wx:else>
+		<image class="img-empty" src="/assets/image/list_empty.png"></image>
+		<view class="text-empty">暂无数据</view>
 	</view>
-	<view style="height: 24rpx;" wx:else></view>
 
 </scroll-view>
\ No newline at end of file