From 51f34c714fc3c7a4551d349a918e7ce8fa7f63c2 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 08 三月 2024 18:04:56 +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 | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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 ab0fe5c..9e9d079 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
@@ -46,9 +46,6 @@
let coverImg = $('#coverImg').val();
let homeBackdropImg = $('#homeBackdropImg').val();
let content = editor.getContent();
- if("" == registrationClosingTime){
- registrationClosingTime = null;
- }
if(null == name || '' == name){
Feng.error("请填写有效的比赛名称");
return
@@ -146,7 +143,7 @@
'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") : registrationClosingTime),
+ 'registrationClosingTime': (null != registrationClosingTime && '' != registrationClosingTime ? new Date(registrationClosingTime + " 23:59:59") : null),
'startAge': startAge,
'endAge': endAge,
'gender': gender,
@@ -174,7 +171,7 @@
if (res.code==200){
Feng.success("添加成功!");
WorldCupInfo.close();
- window.parent.WorldCup.refresh();
+ window.parent.WorldCup.search();
}else{
Feng.error(res.msg);
}
@@ -212,9 +209,6 @@
let coverImg = $('#coverImg').val();
let homeBackdropImg = $('#homeBackdropImg').val();
let content = editor.getContent();
- if("" == registrationClosingTime){
- registrationClosingTime = null;
- }
if(null == name || '' == name){
Feng.error("请填写有效的比赛名称");
return
@@ -313,7 +307,7 @@
'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") : registrationClosingTime),
+ 'registrationClosingTime': (null != registrationClosingTime && '' != registrationClosingTime ? new Date(registrationClosingTime + " 23:59:59") : null),
'startAge': startAge,
'endAge': endAge,
'gender': gender,
@@ -341,7 +335,7 @@
if (res.code==200){
Feng.success("编辑成功!");
WorldCupInfo.close();
- window.parent.WorldCup.refresh();
+ window.parent.WorldCup.search();
}else{
Feng.error(res.msg);
}
@@ -547,12 +541,18 @@
WorldCupInfo.initStore = function (){
let html = '';
+ let page = $('#page').val();
for (let i = 0; i < WorldCupInfo.stores.length; i++) {
let item = WorldCupInfo.stores[i];
- html += '<tr><td>' + item.province + '</td><td>' + (typeof item.operator == "undefined" ? "" : item.operator) + '</td><td>' + item.name + '</td><td><button style="height: 30px;\n' +
- ' line-height: 30px;\n' +
- ' font-size: 14px;\n' +
- ' width: 50px" onclick="WorldCupInfo.delStore(' + item.id + ')">删除</button></td></tr>'
+ html += '<tr><td>' + item.province + '</td><td>' + (typeof item.operator == "undefined" ? "" : item.operator) + '</td><td>' + item.name + '</td>';
+ if("info" != page){
+ html += '<td><button style="height: 30px;\n' +
+ ' line-height: 30px;\n' +
+ ' font-size: 14px;\n' +
+ ' width: 50px" onclick="WorldCupInfo.delStore(' + item.id + ')">删除</button></td></tr>'
+ }else{
+ html += '</tr>';
+ }
}
$('#stores tbody').html(html);
}
--
Gitblit v1.7.1