diff --git a/packageB/pages/zuhegou/list/list.js b/packageB/pages/zuhegou/list/list.js index 116d46c..3e90968 100644 --- a/packageB/pages/zuhegou/list/list.js +++ b/packageB/pages/zuhegou/list/list.js @@ -127,46 +127,25 @@ Page({ if(!this.data.ismore) return false; var e = this,th=e, i = "/api/weshop/prom/zhbuy/page?is_end=0&timetype=1&page=" + e.data.currentPage; - var plist=null,alllist=th.data.goodlist; - if(!alllist) alllist=[]; - - await getApp().request.promiseGet(i, - {isShowLoading:1,data:{store_id:os.stoid,user_id:getApp().globalData.user_id}} - ).then(res=>{ - plist=res.data.data.pageData; - console.log("是什么即将开始",plist); - }); - - if(plist.length<=0) { - + // var plist=null,alllist=th.data.goodlist; + // if(!alllist) alllist=[]; + let {goodlist}=this.data; + const {data:res}=await getApp().request.promiseGet(i,{ + isShowLoading:1, + data:{store_id:os.stoid,user_id:getApp().globalData.user_id} + }) + if(res.code==0 && res.data.pageData.length>0){ + if(res.data.page>1){ + goodlist=goodlist.concat(res.data.pageData) + }else{ + goodlist=res.data.pageData; + } + }else{ getApp().showWarning("没有更多数据"); th.data.ismore=0; - if(e.data.currentPage==1 && this.data.type==1){ - // setTimeout(function () { - // th.data.ismore=1; - // th.setData({type:0}); - // th.requestSalelist(); - // },1000); - } - return false; } - - //--循环读取接口--- - // for(var i=0;i{ - // if(res.data.code==0){ - // plist[i].status=1; - // if(res.data.data<=0) plist[i].status=3; - // } - // }) - // alllist.push(plist[i]); - // } e.data.currentPage++; - // console.log("秒杀商品列表", alllist); - th.setData({goodlist:plist,isshow:1}); + th.setData({goodlist,isshow:1}); }, onPullDownRefresh: function() {