From e7e18164840f11e28e7138c1cf18e3054c44dd5b Mon Sep 17 00:00:00 2001 From: meo <958484406@qq.com> Date: Thu, 30 Aug 2018 08:31:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=99=90=E6=97=B6=E6=8A=A2=E8=B4=AD=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BA=8B=E4=BB=B6][=E4=BF=AE=E6=94=B9]:=E9=99=90?= =?UTF-8?q?=E6=97=B6=E6=8A=A2=E8=B4=AD=E5=88=97=E8=A1=A8=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/rushToBuy/index.wxss | 2 +- pages/rushToBuy/index.js | 57 ++++++++++++-------------------- pages/rushToBuy/index.wxml | 2 +- 3 files changed, 24 insertions(+), 37 deletions(-) diff --git a/pages/index/rushToBuy/index.wxss b/pages/index/rushToBuy/index.wxss index 6d4b046..8a53f20 100644 --- a/pages/index/rushToBuy/index.wxss +++ b/pages/index/rushToBuy/index.wxss @@ -14,7 +14,7 @@ .index-rushToBuy-title text{ float: right; margin-right: 20rpx; - color: #f96563; + color: #a8adb4; font-size: 26rpx; } .index-scroll-view { diff --git a/pages/rushToBuy/index.js b/pages/rushToBuy/index.js index 0d5bc6f..9961841 100644 --- a/pages/rushToBuy/index.js +++ b/pages/rushToBuy/index.js @@ -45,8 +45,8 @@ Page({ targetAd: 2 } }).then(res => { + console.log(res); //当前时间与优惠券下架时间做计算 - console.log(that.data.day); if (page >= res.data.pages) { // wx.showToast({ @@ -56,41 +56,28 @@ Page({ that.setData({ allow_load: false }); - } - that.data.list = that.data.list.concat(res.data.list); - that.setData({ - list: that.data.list - }); - - /** - * 页面上显示的时间 - */ - console.log(that.data.list); - for (let i = 0; i < that.data.list.length; i++) { - console.log(that.data.list[i].endTime); - var startTime = util.fmtDate(that.data.list[i].endTime); - console.log(startTime); - var s1 = new Date(startTime.replace(/-/g, "/")); - var s2 = new Date(); - var runTime = parseInt((s1.getTime() - s2.getTime()) / 1000); - var year = Math.floor(runTime / 86400 / 365); - var runTime = runTime % (86400 * 365); - var month = Math.floor(runTime / 86400 / 30); - var runTime = runTime % (86400 * 30); - var day = Math.floor(runTime / 86400); - var runTime = runTime % 86400; - var hour = Math.floor(runTime / 3600); - var runTime = runTime % 3600; - var minute = Math.floor(runTime / 60); - var runTime = runTime % 60; - var second = runTime; - console.log(month, day, hour, minute, second); + } else { + /** + * 页面上显示的时间 + */ + that.data.list = that.data.list.concat(res.data.list); that.setData({ - month: month, - day: day, - hour: hour, - minute: minute + list: that.data.list }); + console.log(that.data.list); + for (let i = 0; i < that.data.list.length; i++) { + var startTime = util.fmtDate(that.data.list[i].endTime); + util.timechuo(startTime); + console.log(util.timechuo(startTime)); + /** + * 修改list的endtime + * 渲染到页面 + */ + var endtime = 'list[' + i + '].endtime' + that.setData({ + [endtime]: util.timechuo(startTime) + }); + } } }); } else { @@ -118,7 +105,7 @@ Page({ wx.navigateTo({ url: `/pages/coupon/detail/index?couponChannelId=${ e.currentTarget.dataset.couponchannelid - }&couponId=${e.currentTarget.dataset.couponid}`, + }&couponId=${e.currentTarget.dataset.couponid}` }); }, /** diff --git a/pages/rushToBuy/index.wxml b/pages/rushToBuy/index.wxml index c5f1828..0a2d42a 100644 --- a/pages/rushToBuy/index.wxml +++ b/pages/rushToBuy/index.wxml @@ -21,7 +21,7 @@ 剩余时间: - {{day}}天{{hour}}小时{{minute}}分钟 + {{item.endtime}} 剩余件数:{{item.remainInventory}}件