|
@@ -23,15 +23,6 @@ Page({
|
|
|
Object.assign(this, Common)
|
|
|
this.getActivityList();
|
|
|
this.startCountdownTimer()
|
|
|
-
|
|
|
- LuckDraw.getUserPrizeList({
|
|
|
- mobile: "16602120168",
|
|
|
- goodsType: 1,
|
|
|
- page: 1,
|
|
|
- pageSize: 20
|
|
|
-}).then(res => {
|
|
|
-
|
|
|
-}).catch(_ => {})
|
|
|
},
|
|
|
|
|
|
/**
|
|
@@ -107,13 +98,13 @@ Page({
|
|
|
let beginTime = v.beginTime
|
|
|
let endTime = v.endTime
|
|
|
if (v.timeType == 1 || beginTime == null) {
|
|
|
- beginTime = "2021.11.01"
|
|
|
+ beginTime = ""
|
|
|
}
|
|
|
if (v.timeType == 1 || endTime == null) {
|
|
|
- endTime = "2031.11.01"
|
|
|
+ endTime = ""
|
|
|
}
|
|
|
- v._beginTime = parseTime(beginTime, "{y}.{m}.{d}")
|
|
|
- v._endTime = parseTime(endTime, "{y}.{m}.{d}")
|
|
|
+ beginTime && (v._beginTime = parseTime(beginTime, "{y}.{m}.{d} {h}:{i}:{s}"))
|
|
|
+ endTime && (v._endTime = parseTime(endTime, "{y}.{m}.{d} {h}:{i}:{s}"))
|
|
|
})
|
|
|
this.data.activityList = this.data.activityList.concat(...data)
|
|
|
this.setData({
|