From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

---
 ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
index 39b282c..7ecdcfa 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
@@ -362,7 +362,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==2?"出租券":couponUseType==7?"接送机出行券":"跨城出行券");
     $("#content2Num3").val(couponType==1?"抵扣":"满减");
     $("#content2Num4").val(money);
     $("#content2CouponId").val(id);
@@ -393,7 +393,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==2?"出租券":couponUseType==7?"接送机出行券":"跨城出行券");
     $("#content3Num3").val(couponType==1?"抵扣":"满减");
     $("#content3Num4").val(money);
     $("#content3CouponId").val(id);

--
Gitblit v1.7.1