|
|
@@ -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}` |
|
|
|
}); |
|
|
|
}, |
|
|
|
/** |
|
|
|