From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js | 103 ++++++++++++++++++++++-----------------------------
1 files changed, 44 insertions(+), 59 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js
index 34ad6ba..860aeac 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js
@@ -205,6 +205,7 @@
introduce:"",
imgs:"",
reservation:"",
+ isCanBeBooked:"",
};
data.province = $("#pCode").val()
data.id = $("#id").val()
@@ -225,64 +226,51 @@
var sm =data.appointmentStartTime.split(':')[1];
var eh =data.appointmentEndTime.split(':')[0];
var em =data.appointmentEndTime.split(':')[1];
-
- if (data.typeName === "智慧场地"){
- console.log("===========这是智慧球场")
-
- console.log("====="+data.appointmentStartTime)
-
- var value = data.appointmentStartTime;
- var lastTwoDigits = value.slice(-2);
-
- if (lastTwoDigits === "00" || lastTwoDigits === "15" || lastTwoDigits === "30" || lastTwoDigits === "45") {
- console.log("Last two digits are 00, 15, 30, or 45");
+ var reservation= $("input[name='reservation']:checked").val();
+ data.reservation= reservation;
+ data.isCanBeBooked= reservation;
+ if (reservation==1) {
+ if (data.typeName === "智慧场地") {
+ console.log("===========这是智慧球场")
+ console.log("=====" + data.appointmentStartTime)
+ var value = data.appointmentStartTime;
+ var lastTwoDigits = value.slice(-2);
+ if (lastTwoDigits === "00" || lastTwoDigits === "15" || lastTwoDigits === "30" || lastTwoDigits === "45") {
+ console.log("Last two digits are 00, 15, 30, or 45");
+ } else {
+ Feng.error("智慧场地的可预约时间段是15分钟的倍数")
+ return;
+ }
+ var value1 = data.appointmentEndTime;
+ var lastTwoDigits1 = value1.slice(-2);
+ if (lastTwoDigits1 === "00" || lastTwoDigits1 === "15" || lastTwoDigits1 === "30" || lastTwoDigits1 === "45") {
+ console.log("Last two digits are 00, 15, 30, or 45");
+ } else {
+ Feng.error("智慧场地的可预约时间段是15分钟的倍数")
+ return;
+ }
} else {
- Feng.error("智慧场地的可预约时间段是15分钟的倍数")
- return;
+ console.log("===========这是普通球场")
+ console.log("=====" + data.appointmentStartTime)
+ var value = data.appointmentStartTime;
+ var lastTwoDigits = value.slice(-2);
+ if (lastTwoDigits === "00" || lastTwoDigits === "30") {
+ console.log("Last two digits are 00, 15, 30, or 45");
+ } else {
+ Feng.info("普通场地可预约时间段需是30分钟的倍数")
+ return;
+ }
+ var value1 = data.appointmentEndTime;
+ var lastTwoDigits1 = value1.slice(-2);
+ if (lastTwoDigits1 === "00" || lastTwoDigits1 === "30") {
+ console.log("Last two digits are 00, 15, 30, or 45");
+ } else {
+ Feng.info("普通场地可预约时间段需是30分钟的倍数")
+ return;
+
+ }
}
-
-
- var value1 = data.appointmentEndTime;
- var lastTwoDigits1 = value1.slice(-2);
-
- if (lastTwoDigits1 === "00" || lastTwoDigits1 === "15" || lastTwoDigits1 === "30" || lastTwoDigits1 === "45") {
- console.log("Last two digits are 00, 15, 30, or 45");
- } else {
- Feng.error("智慧场地的可预约时间段是15分钟的倍数")
- return;
-
- }
-
-
- }else {
- console.log("===========这是普通球场")
-
- console.log("====="+data.appointmentStartTime)
- var value = data.appointmentStartTime;
- var lastTwoDigits = value.slice(-2);
-
- if (lastTwoDigits === "00" || lastTwoDigits === "30" ) {
- console.log("Last two digits are 00, 15, 30, or 45");
- } else {
- Feng.info("普通场地可预约时间段需是30分钟的倍数")
- return;
- }
-
-
- var value1 = data.appointmentEndTime;
- var lastTwoDigits1 = value1.slice(-2);
-
- if (lastTwoDigits1 === "00"|| lastTwoDigits1 === "30" ) {
- console.log("Last two digits are 00, 15, 30, or 45");
- } else {
- Feng.info("普通场地可预约时间段需是30分钟的倍数")
- return;
-
- }
-
-
-
}
@@ -322,12 +310,9 @@
var ishalf= $("input[name='ishalf']:checked").val();
data.ishalf= ishalf;
- var reservation= $("input[name='reservation']:checked").val();
- data.reservation= reservation;
+
var halfName="";
if (reservation==1){
-
-
if(ishalf==1){
let cashPriceOne = $("#cashPriceOne").val()
if(cashPriceOne=='' ){
--
Gitblit v1.7.1