diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js index da9799b..1bbfb29 100644 --- a/components/goods_list/goods_list.js +++ b/components/goods_list/goods_list.js @@ -38,8 +38,6 @@ Component({ pageSize:6, }, success: function (res){ - - var data=res.data; var total=data.data.total; if (total <= curPage*6){ @@ -48,17 +46,17 @@ Component({ that.data.curPage++; } - /*-- - if (res.data.data.pageData.length==0){ - that.setData({is_no_more:0}); - t.showWarning("加载完啦", null, 500, !1) - return false; - }--*/ + //加载完成 if (data.data.pageData) { that.setData({load_complete:1}); } + if(that.data.recommend!=null){ + var ra=that.data.recommend.concat(data.data.pageData); + that.setData({ recommend: ra }); + }else{ that.setData({recommend:data.data.pageData}); + } } }) },