From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug

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

diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
index a222eab..fc749d7 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js
@@ -129,21 +129,21 @@
         }
     }
     var content5Num2 = $("#content5Num2").val();
-    if($.trim(content5Num2)!=""){
-        if(isNaN(content5Num2) || content5Num2<=0 || content5Num2>10){
+    if ($.trim(content5Num2) != "") {
+        if (isNaN(content5Num2) || content5Num2 <= 0 || content5Num2 > 10) {
             Feng.error("请输入正确折扣数!");
             getContent(5);
             return;
         }
     }
-    var content5Num3 = $("#content5Num3").val();
-    if($.trim(content5Num3)!=""){
-        if(isNaN(content5Num3) || content5Num3<=0 || content5Num3>10){
-            Feng.error("请输入正确折扣数!");
-            getContent(5);
-            return;
-        }
-    }
+    // var content5Num3 = $("#content5Num3").val();
+    // if($.trim(content5Num3)!=""){
+    //     if(isNaN(content5Num3) || content5Num3<=0 || content5Num3>10){
+    //         Feng.error("请输入正确折扣数!");
+    //         getContent(5);
+    //         return;
+    //     }
+    // }
     var content6RedId = $("#content6RedId").val();
     var elem1 = document.querySelector('.js-switch');
     var elem2 = document.querySelector('.js-switch1');
@@ -152,7 +152,7 @@
     var elem3 = document.querySelector('.js-switch4');
     console.log(JSON.stringify(subArr))
     //提交信息
-    var ajax = new $ax(Feng.ctxPath + "/userActivity/add", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/userActivity/add", function (data) {
         Feng.success("添加成功!");
         window.parent.UserActivity.table.refresh();
         UserActivityInfoDlg.close();
@@ -175,9 +175,9 @@
     ajax.set("balanceInfo",JSON.stringify(subArr));
     ajax.set("discountEnable",elem4.checked==true?2:1);
     ajax.set("discountSpecial",content5Num1);
-    ajax.set("discountTaxi",content5Num2);
-    ajax.set("discountLogistics",content5Num3);
-    ajax.set("redenvelopeId",$("#content6RedId").val());
+    ajax.set("discountTaxi", content5Num2);
+    ajax.set("discountLogistics", 0);
+    ajax.set("redenvelopeId", $("#content6RedId").val());
     ajax.set("redenvelopeEnable",elem5.checked==true?2:1);
     ajax.set('redPrice', $('#content6Num5').val());
     ajax.start();
@@ -257,21 +257,21 @@
         }
     }
     var content5Num2 = $("#content5Num2").val();
-    if($.trim(content5Num2)!=""){
-        if(isNaN(content5Num2) || content5Num2<=0 || content5Num2>10){
+    if ($.trim(content5Num2) != "") {
+        if (isNaN(content5Num2) || content5Num2 <= 0 || content5Num2 > 10) {
             Feng.error("请输入正确折扣数!");
             getContent(5);
             return;
         }
     }
-    var content5Num3 = $("#content5Num3").val();
-    if($.trim(content5Num3)!=""){
-        if(isNaN(content5Num3) || content5Num3<=0 || content5Num3>10){
-            Feng.error("请输入正确折扣数!");
-            getContent(5);
-            return;
-        }
-    }
+    // var content5Num3 = $("#content5Num3").val();
+    // if($.trim(content5Num3)!=""){
+    //     if(isNaN(content5Num3) || content5Num3<=0 || content5Num3>10){
+    //         Feng.error("请输入正确折扣数!");
+    //         getContent(5);
+    //         return;
+    //     }
+    // }
     var content6RedId = $("#content6RedId").val();
     var elem1 = document.querySelector('.js-switch');
     var elem2 = document.querySelector('.js-switch1');
@@ -280,7 +280,7 @@
     var elem3 = document.querySelector('.js-switch4');
     console.log(JSON.stringify(subArr))
     //提交信息
-    var ajax = new $ax(Feng.ctxPath + "/userActivity/update", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/userActivity/update", function (data) {
         Feng.success("修改成功!");
         window.parent.UserActivity.table.refresh();
         UserActivityInfoDlg.close();
@@ -304,9 +304,9 @@
     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("redenvelopeId",$("#content6RedId").val());
+    ajax.set("discountTaxi", parseFloat(content5Num2));
+    ajax.set("discountLogistics", parseFloat(0));
+    ajax.set("redenvelopeId", $("#content6RedId").val());
     ajax.set("redenvelopeEnable",elem5.checked==true?2:1);
     ajax.set('redPrice', $('#content6Num5').val());
     ajax.start();

--
Gitblit v1.7.1