Commit cbd179f6c61a6d54fdbc2567a33595cd2ae1ad7c
1 parent
bbe18879
商品列表修改
Showing
1 changed file
with
6 additions
and
8 deletions
components/goods_list/goods_list.js
| ... | ... | @@ -38,8 +38,6 @@ Component({ |
| 38 | 38 | pageSize:6, |
| 39 | 39 | }, |
| 40 | 40 | success: function (res){ |
| 41 | - | |
| 42 | - | |
| 43 | 41 | var data=res.data; |
| 44 | 42 | var total=data.data.total; |
| 45 | 43 | if (total <= curPage*6){ |
| ... | ... | @@ -48,17 +46,17 @@ Component({ |
| 48 | 46 | that.data.curPage++; |
| 49 | 47 | } |
| 50 | 48 | |
| 51 | - /*-- | |
| 52 | - if (res.data.data.pageData.length==0){ | |
| 53 | - that.setData({is_no_more:0}); | |
| 54 | - t.showWarning("加载完啦", null, 500, !1) | |
| 55 | - return false; | |
| 56 | - }--*/ | |
| 49 | + | |
| 57 | 50 | //加载完成 |
| 58 | 51 | if (data.data.pageData) { |
| 59 | 52 | that.setData({load_complete:1}); |
| 60 | 53 | } |
| 54 | + if(that.data.recommend!=null){ | |
| 55 | + var ra=that.data.recommend.concat(data.data.pageData); | |
| 56 | + that.setData({ recommend: ra }); | |
| 57 | + }else{ | |
| 61 | 58 | that.setData({recommend:data.data.pageData}); |
| 59 | + } | |
| 62 | 60 | } |
| 63 | 61 | }) |
| 64 | 62 | }, | ... | ... |