From a139dba9262dbb4b70f34d3c2034c255561abcad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 26 七月 2025 18:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCard_info.js | 188 +++++++++++++++++++++++-----------------------
1 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCard_info.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCard_info.js
index 2d0e5c4..6c3f787 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCard_info.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tTaxiCard/tTaxiCard_info.js
@@ -662,35 +662,35 @@
var modelHtml = '';
if (type == 1){ /// 打折次数卡
- html += '<option value="1">快车</option>' +
- '<option value="2">出租车</option>' +
- '<option value="3">跨城出行</option>';
-
+ html += //'<option value="1">快车</option>' +*/
+ '<option value="2">出租车</option>' /*+
+ '<option value="3">跨城出行</option>'*/;
+
modelHtml += '<div class="form-group">\n' +
- ' <label class="col-sm-2 control-label">次数</label>\n' +
- ' <div class="col-sm-2">\n' +
- ' <input class="form-control" onkeyup="this.value=this.value.replace(/\\D/g,\'\').replace(/^0{1,}/g,\'\')" id="time">\n' +
- ' </div>\n' +
- ' <label class="control-label">次</label>\n' +
- ' </div>';
-
+ ' <label class="col-sm-2 control-label">次数</label>\n' +
+ ' <div class="col-sm-2">\n' +
+ ' <input class="form-control" onkeyup="this.value=this.value.replace(/\\D/g,\'\').replace(/^0{1,}/g,\'\')" id="time">\n' +
+ ' </div>\n' +
+ ' <label class="control-label">次</label>\n' +
+ ' </div>';
+
$("#serviceModel").show();
$("#timeDuring").show();
$("#discountModel").show();
- }else if (type == 2){ /// 优惠卡
- html += '<option value="1">快车</option>' +
- '<option value="2">出租车</option>' +
- '<option value="3">跨城出行</option>';
-
+ }else if (type == 2) { /// 优惠卡
+ html += /*'<option value="1">快车</option>' +*/
+ '<option value="2">出租车</option>' /*+
+ '<option value="3">跨城出行</option>'*/;
+
modelHtml += '<div id="moneyModel" style="margin-top: 50px">\n' +
- ' <div class="form-group">\n' +
- ' <label class="col-sm-2 control-label">消费满</label>\n' +
- ' <div class="col-sm-2">\n' +
- ' <input class="form-control" id="money1">\n' +
- ' </div>\n' +
- ' <input type="hidden" name="moneyCount">\n' +
- ' <label class="col-sm-1" style="top: 6px">元，优惠</label>\n' +
- ' <div class="col-sm-2" style="margin-left: -50px">\n' +
+ ' <div class="form-group">\n' +
+ ' <label class="col-sm-2 control-label">消费满</label>\n' +
+ ' <div class="col-sm-2">\n' +
+ ' <input class="form-control" id="money1">\n' +
+ ' </div>\n' +
+ ' <input type="hidden" name="moneyCount">\n' +
+ ' <label class="col-sm-1" style="top: 6px">元，优惠</label>\n' +
+ ' <div class="col-sm-2" style="margin-left: -50px">\n' +
' <input class="form-control" id="moneys1">\n' +
' </div>\n' +
' <label class="col-sm-1" style="top: 6px">元</label>\n' +
@@ -703,20 +703,20 @@
$("#serviceModel").show();
$("#timeDuring").show();
$("#discountModel").hide();
- }else if (type == 3){ /// 次数卡
- html += '<option value="1">快车</option>' +
- '<option value="2">出租车</option>' +
- '<option value="3">跨城出行</option>';
-
+ }else if (type == 3) { /// 次数卡
+ html += /*'<option value="1">快车</option>' +*/
+ '<option value="2">出租车</option>' /*+
+ '<option value="3">跨城出行</option>'*/;
+
modelHtml += '<div class="form-group">\n' +
- ' <label class="col-sm-2 control-label">次数</label>\n' +
- ' <div class="col-sm-2">\n' +
- ' <input class="form-control" id="time" onkeyup="this.value=this.value.replace(/\\D/g,\'\').replace(/^0{1,}/g,\'\')">\n' +
- ' </div>\n' +
- ' <label class="control-label">次</label>\n' +
- ' </div>\n' +
- ' <div class="form-group">\n' +
- ' <label class="col-sm-2 control-label">优惠金额</label>\n' +
+ ' <label class="col-sm-2 control-label">次数</label>\n' +
+ ' <div class="col-sm-2">\n' +
+ ' <input class="form-control" id="time" onkeyup="this.value=this.value.replace(/\\D/g,\'\').replace(/^0{1,}/g,\'\')">\n' +
+ ' </div>\n' +
+ ' <label class="control-label">次</label>\n' +
+ ' </div>\n' +
+ ' <div class="form-group">\n' +
+ ' <label class="col-sm-2 control-label">优惠金额</label>\n' +
' <div class="col-sm-2">\n' +
' <input class="form-control" id="reduceMoney">\n' +
' </div>\n' +
@@ -726,18 +726,18 @@
$("#serviceModel").show();
$("#timeDuring").show();
$("#discountModel").hide();
- }else if (type == 4){ /// 打折天数卡
- html += '<option value="1">快车</option>' +
- '<option value="2">出租车</option>' +
- '<option value="3">跨城出行</option>';
-
+ }else if (type == 4) { /// 打折天数卡
+ html += /*'<option value="1">快车</option>' +*/
+ '<option value="2">出租车</option>' /*+
+ '<option value="3">跨城出行</option>'*/;
+
$("#serviceModel").show();
$("#timeDuring").show();
$("#discountModel").show();
- }else if (type == 5){ /// 物流打折卡
- html += '<option value="4">同城小件物流</option>' +
- '<option value="5">跨城小件物流</option>';
-
+ }else if (type == 5) { /// 物流打折卡
+ // html += '<option value="4">同城小件物流</option>' +
+ // '<option value="5">跨城小件物流</option>';
+
$("#serviceModel").show();
$("#timeDuring").hide();
$("#discountModel").show();
@@ -818,20 +818,20 @@
var html = '';
var modelHtml = '';
- if (type == 1){ /// 打折次数卡
- html += '<option value="1">快车</option>' +
- '<option value="2">出租车</option>' +
- '<option value="3">跨城出行</option>';
-
+ if (type == 1) { /// 打折次数卡
+ html += /*'<option value="1">快车</option>' +*/
+ '<option value="2">出租车</option>' /*+
+ '<option value="3">跨城出行</option>'*/;
+
modelHtml += '<div class="form-group">\n' +
- ' <label class="col-sm-2 control-label">次数</label>\n' +
- ' <div class="col-sm-2">\n' +
- ' <input class="form-control" id="time" value="' + json.time + '" ' +
- 'onkeyup="this.value=this.value.replace(/\\D/g,\'\').replace(/^0{1,}/g,\'\')">\n' +
- ' </div>\n' +
- ' <label class="control-label">次</label>\n' +
- ' </div>';
-
+ ' <label class="col-sm-2 control-label">次数</label>\n' +
+ ' <div class="col-sm-2">\n' +
+ ' <input class="form-control" id="time" value="' + json.time + '" ' +
+ 'onkeyup="this.value=this.value.replace(/\\D/g,\'\').replace(/^0{1,}/g,\'\')">\n' +
+ ' </div>\n' +
+ ' <label class="control-label">次</label>\n' +
+ ' </div>';
+
$("#discount").val(json.discount);
/// 注入使用时间段
@@ -902,20 +902,20 @@
}
$("#discountModel").show();
- }else if (type == 2){ /// 优惠卡
- html += '<option value="1">快车</option>' +
- '<option value="2">出租车</option>' +
- '<option value="3">跨城出行</option>';
-
+ }else if (type == 2) { /// 优惠卡
+ html += /*'<option value="1">快车</option>' +*/
+ '<option value="2">出租车</option>' /*+
+ '<option value="3">跨城出行</option>'*/;
+
var arrs = json.fullReduction;
modelHtml += '<div id="moneyModel" style="margin-top: 50px">\n';
for (let i = 0; i < arrs.length; i++) {
- if (i == 0){
+ if (i == 0) {
modelHtml += ' <div class="form-group">\n' +
- ' <label class="col-sm-2 control-label">消费满</label>\n' +
- ' <div class="col-sm-2">\n' +
- ' <input class="form-control" id="money1" value="' + arrs[i][0] + '">\n' +
- ' </div>\n' +
+ ' <label class="col-sm-2 control-label">消费满</label>\n' +
+ ' <div class="col-sm-2">\n' +
+ ' <input class="form-control" id="money1" value="' + arrs[i][0] + '">\n' +
+ ' </div>\n' +
' <input type="hidden" name="moneyCount">\n' +
' <label class="col-sm-1" style="top: 6px">元，优惠</label>\n' +
' <div class="col-sm-2" style="margin-left: -50px">\n' +
@@ -1012,20 +1012,20 @@
}
$("#discountModel").hide();
- }else if (type == 3){ /// 次数卡
- html += '<option value="1">快车</option>' +
- '<option value="2">出租车</option>' +
- '<option value="3">跨城出行</option>';
-
+ }else if (type == 3) { /// 次数卡
+ html += /*'<option value="1">快车</option>' +*/
+ '<option value="2">出租车</option>' /*+
+ '<option value="3">跨城出行</option>'*/;
+
modelHtml += '<div class="form-group">\n' +
- ' <label class="col-sm-2 control-label">次数</label>\n' +
- ' <div class="col-sm-2">\n' +
- ' <input class="form-control" id="time" value="' + json.time + '" ' +
- 'onkeyup="this.value=this.value.replace(/\\D/g,\'\').replace(/^0{1,}/g,\'\')">\n' +
- ' </div>\n' +
- ' <label class="control-label">次</label>\n' +
- ' </div>\n' +
- ' <div class="form-group">\n' +
+ ' <label class="col-sm-2 control-label">次数</label>\n' +
+ ' <div class="col-sm-2">\n' +
+ ' <input class="form-control" id="time" value="' + json.time + '" ' +
+ 'onkeyup="this.value=this.value.replace(/\\D/g,\'\').replace(/^0{1,}/g,\'\')">\n' +
+ ' </div>\n' +
+ ' <label class="control-label">次</label>\n' +
+ ' </div>\n' +
+ ' <div class="form-group">\n' +
' <label class="col-sm-2 control-label">优惠金额</label>\n' +
' <div class="col-sm-2">\n' +
' <input class="form-control" id="reduceMoney" value="' + json.discountAmount + '">\n' +
@@ -1099,19 +1099,19 @@
}
$("#discountModel").hide();
- }else if (type == 4){ /// 打折天数卡
- html += '<option value="1">快车</option>' +
- '<option value="2">出租车</option>' +
- '<option value="3">跨城出行</option>';
-
+ }else if (type == 4) { /// 打折天数卡
+ html += /*'<option value="1">快车</option>' +*/
+ '<option value="2">出租车</option>' /*+
+ '<option value="3">跨城出行</option>'*/;
+
$("#discount").val(json.discount);
-
+
/// 注入使用时间段
var timeQuantum = json.timeQuantum;
for (let i = 0; i < timeQuantum.length; i++) {
var timeHtml = '';
var arr = timeQuantum[i].split(" - ");
- if (i == 0){
+ if (i == 0) {
timeHtml += '<div class="form-group">\n' +
' <label class="col-sm-2 control-label">使用时间段</label>\n' +
' <div class="col-sm-2">\n' +
@@ -1172,12 +1172,12 @@
}
$("#discountModel").show();
- }else if (type == 5){ /// 物流打折卡
- html += '<option value="4">同城小件物流</option>' +
- '<option value="5">跨城小件物流</option>';
-
+ }else if (type == 5) { /// 物流打折卡
+ // html += '<option value="4">同城小件物流</option>' +
+ // '<option value="5">跨城小件物流</option>';
+
$("#discount").val(json.discount);
-
+
$("#timeDuring").hide();
$("#discountModel").show();
}else if (type == 6){
--
Gitblit v1.7.1