diff --git a/src/views/martial/competition/index.vue b/src/views/martial/competition/index.vue index 2a46229..e443d6e 100644 --- a/src/views/martial/competition/index.vue +++ b/src/views/martial/competition/index.vue @@ -85,10 +85,10 @@ > @@ -1966,7 +1966,7 @@ export default { return 3; } // 报名中 - if (regStart && regEnd && now >= regStart && now <= regEnd) { + if (regStart && regEnd && now >= regStart && now <= new Date(regEnd.getFullYear(), regEnd.getMonth(), regEnd.getDate(), 23, 59, 59)) { return 2; } // 未开始(默认状态) diff --git a/src/views/martial/competition/list.vue b/src/views/martial/competition/list.vue index ff233e3..bcc4ba8 100644 --- a/src/views/martial/competition/list.vue +++ b/src/views/martial/competition/list.vue @@ -60,10 +60,10 @@ > diff --git a/src/views/martial/order/index.vue b/src/views/martial/order/index.vue index 89e5a62..f1b236e 100644 --- a/src/views/martial/order/index.vue +++ b/src/views/martial/order/index.vue @@ -261,7 +261,7 @@ export default { const compEnd = row.competitionEndTime ? new Date(row.competitionEndTime) : null if (compEnd && now > compEnd) return 4 if (compStart && now >= compStart) return 3 - if (regStart && regEnd && now >= regStart && now <= regEnd) return 2 + if (regStart && regEnd && now >= regStart && now <= new Date(regEnd.getFullYear(), regEnd.getMonth(), regEnd.getDate(), 23, 59, 59)) return 2 return 1 },