From a7360293dd89dd3522d9ec0ac177befad9b4da89 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 29 Dec 2020 18:35:07 +0800
Subject: [PATCH] 商品分类的分享朋友券，  下拉到最后一个分类的时候的bug修复

---
 pages/goods/categoryList/categoryList.js   | 60 ++++++++++++++++++++++++++++++++++--------------------------
 pages/goods/categoryList/categoryList.wxml |  6 +++++-
 2 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 1b7fe42..b593a25 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -819,7 +819,7 @@ Page({
   // },
   // 左侧更新
   scrollLower: function (data) {
-    //console.log("上拉加载更多", JSON.stringify(data))
+    if(this.data.is_no_more) return false;
     var that = this;
     clearInterval(that.data.timer);
     that.setData({
@@ -843,18 +843,17 @@ Page({
         });
         if (e.data.data.pageData.length > 0) {
           s.setData({
-            msgStatus: false,
+            msgStatus: false,is_no_more:0
           });
           //如果有数据 判断分页为第一页的时候直接渲染数据
           if (page > 1) {
             //如果分页不是在第一页 那么就把返回的数据追加到原有数据后面
             var arr = s.data.requestData
-            console.log("arr:=" + JSON.stringify(arr))
-            
+          
             for (var i = 0; i < e.data.data.pageData.length;i++){
               arr.push(e.data.data.pageData[i]);
             }
-            console.log(arr)
+            
             s.setData({
               requestData: arr
             });
@@ -875,19 +874,28 @@ Page({
           if (page != 1) {
             var dataArray = s.data.one_level_classify
             var index = s.data.index
-            dataArray[index]['items']['is_show_class'] = false
-            dataArray[index+1]['items']['is_show_class'] = true
-            console.log(dataArray[index + 1]['items'])
-            s.setData({
-              msgStatus: true,
-              stylePage: 1,
-              index: index + 1,
-              select_classify_on: index + 1,
-              cat_id: dataArray[index + 1]['items']['id'],
-              classify_name: dataArray[index + 1]['items']['name'],
-              one_level_classify: dataArray
-            });
-            s.style(s.data.stylePage, dataArray[index + 1]['items']['id'])
+            dataArray[index]['items']['is_show_class'] = false		
+			//没有下一个类别的时候
+			if(index+1>=dataArray.length){
+				s.setData({is_no_more:1});
+			}else{
+				dataArray[index+1]['items']['is_show_class'] = true
+				console.log(dataArray[index + 1]['items'])
+				s.setData({
+				  msgStatus: true,
+				  stylePage: 1,
+				  index: index + 1,
+				  select_classify_on: index + 1,
+				  cat_id: dataArray[index + 1]['items']['id'],
+				  classify_name: dataArray[index + 1]['items']['name'],
+				  one_level_classify: dataArray,
+				  is_no_more:0
+				});
+				s.style(s.data.stylePage, dataArray[index + 1]['items']['id'])
+			}
+			
+			
+            
           }else{
             //没有数据而且是第一页的时候
             s.setData({
@@ -897,7 +905,8 @@ Page({
             s.setData({
               msgStatus: true,
               countDownNum: countDownNum,
-              requestData: []
+              requestData: [],
+			  is_no_more:0,
             });
             s.data.timer=setInterval(function () {
               if (countDownNum == 0) {
@@ -1013,12 +1022,11 @@ Page({
   		  if(url[0]!='/') url='/'+url;
   		  getApp().goto(url);
    },
-	 
-	
-	onShareTimeline() {
-		return {
-			title: '商品分类-' + getApp().globalData.config.store_name,
-		}
-	},
+   
+   onShareTimeline(){
+	    return {
+		   title:'商品分类-'+getApp().globalData.config.store_name,
+	   }
+   }
 
 });
\ No newline at end of file
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index d325ce6..0c29be4 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -493,6 +493,9 @@
                             </block>
                           </view>
                       </navigator>
+					  <!-- 暂无更多 -->
+					  <view style="height: 30rpx;line-height: 30rpx;margin-top: 20rpx;font-size: 25rpx; text-align: center;" 
+					        wx:if="{{is_no_more}}">暂无更多</view>					  
                     </view>
                     <view class="no-data" wx:if="{{msgStatus == true}}">
                       <!-- <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image> -->
@@ -500,8 +503,9 @@
                       <view wx:if="{{msgStatus == true && lastMsg == false}}" class="no-data-title" style="text-align:center;margin-top:100px">
                       <view style="color:#444;line-height:30px;">该类别暂无推荐商品</view><view style="color:#444;line-height:30px;"> {{countDownNum}} 秒后自动跳到下一个类别</view> </view>
                       <view wx:elif="{{lastMsg == true && msgStatus == true}}" class="no-data-title" style="text-align:center;margin-top:100px">该类别暂无推荐商品</view>
-                      <!-- <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator> -->
+                      <!-- <navigator class="lookat"  url="/pages/index/index/index"> 去逛逛 </navigator> -->					  					 
                     </view>
+					
                     
                 </scroll-view>
                 <!-- /goodslist -->
--
libgit2 0.21.4