|
@@ -21,8 +21,6 @@ Page({
|
|
*/
|
|
*/
|
|
onLoad: function (options) {
|
|
onLoad: function (options) {
|
|
Object.assign(this, Common)
|
|
Object.assign(this, Common)
|
|
- this.getActivityList();
|
|
|
|
- this.startCountdownTimer()
|
|
|
|
},
|
|
},
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -35,7 +33,8 @@ Page({
|
|
* 生命周期函数--监听页面显示
|
|
* 生命周期函数--监听页面显示
|
|
*/
|
|
*/
|
|
onShow: function () {
|
|
onShow: function () {
|
|
-
|
|
|
|
|
|
+ this.getActivityList();
|
|
|
|
+ this.startCountdownTimer()
|
|
},
|
|
},
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -148,9 +147,7 @@ Page({
|
|
}
|
|
}
|
|
const now = new Date();
|
|
const now = new Date();
|
|
this.data.activityList.forEach(v => {
|
|
this.data.activityList.forEach(v => {
|
|
- if (v.status == 1 || v.status == 4 || v.status == 5) {
|
|
|
|
- this.setActivityCountdownTime(now, v)
|
|
|
|
- }
|
|
|
|
|
|
+ this.setActivityCountdownTime(now, v)
|
|
})
|
|
})
|
|
this.setData({
|
|
this.setData({
|
|
activityList: this.data.activityList
|
|
activityList: this.data.activityList
|