Merge branch 'dev' into 'test'

分类 See merge request !861

Merge branch 'dev' into 'test'
分类 See merge request !861
后端研发-苏明海
2 parents 88d8046f a6b04cc7
Showing 1 changed file with 6 additions and 6 deletions
pages/goods/categoryList/categoryList.js
@@ -856,9 +856,7 @@ Page({
       data: { page: page, cat_id: cid, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
       success: function (e) {
         console.log(e.data.data.pageData)
-        s.setData({
-          dataLength: e.data.data.pageData.length,
-        });
+
         if (e.data.data.pageData.length > 0) {
           s.setData({
             msgStatus: false,is_no_more:0
@@ -886,6 +884,10 @@ Page({
               })
             } 
           }
+
+            s.setData({
+                dataLength: s.data.requestData.length,
+            });
         } else {
           //没有数据页面显示暂无数据
@@ -911,9 +913,7 @@ Page({
 				});
 				s.style(s.data.stylePage, dataArray[index + 1]['items']['id'])
 			}
-			
-			
-            
+
           }else{
             //没有数据而且是第一页的时候
             s.setData({