From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity.js | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity.js
index 4ed5691..c36b3c5 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity.js
@@ -28,15 +28,21 @@
}else if(value==2){
return "已驳回";
}else if(value==3){
- if(new Date()<new Date(row.startTime.replace(/-/g,"/"))){
- return "未开始";
- }else if(new Date()>new Date(row.endTime.replace(/-/g,"/"))){
- return "已结束";
- }else{
- return "进行中";
- }
+ // if(new Date()<new Date(row.startTime.replace(/-/g,"/"))){
+ // return "未开始";
+ // }else if(new Date()>new Date(row.endTime.replace(/-/g,"/"))){
+ // return "已结束";
+ // }else{
+ // return "进行中";
+ // }
}else if(value==4){
return "已暂停";
+ }else if(value==5){
+ return "未开始";
+ }else if(value==6){
+ return "进行中";
+ }else if(value==7){
+ return "已结束";
}
}
}
--
Gitblit v1.7.1