From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
index 379de45..fd14e01 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
@@ -337,9 +337,9 @@
ajax.set("balanceEnable",elem3.checked==true?2:1);
ajax.set("balanceInfo",JSON.stringify(subArr));
ajax.set("discountEnable",elem4.checked==true?2:1);
- ajax.set("discountSpecial",parseFloat(content5Num1));
- ajax.set("discountTaxi",parseFloat(content5Num2));
- ajax.set("discountLogistics",parseFloat(content5Num3));
+ ajax.set("discountSpecial",content5Num1);
+ ajax.set("discountTaxi",content5Num2);
+ ajax.set("discountLogistics",content5Num3);
ajax.set("discountDistance",content5Num4);
ajax.set("discountOrderNum",content5Num5);
ajax.set("redenvelopeId",$("#content6RedId").val());
@@ -398,7 +398,7 @@
* @param money
*/
UserActivityInfoDlg.selectCouponOpt=function(id,couponUseType,couponType,money,name){
- $("#content2Num2").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":"跨城出行券");
+ $("#content2Num2").val(couponUseType==0?"通用优惠券":couponUseType==1?"打车优惠券":couponUseType==4?"包裹优惠券":"跨城出行券");
$("#content2Num3").val(couponType==1?"抵扣":"满减");
$("#content2Num4").val(money);
$("#content2CouponId").val(id);
@@ -429,7 +429,7 @@
* @param money
*/
UserActivityInfoDlg.selectCouponOpt1=function(id,couponUseType,couponType,money,name){
- $("#content3Num2").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":"跨城出行券");
+ $("#content3Num2").val(couponUseType==0?"通用优惠券":couponUseType==1?"打车优惠券":couponUseType==4?"包裹优惠券":"跨城出行券");
$("#content3Num3").val(couponType==1?"抵扣":"满减");
$("#content3Num4").val(money);
$("#content3CouponId").val(id);
@@ -460,7 +460,6 @@
UserActivityInfoDlg.selectRedOpt=function(id,type,totalMoney,money,startMoney,endMoney,effective){
$("#content6Num1").val(type==1?"固定金额":"随机金额");
$("#content6Num3").val(type==1?money:startMoney+"-"+endMoney);
- $("#content6Num4").val(effective);
$("#content6RedId").val(id);
$("#content6Num2").val(totalMoney);
}
@@ -487,8 +486,8 @@
'<td><input type="hidden" id="id4" name="id4" value="'+id4+'"><input type="hidden" id="num2" name="num2" value="'+num2+'">' + num2 + '</td>' +
'<td><input type="hidden" id="num5" name="num5" value="'+num5+'">' + num5 + '</td>' +
'<td><input type="hidden" id="num4" name="num4" value="'+num4+'">' + num4 + '</td>' +
- // '<td><input type="hidden" id="num7" name="num7" value="'+num7+'">' + num7 + '</td>' +
- // '<td><input type="hidden" id="num6" name="num6" value="'+num6+'">' + num6 + '</td>' +
+ '<td><input type="hidden" id="num7" name="num7" value="'+num7+'">' + num7 + '</td>' +
+ '<td><input type="hidden" id="num6" name="num6" value="'+num6+'">' + num6 + '</td>' +
// '<td><input type="hidden" id="num9" name="num9" value="'+num9+'">' + num9 + '</td>' +
// '<td><input type="hidden" id="num8" name="num8" value="'+num8+'">' + num8 + '</td>' +
'<td><button onclick="deleteSub(this)">移除</button></td></tr>';
--
Gitblit v1.7.1