From 4b35c00ff9588c5c9cf17497025a1a798ecc420a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 05 十一月 2025 11:45:01 +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 | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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 15b1fac..bc7ad7f 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
@@ -446,6 +446,14 @@
Feng.info("请上传消防及应急管理方案")
return;
}
+
+ // 验证价格配置时间段不重叠
+ // 检查是否有价格配置数据（如果页面上有价格表）
+ if ($("#booking_price_tbody tr").length > 0 || $("#walkin_price_tbody tr").length > 0) {
+ if (!TSiteInfo.validateNoTimeOverlap()) {
+ return;
+ }
+ }
var sTime = document.getElementById("start-time"); //获取输入的开始时间
var eTime = document.getElementById("end-time"); // 获取输入的结束时间
@@ -890,12 +898,18 @@
for (var day = 1; day <= 7; day++) {
if (timeSlot.days[day]) {
if (timeSlot.days[day].full) {
- $("#booking_" + index + "_" + day + "_full_cash").val(timeSlot.days[day].full.cashPrice || '');
- $("#booking_" + index + "_" + day + "_full_coin").val(timeSlot.days[day].full.coinPrice || '');
+ // 使用严格判断，确保价格为0时也能正确回显
+ var fullCash = timeSlot.days[day].full.cashPrice !== null && timeSlot.days[day].full.cashPrice !== undefined ? timeSlot.days[day].full.cashPrice : '';
+ var fullCoin = timeSlot.days[day].full.coinPrice !== null && timeSlot.days[day].full.coinPrice !== undefined ? timeSlot.days[day].full.coinPrice : '';
+ $("#booking_" + index + "_" + day + "_full_cash").val(fullCash);
+ $("#booking_" + index + "_" + day + "_full_coin").val(fullCoin);
}
if (timeSlot.days[day].half) {
- $("#booking_" + index + "_" + day + "_half_cash").val(timeSlot.days[day].half.cashPrice || '');
- $("#booking_" + index + "_" + day + "_half_coin").val(timeSlot.days[day].half.coinPrice || '');
+ // 使用严格判断，确保价格为0时也能正确回显
+ var halfCash = timeSlot.days[day].half.cashPrice !== null && timeSlot.days[day].half.cashPrice !== undefined ? timeSlot.days[day].half.cashPrice : '';
+ var halfCoin = timeSlot.days[day].half.coinPrice !== null && timeSlot.days[day].half.coinPrice !== undefined ? timeSlot.days[day].half.coinPrice : '';
+ $("#booking_" + index + "_" + day + "_half_cash").val(halfCash);
+ $("#booking_" + index + "_" + day + "_half_coin").val(halfCoin);
}
}
}
@@ -911,12 +925,18 @@
for (var day = 1; day <= 7; day++) {
if (timeSlot.days[day]) {
if (timeSlot.days[day].full) {
- $("#walkin_" + index + "_" + day + "_full_cash").val(timeSlot.days[day].full.cashPrice || '');
- $("#walkin_" + index + "_" + day + "_full_coin").val(timeSlot.days[day].full.coinPrice || '');
+ // 使用严格判断，确保价格为0时也能正确回显
+ var fullCash = timeSlot.days[day].full.cashPrice !== null && timeSlot.days[day].full.cashPrice !== undefined ? timeSlot.days[day].full.cashPrice : '';
+ var fullCoin = timeSlot.days[day].full.coinPrice !== null && timeSlot.days[day].full.coinPrice !== undefined ? timeSlot.days[day].full.coinPrice : '';
+ $("#walkin_" + index + "_" + day + "_full_cash").val(fullCash);
+ $("#walkin_" + index + "_" + day + "_full_coin").val(fullCoin);
}
if (timeSlot.days[day].half) {
- $("#walkin_" + index + "_" + day + "_half_cash").val(timeSlot.days[day].half.cashPrice || '');
- $("#walkin_" + index + "_" + day + "_half_coin").val(timeSlot.days[day].half.coinPrice || '');
+ // 使用严格判断，确保价格为0时也能正确回显
+ var halfCash = timeSlot.days[day].half.cashPrice !== null && timeSlot.days[day].half.cashPrice !== undefined ? timeSlot.days[day].half.cashPrice : '';
+ var halfCoin = timeSlot.days[day].half.coinPrice !== null && timeSlot.days[day].half.coinPrice !== undefined ? timeSlot.days[day].half.coinPrice : '';
+ $("#walkin_" + index + "_" + day + "_half_cash").val(halfCash);
+ $("#walkin_" + index + "_" + day + "_half_coin").val(halfCoin);
}
}
}
--
Gitblit v1.7.1