From 2d04ec3151d409f93db5add5b858c1db2b74831e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com>
Date: Mon, 9 Dec 2024 20:44:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/wallet.js          | 16 ++++++++++++++++
 src/views/modules/wallet/index.vue | 14 ++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/api/modules/wallet.js b/src/api/modules/wallet.js
index 33645c8..ac64f7a 100644
--- a/src/api/modules/wallet.js
+++ b/src/api/modules/wallet.js
@@ -25,4 +25,20 @@ export const wallet = {
       params: data,
     });
   },
+  //钱包账单收支金额
+  totalAmount: (data) => {
+    return $http.request({
+      url: `/merchant-api/walletBill/totalAmount`,
+      method: "post",
+      data: data,
+    });
+  },
+  //钱包账单
+  getBankInfo: (data) => {
+    return $http.request({
+      url: `/merchant-api/walletBill/page`,
+      method: "get",
+      params: data,
+    });
+  },
 };
diff --git a/src/views/modules/wallet/index.vue b/src/views/modules/wallet/index.vue
index 644d1ef..b8ca764 100644
--- a/src/views/modules/wallet/index.vue
+++ b/src/views/modules/wallet/index.vue
@@ -185,7 +185,7 @@
                 <div style="font-size: 18px; font-weight: 600">总收入</div>
                 <div style="margin-top: 20px; font-size: 18px">
                   ￥{{
-                    userInfo.availableAmount ? userInfo.availableAmount : "0"
+                    TotalData.totalIncome ? TotalData.totalIncome : "0"
                   }}
                 </div>
               </div>
@@ -193,7 +193,7 @@
                 <div style="font-size: 18px; font-weight: 600">总支出</div>
                 <div style="margin-top: 20px; font-size: 18px">
                   ￥{{
-                    userInfo.availableAmount ? userInfo.availableAmount : "0"
+                    TotalData.totalExpenditure ? TotalData.totalExpenditure : "0"
                   }}
                 </div>
               </div>
@@ -243,6 +243,7 @@ export default {
       value1: [],
       userInfo: {},
       tableData: [],
+      TotalData:{},
       query: {
         pageNumber: 1,
         pageSize: 10,
@@ -271,6 +272,15 @@ export default {
 
         this.tableData = res.data.data.data;
       });
+      this.$api.wallet.totalAmount({amountChangeType:""}).then((res) => {
+        console.log(res);
+        this.TotalData = res.data.data
+        // this.total = res.data.data;
+      });
+      this.$api.wallet.getBankInfo().then((res) => {
+        console.log(res);
+        // this.total = res.data.data;
+      });
     },
     handleSizeChange(val) {
       this.query.pageSize = val;