From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js
index d6537ea..0cc5b03 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js
@@ -170,8 +170,12 @@
     var ajax = new $ax(Feng.ctxPath + "/subsidy/use/getCount", function(data){
 
         document.getElementById("num1").innerHTML = data.total;
-        document.getElementById("num2").innerHTML = data.balance;
-        document.getElementById("num3").innerHTML = data.unBalance;
+        document.getElementById("num2").innerHTML = data.discount;
+        document.getElementById("num3").innerHTML = data.redPackage;
+        document.getElementById("num4").innerHTML = data.coupon;
+        document.getElementById("num5").innerHTML = data.driver;
+        document.getElementById("num6").innerHTML = data.driverWithdrawal;
+        document.getElementById("num7").innerHTML = data.driverConsume;
     },function(data){
         Feng.error("修改失败!" + data.responseJSON.message + "!");
     });
@@ -186,11 +190,12 @@
     var ajax = new $ax(Feng.ctxPath + "/subsidy/use/getCount", function(data){
 
         document.getElementById("num1").innerHTML = data.total;
-        document.getElementById("num2").innerHTML = data.userOrder;
-        document.getElementById("num3").innerHTML = data.userCharge;
-        document.getElementById("num4").innerHTML = data.balance;
-        document.getElementById("num5").innerHTML = data.driverWithdrawal;
-        document.getElementById("num6").innerHTML = data.userWithdrawal;
+        document.getElementById("num2").innerHTML = data.discount;
+        document.getElementById("num3").innerHTML = data.redPackage;
+        document.getElementById("num4").innerHTML = data.coupon;
+        document.getElementById("num5").innerHTML = data.driver;
+        document.getElementById("num6").innerHTML = data.driverWithdrawal;
+        document.getElementById("num7").innerHTML = data.driverConsume;
     },function(data){
         Feng.error("修改失败!" + data.responseJSON.message + "!");
     });

--
Gitblit v1.7.1