From 52276cea4d1b2b45406dc3e1d3d8feb4950f71aa Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 11 三月 2024 17:02:33 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js
index c12f83f..1e934ec 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/worldCup/worldCup_info.js
@@ -140,7 +140,6 @@
'name': name,
'startTime': new Date(startTime + " 00:00:00"),
'endTime': new Date(endTime + " 23:59:59"),
- 'registrationClosingTime': (null != registrationClosingTime && '' != registrationClosingTime ? new Date(registrationClosingTime + " 23:59:59") : null),
'startAge': startAge,
'endAge': endAge,
'gender': gender,
@@ -161,6 +160,9 @@
'intro': intro,
'content': content,
'stores': JSON.stringify(WorldCupInfo.stores)
+ }
+ if(null != registrationClosingTime && '' != registrationClosingTime){
+ data.registrationClosingTime = registrationClosingTime;
}
//提交信息
@@ -301,7 +303,6 @@
'name': name,
'startTime': new Date(startTime + " 00:00:00"),
'endTime': new Date(endTime + " 23:59:59"),
- 'registrationClosingTime': (null != registrationClosingTime && '' != registrationClosingTime ? new Date(registrationClosingTime + " 23:59:59") : null),
'startAge': startAge,
'endAge': endAge,
'gender': gender,
@@ -323,6 +324,9 @@
'content': content,
'stores': JSON.stringify(WorldCupInfo.stores)
}
+ if(null != registrationClosingTime && '' != registrationClosingTime){
+ data.registrationClosingTime = registrationClosingTime;
+ }
//提交信息
var ajax = new $ax(Feng.ctxPath + "/worldCup/editWorldCup", function (res) {
--
Gitblit v1.7.1