From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug

---
 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html |   38 ++++++++++++++++----------------------
 1 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
index 0517c9b..2dffc61 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
@@ -272,20 +272,20 @@
                                                 <th style="width: 250px;">充值金额</th>
                                                 <th style="width: 250px;">有效天数</th>
                                                 <th style="width: 300px;">最高金额</th>
-                                                <th style="width: 300px;">通用券金额</th>
-                                                <th style="width: 300px;">通用券数量</th>
-                                                <th style="width: 300px;">专车券金额</th>
-                                                <th style="width: 300px;">专车券数量</th>
-                                                <th style="width: 400px;">出租车券金额</th>
-                                                <th style="width: 400px;">出租车券数量</th>
-                                                <th style="width: 300px;">城际金额</th>
-                                                <th style="width: 300px;">城际券数量</th>
+                                                <th style="width: 300px;">通用优惠券金额</th>
+                                                <th style="width: 300px;">通用优惠卷数量</th>
+                                                <th style="width: 300px;">打车优惠券金额</th>
+                                                <th style="width: 300px;">打车优惠券数量</th>
+                                                <!--<th style="width: 400px;">出租车券金额</th>-->
+                                                <!--<th style="width: 400px;">出租车券数量</th>-->
+                                                <th style="width: 300px;">包裹优惠卷金额</th>
+                                                <th style="width: 300px;">包裹优惠券数量</th>
                                                 <th style="width: 100px;">操作</th>
                                             </tr>
                                             </thead>
                                             <tbody id="coun">
                                                 @for(obj in balanceInfoList){
-                                                    <tr class="timeClass">' +
+                                                    <tr class="timeClass">
                                                         <td><input type="hidden" id="id1" name="id1" value="${obj.generalCouponId}"><input type="hidden" id="num1" name="num1" value="${obj.money}">${obj.money}</td>
                                                         <td><input type="hidden" id="id2" name="id2" value="${obj.specialCouponId}"><input type="hidden" id="num10" name="num10" value="${obj.effective}">${obj.effective}</td>
                                                         <td><input type="hidden" id="num11" name="num11" value="${obj.totalPrice}">${obj.totalPrice}</td>
@@ -295,11 +295,11 @@
                                                         <td><input type="hidden" id="num5" name="num5" value="${obj.specialCouponMoney}">${obj.specialCouponMoney}</td>
                                                         <td><input type="hidden" id="num4" name="num4" value="${obj.specialNum}">${obj.specialNum}</td>
 
-                                                        <td><input type="hidden" id="num7" name="num7" value="${obj.taxiCouponMoney}">${obj.taxiCouponMoney}</td>
-                                                        <td><input type="hidden" id="num6" name="num6" value="${obj.taxiNum}">${obj.taxiNum}</td>
+<!--                                                        <td><input type="hidden" id="num7" name="num7" value="${obj.taxiCouponMoney}">${obj.taxiCouponMoney}</td>-->
+<!--                                                        <td><input type="hidden" id="num6" name="num6" value="${obj.taxiNum}">${obj.taxiNum}</td>-->
 
-                                                        <td><input type="hidden" id="num9" name="num9" value="${obj.intercityCouponMoney}">${obj.intercityCouponMoney}</td>
-                                                        <td><input type="hidden" id="num8" name="num8" value="${obj.intercityNum}">${obj.intercityNum}</td>
+                                                        <td><input type="hidden" id="num9" name="num7" value="${obj.intercityCouponMoney}">${obj.intercityCouponMoney}</td>
+                                                        <td><input type="hidden" id="num8" name="num6" value="${obj.intercityNum}">${obj.intercityNum}</td>
                                                         <td><button onclick="deleteSub(this)">移除</button></td>
                                                     </tr>
                                                 @}
@@ -334,6 +334,7 @@
                                                  @}
                                                  name="zc1" id="content5Num1" class="form-control newWidth" />&nbsp;
                                     <br/>
+                                    <!--
                                     <br/>
                                     出租车活动打折:
                                     &nbsp;&nbsp;&nbsp;
@@ -345,6 +346,7 @@
                                                  @}
                                                  name="zc1" id="content5Num2" class="form-control newWidth" />&nbsp;
                                     <br/>
+                                    -->
                                     <br/>
                                     小件物流活动打折:
                                     &nbsp;<input type="text"
@@ -438,16 +440,7 @@
                                                         name="zc1" id="content6Num3" class="form-control newWidth"  readonly/>&nbsp;
                                     <br/>
                                     <br/>
-                                    有效期:
-                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    &nbsp;<input type="text"
 
-                                                 @if(isNotEmpty(item5Red)){
-                                                 value="${item5Red.effective}"
-                                                 @}else{
-                                                 value=""
-                                                 @}
-                                                 name="zc1" id="content6Num4" class="form-control newWidth" readonly/>&nbsp;天
                                     最高金额:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="text"
                                                                               @if(isNotEmpty(item5)){
                                                                               value="${item5.totalPrice}"
@@ -461,6 +454,7 @@
                     </div>
                 </div>
             </div>
+            </div>
 
             <div class="row btn-group-m-t">
                 <div class="col-sm-10 col-sm-offset-5">

--
Gitblit v1.7.1