From 8392b49c922060006dad1120b1a3548d040a1443 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Tue, 6 Aug 2019 16:55:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=99=90=E6=97=B6=E6=8A=A2=E8=B4=AD][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:[=E4=BF=AE=E6=94=B9=E9=99=90=E6=97=B6?= =?UTF-8?q?=E6=8A=A2=E8=B4=AD=E5=80=92=E8=AE=A1=E6=97=B6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/coupon/detail/index.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index d6a159a..f2de195 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -86,7 +86,8 @@ Page({ minLimit:0, maxLimit:0, dispressEndDate:false, - barTitle:"" + barTitle:"", + activityStatus:"" }, /** * 显示分享弹框 @@ -510,6 +511,7 @@ Page({ that.setData({ begin_time: res.data.beginTime, end_time: res.data.endTime, + activityStatus: res.data.activityStatus }) if (res.data.activityStatus == 0 && flag != 'endclock') { that.countdown(res.data.beginTime); @@ -957,9 +959,12 @@ Page({ showbutton: false, showbutton1: false }) - if (this.data.end_time) { + if (this.data.end_time && this.data.activityStatus!=0) { this.countdown(this.data.end_time) } + else if (this.data.begin_time && this.data.activityStatus == 0) { + this.countdown(this.data.begin_time) + } }, onUnload: function() { let that = this;