diff --git a/assets/img/success.png b/assets/img/success.png new file mode 100644 index 0000000..945dde7 Binary files /dev/null and b/assets/img/success.png differ diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index f172f1d..303d84e 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -27,10 +27,6 @@ Page({ console.log("couponChannelId" + options.couponChannelId); console.log("couponId" + options.couponId); console.log("传的变量的名字叫couponId"); - /** - * 首页banner detail couponlist传过来的值 - * iambannercoupon - */ wx.showLoading({ title: "加载中..." }); @@ -58,31 +54,12 @@ Page({ console.log(res); console.log("details"); //当前时间与优惠券下架时间做计算 - var startTime = util.fmtDate(res.data.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(year, month, day, hour, minute, second); + var endTime = util.fmtDate(res.data.endTime); + util.timechuo(endTime) + console.log(util.timechuo(endTime)); that.setData({ - year: year, - month: month, - day: day, - hour: hour, - minute: minute - }); - console.log(that.data.day); + endtime:util.timechuo(endTime) + }) wx.hideLoading(); that.setData({ data: res.data @@ -235,8 +212,6 @@ Page({ complete: res => { console.log(res); console.log("支付完成"); - // var url = res.data.url; - // console.log("get url", url); if (res.errMsg == "requestPayment:ok") { } else { wx.showToast({ @@ -261,7 +236,8 @@ Page({ that.payOrderUpdate(orderId, "0", 1); wx.showToast({ title: "领取成功", - duration: 3000 + duration: 3000, + image: "./../../../assets/img/success.png", }); } } diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 9ec4616..8b8f0f3 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -7,7 +7,7 @@ {{data.title}}限购{{data.useLimitQuantity}}件 - 剩余时间:{{day}}天{{hour}}小时{{minute}}分钟 + 剩余时间:{{endtime}} 剩余件数:{{data.remainInventory}}件