Commit 49660a39 authored by lihui's avatar lihui

feat: fix-bug

parent d9282f0d
......@@ -228,7 +228,10 @@ export default {
if (dateNow.diff(dayJs(item.start_time)) < 0) {
// 开始时间大于当前时间 return 未开始
activityStatusText = "未开始";
} else if (dayJs(item.end_time).diff(dayJs(item.start_time)) > 0) {
} else if (
dateNow.diff(dayJs(item.start_time)) > 0 &&
dateNow.diff(dayJs(item.end_time)) < 0
) {
// 结束时间大于开始时间 return 进行中
activityStatusText = "进行中";
} else if (dateNow.diff(dayJs(item.end_time)) > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment