|
@@ -221,8 +221,18 @@ export default {
|
|
getList() {
|
|
getList() {
|
|
this.loading = true;
|
|
this.loading = true;
|
|
listActivity(this.queryParams).then(response => {
|
|
listActivity(this.queryParams).then(response => {
|
|
|
|
+ const nowTime = new Date().getTime();
|
|
this.activityList = response.rows.map(e => {
|
|
this.activityList = response.rows.map(e => {
|
|
- e.statusText = e.status == 0 ? '未开始' : '已结束'
|
|
|
|
|
|
+ const startTime = Date.parse(e.startTime);
|
|
|
|
+ if(e.status == 0){
|
|
|
|
+ if(nowTime < startTime){
|
|
|
|
+ e.statusText = '未开始';
|
|
|
|
+ }else{
|
|
|
|
+ e.statusText = '进行中';
|
|
|
|
+ }
|
|
|
|
+ }else{
|
|
|
|
+ e.statusText = '已结束';
|
|
|
|
+ }
|
|
return e;
|
|
return e;
|
|
});
|
|
});
|
|
this.total = response.total;
|
|
this.total = response.total;
|