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/platform/water.js |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
index 57d4ab6..33879c8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
@@ -183,8 +183,11 @@
     var ajax = new $ax(Feng.ctxPath + "/platform/water/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.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;
     },function(data){
         Feng.error("修改失败!" + data.responseJSON.message + "!");
     });
@@ -228,7 +231,8 @@
 TUser.resetSearch = function () {
     $("#time").val("");
     $("#insertTime").val("");
-    $("#state").val("");
+    $("#type").val("");
+    $("#payType").val("");
     TUser.search();
 };
 

--
Gitblit v1.7.1