From b79d17d163a1f162190cb46d881ab1fd5957c602 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 06 三月 2024 17:02:07 +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/tSite/tSite.js | 168 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 90 insertions(+), 78 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
index 5251cd8..5dbf961 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
@@ -171,19 +171,22 @@
};
TSite.oneChangeYys = function(e){
- var oneId;
+ var oneId = $(e).val();
var checkbox = document.querySelector('input[name="pt"]');
if (checkbox.checked) {
oneId=0;
console.log("选中是平台");
} else {
- oneId = $("#yys").val();
console.log("运营商");
+ console.log(oneId)
+
}
var ajax = new $ax(Feng.ctxPath + "/tSite/getChangeOne", function(data){
if(data!=null){
// var content1 = '<option value="0">平台</option>';
+ console.log("看看oneId")
+ console.log(oneId)
if (oneId == 0) {
console.log("锁住")
$("#yys").prop('disabled', true);
@@ -442,8 +445,8 @@
halfName:"",
introduce:"",
imgs:"",
- introduce:"",
- ids:""
+ reservation:"",
+
};
data.province = $("#pCode").val()
data.city = $("#cCode").val()
@@ -466,6 +469,12 @@
console.log(data.typeName)
+
+ var reservation= $("input[name='reservation']:checked").val();
+ data.reservation= reservation;
+ console.log("看看是否可预约值")
+ console.log(reservation);
+ if (reservation==1){
if (data.typeName === "智慧场地"){
@@ -522,11 +531,8 @@
return;
}
-
-
-
}
-
+ }
var SelectValue="";
var getSelectValueMenbers = $("input[name='pt']:checked").each(function(j) {
if (j >= 0) {
@@ -559,43 +565,44 @@
}
}
data.nextName= nextName;
-
-
var ishalf= $("input[name='ishalf']:checked").val();
data.ishalf= ishalf;
+
var halfName="";
- if(ishalf==1){
- let cashPriceOne = $("#cashPriceOne").val()
- if(cashPriceOne=='' ){
- Feng.info("请填写现金价格")
- return;
- }
- data.cashPriceOne= cashPriceOne;
-
- let playPaiCoinOne = $("#playPaiCoinOne").val()
- if(playPaiCoinOne=='' ){
- Feng.info("请填写玩湃币价格")
- return;
- }
-
- data.playPaiCoinOne= playPaiCoinOne;
- let num2 = $('input[name="name2"]');
- for (let i = 0; i < num2.length; i++) {
- if($(num2[i]).val()==''){
- Feng.info("请填写半场名称")
+ if (reservation==1) {
+ if (ishalf == 1) {
+ let cashPriceOne = $("#cashPriceOne").val()
+ if (cashPriceOne == '') {
+ Feng.info("请填写现金价格")
return;
}
- if(i==num2.length-1){
- halfName += $(num2[i]).val()
- }else {
- halfName += $(num2[i]).val()+","
+ data.cashPriceOne = cashPriceOne;
+
+ let playPaiCoinOne = $("#playPaiCoinOne").val()
+ if (playPaiCoinOne == '') {
+ Feng.info("请填写玩湃币价格")
+ return;
+ }
+
+ data.playPaiCoinOne = playPaiCoinOne;
+ let num2 = $('input[name="name2"]');
+ for (let i = 0; i < num2.length; i++) {
+ if ($(num2[i]).val() == '') {
+ Feng.info("请填写半场名称")
+ return;
+ }
+ if (i == num2.length - 1) {
+ halfName += $(num2[i]).val()
+ } else {
+ halfName += $(num2[i]).val() + ","
+ }
}
}
}
data.halfName= halfName;
- data.ids= $("#ids").val();
+
let introduce ;
if (objectType==1){
introduce = TSite.editor.getContent();
@@ -642,6 +649,8 @@
Feng.info("请输入场地名称")
return;
}
+
+ if (reservation==1){
if($("#start-time").val()=='' ){
Feng.info("请输入可预约时间段 开始时间")
return;
@@ -657,6 +666,7 @@
if($("#playPaiCoin").val()==''){
Feng.info("请输入玩湃币价格")
return;
+ }
}
if($("#insuranceEndTime").val()==''){
Feng.info("请输入场地责任险有效期")
@@ -680,56 +690,58 @@
type: "GET",
contentType: "application/json", // 设置请求头的 Content-Type
success: function (response) {
- rStime = response.startTime;
- sh = rStime.split(':')[0];// 门店经营开始时间：小时
- sm = rStime.split(':')[1];// 门店经营开始时间：分钟
+ if (reservation==1) {
+ rStime = response.startTime;
+ sh = rStime.split(':')[0];// 门店经营开始时间：小时
+ sm = rStime.split(':')[1];// 门店经营开始时间：分钟
- rEtime = response.endTime;
- eh = rEtime.split(':')[0];// 门店经营结束时间：小时
- em = rEtime.split(':')[1];// 门店经营结束时间：分钟
+ rEtime = response.endTime;
+ eh = rEtime.split(':')[0];// 门店经营结束时间：小时
+ em = rEtime.split(':')[1];// 门店经营结束时间：分钟
- var start = sTime.value;
- var startHour = start.split(':')[0]; // 输入的可预约开始时间：小时
- var startMinute = start.split(':')[1];// 输入的可预约开始时间：分钟
- if (Number(sh)>Number(startHour)){
- Feng.error("预约的开始时间不应小于营业开始时间！")
- return false;
- }else if(Number(sh) === Number(startHour) ){
- if (Number(sm)>Number(startMinute)){
- Feng.error("预约的开始时间不应大于营业开始时间！")
+ var start = sTime.value;
+ var startHour = start.split(':')[0]; // 输入的可预约开始时间：小时
+ var startMinute = start.split(':')[1];// 输入的可预约开始时间：分钟
+ if (Number(sh) > Number(startHour)) {
+ Feng.error("预约的开始时间不应小于营业开始时间！")
+ return false;
+ } else if (Number(sh) === Number(startHour)) {
+ if (Number(sm) > Number(startMinute)) {
+ Feng.error("预约的开始时间不应大于营业开始时间！")
+ return false;
+ }
+ } else if (Number(eh) < Number(startHour)) {
+ Feng.error("预约的开始时间不应大于营业结束时间！")
+ return false;
+ } else if (Number(eh) === Number(startHour)) {
+ Feng.error("预约的开始时间不应大于等于营业结束时间！")
return false;
}
- }else if (Number(eh)<Number(startHour)){
- Feng.error("预约的开始时间不应大于营业结束时间！")
- return false;
- }else if(Number(eh)===Number(startHour)){
- Feng.error("预约的开始时间不应大于等于营业结束时间！")
- return false;
- }
- var end = eTime.value;
- var endHour = end.split(':')[0]; // 输入的可预约结束时间：小时
- var endMinute = end.split(':')[1];// 输入的可预约结束时间：分钟
- if (Number(eh)<Number(endHour)){
- Feng.error("预约的结束时间不应大于营业结束时间！")
- return ;
- }else if(Number(eh) === Number(endHour) ){
- if (Number(em)<Number(endMinute)){
- Feng.error("预约的开始时间不应大于开始营业时间！")
- return ;
- }
- }else if(Number(sh)>Number(endHour)){
- Feng.error("预约的结束时间不应小于营业开始时间！")
- return ;
- }
- if (Number(endHour)===Number(sh)){
- if(Number(endMinute) < Number(sm)){
- Feng.error("预约结束时间不应小于营业开始时间");
+ var end = eTime.value;
+ var endHour = end.split(':')[0]; // 输入的可预约结束时间：小时
+ var endMinute = end.split(':')[1];// 输入的可预约结束时间：分钟
+ if (Number(eh) < Number(endHour)) {
+ Feng.error("预约的结束时间不应大于营业结束时间！")
+ return;
+ } else if (Number(eh) === Number(endHour)) {
+ if (Number(em) < Number(endMinute)) {
+ Feng.error("预约的开始时间不应大于开始营业时间！")
+ return;
+ }
+ } else if (Number(sh) > Number(endHour)) {
+ Feng.error("预约的结束时间不应小于营业开始时间！")
return;
}
- }
- if (Number(startHour)===Number(endHour) && Number(startMinute)===Number(endMinute)){
- Feng.error("至少预约半个小时");
- return;
+ if (Number(endHour) === Number(sh)) {
+ if (Number(endMinute) < Number(sm)) {
+ Feng.error("预约结束时间不应小于营业开始时间");
+ return;
+ }
+ }
+ if (Number(startHour) === Number(endHour) && Number(startMinute) === Number(endMinute)) {
+ Feng.error("至少预约半个小时");
+ return;
+ }
}
$.ajax({
url: Feng.ctxPath + "/tSite/addSite" ,
--
Gitblit v1.7.1