From 792332be8f416a78cec63bdb5538c8a37c3711b1 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@yolipai.com>
Date: Mon, 25 May 2020 09:33:29 +0800
Subject: [PATCH] 优化分页控件

---
 pages/goods/categoryList/categoryList.js   |  2 +-
 pages/goods/categoryList/categoryList.wxml |  9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 55911da..94a2517 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -768,7 +768,7 @@ Page({
                     console.log("dataArray[index + 1] = undefined")
                     s.setData({
                       stylePage: 1,
-                      msgStatus: false,
+                      msgStatus: true,
                       lastMsg: true
                     });
                   }else{
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index f4eacaf..cf0e781 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -461,13 +461,12 @@
                     </view>
                     <view class="no-data" wx:if="{{msgStatus == true}}">
                       <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
-                      <view class="no-data-title">该类别暂无推荐商品 {{countDownNum}} 秒后自动跳到下一个类别</view>
+
+                      <view wx:if="{{msgStatus == true && lastMsg == false}}" class="no-data-title">该类别暂无推荐商品 {{countDownNum}} 秒后自动跳到下一个类别</view>
+                      <view wx:elif="{{lastMsg == true && msgStatus == true}}" class="no-data-title">该类别暂无推荐商品</view>
                       <!-- <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator> -->
                     </view>
-                    <view class="no-data" wx:if="{{lastMsg == true}}">
-                      <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
-                      <view class="no-data-title">该类别暂无推荐商品</view>
-                    </view>
+                    
                 </scroll-view>
                 <!-- /goodslist -->
               </view>
--
libgit2 0.21.4