diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index 2d48676..e613fe1 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -13,31 +13,31 @@ Page({ wmhome: imgurl.wmhome.url, wmgive: imgurl.wmgive.url, tabs: [{ - key: 0, - name: "未使用" - }, - { - key: 1, - name: "已使用" - }, - { - key: 2, - name: "已过期" - }, - { - key: 3, - name: "已退款" - } + key: 0, + name: "未使用" + }, + { + key: 1, + name: "已使用" + }, + { + key: 2, + name: "已过期" + }, + { + key: 3, + name: "已退款" + } ], list: [], current: "0", current_scroll: "0", page: 1, allow_load: true, - loading: true, //"上拉加载"的变量,默认false,隐藏 + loading: false, //"上拉加载"的变量,默认false,隐藏 content: "", mystatus: '', - showPage:false, + showPage: false, goHomeUrl: "", }, onLoad() { @@ -71,8 +71,7 @@ Page({ var mystatus = this.data.mystatus; } wx.navigateTo({ - url: `/pages/couponorder/detail/index?quancode=${ - e.currentTarget.dataset.quancode}&couponorderstatus=${mystatus}` + url: `/pages/couponorder/detail/index?quancode=${e.currentTarget.dataset.quancode}&couponorderstatus=${mystatus}` }); }, getList(key, pageNum) { @@ -90,54 +89,55 @@ Page({ couponOrderStatus: key } }) - .then(res => { - if(res.code == 200){ - that.setData({ - showPage:true - }) - } - res.data.list.map(file => { - file.expiredTimeStr = util.fmtDate(Number(file.expiredTime)); - console.log(file.expiredTime,file.expiredTimeStr) - }); - setTimeout(function () { - that.setData({ - loading: false + .then(res => { + if (res.code == 200) { + that.setData({ + showPage: true + }) + setTimeout(() => { + that.setData({ + loading: false + }); + }, 1400); + } + res.data.list.map(file => { + file.expiredTimeStr = util.fmtDate(Number(file.expiredTime)); + console.log(file.expiredTime, file.expiredTimeStr) }); - }, 1400); - if (pageNum >= res.data.pages) { - that.setData({ - allow_load: false - }); - } - if (pageNum == 1) { - that.setData({ - list: [] - }) - } - var tmpArr =[]; - tmpArr = that.data.list - // Object.assign(tmpArr, res.data.list); - if(pageNum==1){ - console.log(res.data.list) - that.setData({ - list: res.data.list - }) - }else{ - tmpArr = [...tmpArr,...res.data.list] - that.setData({ - list: tmpArr + + if (pageNum >= res.data.pages) { + that.setData({ + allow_load: false + }); + } + if (pageNum == 1) { + that.setData({ + list: [] + }) + } + var tmpArr = []; + tmpArr = that.data.list + // Object.assign(tmpArr, res.data.list); + if (pageNum == 1) { + console.log(res.data.list) + that.setData({ + list: res.data.list + }) + } else { + tmpArr = [...tmpArr, ...res.data.list] + that.setData({ + list: tmpArr + }) + } + + }) + .catch(err => { + wx.showModal({ + title: '提示', + content: err.errMsg, + showCancel: false }) - } - - }) - .catch(err => { - wx.showModal({ - title: '提示', - content: err.errMsg, - showCancel:false }) - }) } else { that.setData({ loading: true, @@ -157,7 +157,7 @@ Page({ list: [], allow_load: true, current_scroll: detail.key, - page:1, + page: 1, }); this.getList(detail.key, 1); },