From a5c2c7e633e0dba4b80c8a15fd34c38ae097befc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html | 92 +++++++++++++++-------------------------------
1 files changed, 30 insertions(+), 62 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
index d6a98a5..258d15d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -305,81 +305,65 @@
<label class="col-sm-2 control-label">打车/包裹订单取消设置：</label>
<div class="col-sm-10">
订单取消规则：订单在司机接单 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(ptCancel1)){
- value="${ptCancel1.minuteNum}"
+ @if(isNotEmpty(orderAcceptanceTime)){
+ value="${orderAcceptanceTime}"
@}else{
value=""
@}
name="ptCancel1" id="ptCancel1" class="form-control newWidth" /> 分钟后，
取消订单收取 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(ptCancel1)){
- value="${ptCancel1.money}"
+ @if(isNotEmpty(money)){
+ value="${money}"
@}else{
value=""
@}
name="ptCancel2" id="ptCancel2" class="form-control newWidth" /> GHS取消费用
里程费 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(ptCancel1)){
- value="${ptCancel1.km}"
+ @if(isNotEmpty(mileageFee)){
+ value="${mileageFee}"
@}else{
value=""
@}
name="km" id="km" class="form-control newWidth" /> GHS/km
时长费 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(ptCancel1)){
- value="${ptCancel1.kmMinute}"
+ @if(isNotEmpty(durationFee)){
+ value="${durationFee}"
@}else{
value=""
@}
name="kmMinute" id="kmMinute" class="form-control newWidth" /> GHS/分钟
<br/>
<br/>
- <div class="col-sm-10" hidden>
- 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(ptCancel2)){
- value="${ptCancel2.minuteNum}"
- @}else{
- value=""
- @}
- name="ptCancel3" id="ptCancel3" class="form-control newWidth" /> 分钟后，
- 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(ptCancel2)){
- value="${ptCancel2.money}"
- @}else{
- value=""
- @}
- name="ptCancel4" id="ptCancel4" class="form-control newWidth" /> 元取消费用；
- <br/>
- </div>
+
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">预约订单取消规则：</label>
<div class="col-sm-10">
订单在司机接单 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(yyCancel1)){
- value="${yyCancel1.minuteNum}"
+ @if(isNotEmpty(orderAcceptanceTime1)){
+ value="${orderAcceptanceTime1}"
@}else{
value=""
@}
name="yyCancel1" id="yyCancel1" class="form-control newWidth" /> 分钟后，
取消订单收取 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(yyCancel1)){
- value="${yyCancel1.money}"
+ @if(isNotEmpty(money1)){
+ value="${money1}"
@}else{
value=""
@}
name="yyCancel2" id="yyCancel2" class="form-control newWidth" /> 元取消费用；
里程费 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(yyCancel1)){
- value="${yyCancel1.km}"
+ @if(isNotEmpty(mileageFee1)){
+ value="${mileageFee1}"
@}else{
value=""
@}
name="km2" id="km2" class="form-control newWidth" /> GHS/km
时长费 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(yyCancel1)){
- value="${yyCancel1.kmMinute}"
+ @if(isNotEmpty(durationFee1)){
+ value="${durationFee1}"
@}else{
value=""
@}
@@ -387,39 +371,23 @@
</br>
</br>
预定费用 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(yyCancel1)){
- value="${yyCancel1.reserveMoney}"
+ @if(isNotEmpty(reservationFee)){
+ value="${reservationFee}"
@}else{
value=""
@}
name="reserveMoney" id="reserveMoney" class="form-control newWidth" /> GHS
<br/>
<br/>
- <div class="col-sm-10" hidden>
- 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(yyCancel2)){
- value="${yyCancel2.minuteNum}"
- @}else{
- value=""
- @}
- name="yyCancel3" id="yyCancel3" class="form-control newWidth" /> 分钟后，
- 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
- @if(isNotEmpty(yyCancel2)){
- value="${yyCancel2.money}"
- @}else{
- value=""
- @}
- name="yyCancel4" id="yyCancel4" class="form-control newWidth" /> 元取消费用
- <br/>
- </div>
+
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">司机超时(地图计算时间或者预定时间)：</label>
<div class="col-sm-10">
<input type="text" oninput="checkIsInt(this)"
- @if(isNotEmpty(ptCancel2)){
- value="${ptCancel2.overtime}"
+ @if(isNotEmpty(driverTimeout)){
+ value="${driverTimeout}"
@}else{
value=""
@}
@@ -613,15 +581,15 @@
var ptCancel1 = $("#ptCancel1").val().trim();
var ptCancel2 = $("#ptCancel2").val().trim();
- var ptCancel3 = $("#ptCancel3").val().trim();
- var ptCancel4 = $("#ptCancel4").val().trim();
+ // var ptCancel3 = $("#ptCancel3").val().trim();
+ // var ptCancel4 = $("#ptCancel4").val().trim();
// var ptCancel5 = $("#ptCancel5").val().trim();
// var ptCancel6 = $("#ptCancel6").val().trim();
var yyCancel1 = $("#yyCancel1").val().trim();
var yyCancel2 = $("#yyCancel2").val().trim();
- var yyCancel3 = $("#yyCancel3").val().trim();
- var yyCancel4 = $("#yyCancel4").val().trim();
+ // var yyCancel3 = $("#yyCancel3").val().trim();
+ // var yyCancel4 = $("#yyCancel4").val().trim();
var phone1 = $("#phone1").val().trim();
var phone2 = $("#phone2").val().trim();
@@ -719,15 +687,15 @@
ajax.set("ptCancel1", ptCancel1);
ajax.set("ptCancel2", ptCancel2);
- ajax.set("ptCancel3", ptCancel3);
- ajax.set("ptCancel4", ptCancel4);
+ ajax.set("ptCancel3", null);
+ ajax.set("ptCancel4", null);
ajax.set("ptCancel5", 0);
ajax.set("ptCancel6", 0);
ajax.set("yyCancel1", yyCancel1);
ajax.set("yyCancel2", yyCancel2);
- ajax.set("yyCancel3", yyCancel3);
- ajax.set("yyCancel4", yyCancel4);
+ ajax.set("yyCancel3", null);
+ ajax.set("yyCancel4", null);
ajax.set("phone1", phone1);
ajax.set("phone2", phone2);
--
Gitblit v1.7.1