Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

2025-11-05 4b35c00ff9588c5c9cf17497025a1a798ecc420a

Merge remote-tracking branch 'origin/2.0' into 2.0

# Conflicts:
#	cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js

 cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js

@@ -1444,7 +1444,12 @@
            return;
        }
    }
    

    // 验证时段不重叠
    if (!TSite.validateNoTimeOverlap()) {
        return;
    }

    // 收集价格数据
    var priceDTOS = TSite.collectPriceData();
    

 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);
                    }
                }
            }