From 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 01 二月 2024 08:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js | 8 ++++----
1 files changed, 4 insertions(+), 4 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 076986a..57999ba 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
@@ -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);
@@ -487,8 +487,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