|
@@ -63,7 +63,11 @@ export default {
|
|
|
this.trainingList.forEach((item) => {
|
|
|
const tempDate = dayjs(item.trainingDate).format("YYYY-MM-DD");
|
|
|
const tempNow = dayjs(new Date()).format("YYYY-MM-DD");
|
|
|
- item.isFinish = dayjs(tempDate).isBefore(tempNow) ? item.isFinish : 2;
|
|
|
+ item.isFinish = item.isFinish
|
|
|
+ ? item.isFinish
|
|
|
+ : dayjs(tempDate).isBefore(tempNow)
|
|
|
+ ? item.isFinish
|
|
|
+ : 2;
|
|
|
item.trainingDate = dayjs(item.trainingDate).format("M月D日");
|
|
|
item.isFinish == 1;
|
|
|
});
|