From 47e23cf659d4cc58bc93b44b16e64e82efcfb08d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 24 七月 2024 17:34:27 +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 | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 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 7c2af8b..95dcffd 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
@@ -92,16 +92,13 @@
return
}
if(null == basePeople || '' == basePeople){
- Feng.error("请填写有效的基础报名人数");
- return
+ basePeople = 0;
}
if(null == participationIntegral || '' == participationIntegral){
- Feng.error("请填写有效的参赛可获积分");
- return
+ participationIntegral = 0;
}
if(null == winIntegral || '' == winIntegral){
- Feng.error("请填写有效的胜场可获积分");
- return
+ winIntegral = 0;
}
if(null == address || '' == address){
Feng.error("请填写有效的比赛地点");
@@ -143,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,
@@ -164,6 +160,9 @@
'intro': intro,
'content': content,
'stores': JSON.stringify(WorldCupInfo.stores)
+ }
+ if(null != registrationClosingTime && '' != registrationClosingTime){
+ data.registrationClosingTime = new Date(registrationClosingTime + " 23:59:59");
}
//提交信息
@@ -255,16 +254,13 @@
return
}
if(null == basePeople || '' == basePeople){
- Feng.error("请填写有效的基础报名人数");
- return
+ basePeople = 0;
}
if(null == participationIntegral || '' == participationIntegral){
- Feng.error("请填写有效的参赛可获积分");
- return
+ participationIntegral = 0;
}
if(null == winIntegral || '' == winIntegral){
- Feng.error("请填写有效的胜场可获积分");
- return
+ winIntegral = 0;
}
if(null == address || '' == address){
Feng.error("请填写有效的比赛地点");
@@ -307,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,
@@ -328,6 +323,9 @@
'intro': intro,
'content': content,
'stores': JSON.stringify(WorldCupInfo.stores)
+ }
+ if(null != registrationClosingTime && '' != registrationClosingTime){
+ data.registrationClosingTime = new Date(registrationClosingTime + " 23:59:59");
}
//提交信息
@@ -402,16 +400,16 @@
$('.cash').hide();
}
if(v == 2){
- $('.classHour').hide();
+ $('.paiCoin').hide();
}
if(v == 3){
- $('.paiCoin').hide();
+ $('.classHour').hide();
}
}
});
- if(null != $('#id').val()){
+ if(null != $('#id').val() && '' != $('#id').val()){
WorldCupInfo.stores = JSON.parse($('#storeInfo').val());
WorldCupInfo.initStore();
let lng = $('#longitude').val();
--
Gitblit v1.7.1