From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js b/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
index 6502d8f..61d7085 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
@@ -97,7 +97,7 @@
     reqData['num2'] = Number($("#num2").val());
     reqData['num3'] = Number($("#num3").val());
     reqData['num4'] = Number($("#num4").val());
-    reqData['num5'] = Number($("#num5").val());
+    // reqData['num5'] = Number($("#num5").val());
     ajax.set("content",JSON.stringify(reqData));
     ajax.set("type",1);
     ajax.start();
@@ -120,6 +120,7 @@
     reqData['num4'] = $("#num4").val();
     reqData['num5'] = $("#num5").val();
     reqData['num6'] = $("#num6").val();
+    reqData['num7'] = $("#num7").val();
     console.log(JSON.stringify(reqData))
     ajax.set("content",JSON.stringify(reqData));
     ajax.set("type",2);
@@ -139,6 +140,11 @@
     reqData['num1'] = Number($("#num1").val());
     reqData['num2'] = Number($("#num2").val());
     reqData['num3'] = $("#num3").val();
+    reqData['num4'] = $("#num4").val();
+    if(reqData.num4 > reqData.num3){
+        Feng.error("平台抽成金额不能大于总抽成金额");
+        return
+    }
     ajax.set("content",JSON.stringify(reqData));
     ajax.set("type",3);
     ajax.start();

--
Gitblit v1.7.1