Commit 8732be921ae58929824d38698fc2ef69115b28b7
Merge branch 'dev' into 'test'
分类 See merge request !861
Showing
1 changed file
with
6 additions
and
6 deletions
pages/goods/categoryList/categoryList.js
| ... | ... | @@ -856,9 +856,7 @@ Page({ |
| 856 | 856 | 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 }, |
| 857 | 857 | success: function (e) { |
| 858 | 858 | console.log(e.data.data.pageData) |
| 859 | - s.setData({ | |
| 860 | - dataLength: e.data.data.pageData.length, | |
| 861 | - }); | |
| 859 | + | |
| 862 | 860 | if (e.data.data.pageData.length > 0) { |
| 863 | 861 | s.setData({ |
| 864 | 862 | msgStatus: false,is_no_more:0 |
| ... | ... | @@ -886,6 +884,10 @@ Page({ |
| 886 | 884 | }) |
| 887 | 885 | } |
| 888 | 886 | } |
| 887 | + | |
| 888 | + s.setData({ | |
| 889 | + dataLength: s.data.requestData.length, | |
| 890 | + }); | |
| 889 | 891 | |
| 890 | 892 | } else { |
| 891 | 893 | //没有数据页面显示暂无数据 |
| ... | ... | @@ -911,9 +913,7 @@ Page({ |
| 911 | 913 | }); |
| 912 | 914 | s.style(s.data.stylePage, dataArray[index + 1]['items']['id']) |
| 913 | 915 | } |
| 914 | - | |
| 915 | - | |
| 916 | - | |
| 916 | + | |
| 917 | 917 | }else{ |
| 918 | 918 | //没有数据而且是第一页的时候 |
| 919 | 919 | s.setData({ | ... | ... |