|
@@ -78,7 +78,7 @@
|
|
|
const endActiveTime = Date.parse(res.data.endTime);
|
|
|
|
|
|
// 报名按钮状态设置
|
|
|
- if (!statusInfo.status && newDateTime > startTime && newDateTime < endTime && newDateTime > startActiveTime && newDateTime < endActiveTime) {
|
|
|
+ if (!statusInfo.status && newDateTime > startTime && newDateTime < endTime) {
|
|
|
this.buttonGroup[0].backgroundColor = '#ff0000';
|
|
|
this.buttonGroup[0].text = '报名活动';
|
|
|
delete this.buttonGroup[0].status
|
|
@@ -86,19 +86,19 @@
|
|
|
this.buttonGroup[1].disable = true;
|
|
|
this.buttonGroup[1].backgroundColor = '#999';
|
|
|
}
|
|
|
- if (statusInfo.status && newDateTime > startTime && newDateTime < endTime && newDateTime > startActiveTime && newDateTime < endActiveTime) {
|
|
|
- this.buttonGroup[0].backgroundColor = '#999';
|
|
|
+ if (statusInfo.status && newDateTime > startTime && newDateTime < endTime) {
|
|
|
+ this.buttonGroup[0].backgroundColor = '#ffa200';
|
|
|
this.buttonGroup[0].text = '取消报名';
|
|
|
this.buttonGroup[0].status = true;
|
|
|
delete this.buttonGroup[1].disable;
|
|
|
this.buttonGroup[1].backgroundColor = '#ffa200';
|
|
|
}
|
|
|
- if (newDateTime < startTime || newDateTime < startActiveTime) {
|
|
|
+ if (newDateTime < startTime) {
|
|
|
this.buttonGroup[0].backgroundColor = '#999';
|
|
|
this.buttonGroup[0].text = '报名未开始';
|
|
|
this.buttonGroup[0].disable = true;
|
|
|
}
|
|
|
- if (newDateTime > endTime || newDateTime > endActiveTime) {
|
|
|
+ if (newDateTime > endTime) {
|
|
|
this.buttonGroup[0].backgroundColor = '#999';
|
|
|
this.buttonGroup[0].text = '报名已结束';
|
|
|
this.buttonGroup[0].disable = true;
|
|
@@ -120,12 +120,12 @@
|
|
|
this.buttonGroup[1].backgroundColor = '#999';
|
|
|
this.buttonGroup[1].disable = true;
|
|
|
}
|
|
|
- if(newDateTime > endActiveTime){
|
|
|
- this.buttonGroup[1].text = '活动已结束';
|
|
|
- this.buttonGroup[1].backgroundColor = '#999';
|
|
|
- this.buttonGroup[1].disable = true;
|
|
|
- }
|
|
|
- if(statusInfo.status && newDateTime < endActiveTime && newDateTime > startActiveTime){
|
|
|
+ // if(newDateTime > endActiveTime){
|
|
|
+ // this.buttonGroup[1].text = '活动已结束';
|
|
|
+ // this.buttonGroup[1].backgroundColor = '#999';
|
|
|
+ // this.buttonGroup[1].disable = true;
|
|
|
+ // }
|
|
|
+ if(statusInfo.status && newDateTime > startActiveTime){
|
|
|
this.buttonGroup[1].text = '获取积分';
|
|
|
this.buttonGroup[1].backgroundColor = '#ffa200';
|
|
|
delete this.buttonGroup[1].disable;
|