|
|
@@ -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; |
|
|
|