From 765fb2bcf5761367d2fd018a0d461db7a1e0ff7f Mon Sep 17 00:00:00 2001
From: JS-LM <2497833386@QQ.com>
Date: Thu, 15 Jun 2023 17:03:55 +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/adapayMember/adapayMember.js      |  8 +++
 .../pile/merchant/components/adapayMember.vue | 10 +++-
 .../merchant/components/walletSummary.vue     | 52 +++++++++++++------
 jsowell-ui/src/views/pile/merchant/detail.vue |  2 +-
 4 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/jsowell-ui/src/api/adapayMember/adapayMember.js b/jsowell-ui/src/api/adapayMember/adapayMember.js
index 00f2c7231..584c46de5 100644
--- a/jsowell-ui/src/api/adapayMember/adapayMember.js
+++ b/jsowell-ui/src/api/adapayMember/adapayMember.js
@@ -32,3 +32,11 @@ export function selectSettleAccount(data) {
     data: data
   })
 }
+// 查看钱包
+export function queryAdapayAccountBalance(data) {
+  return request({
+    url: '/adapay/member/queryAdapayAccountBalance',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
index e19f7c026..3315e1cef 100644
--- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
@@ -59,14 +59,14 @@
         <el-dialog
             title="创建汇付会员与结算账户"
             :visible.sync="openCreateAdapaySettleAccount"
-            width="150"
+            width="25%"
             append-to-body
         >
             <el-form
                 :model="ruleForm"
                 :rules="rules"
                 ref="ruleForm"
-                label-width="250px"
+                label-width="150px"
                 class="demo-ruleForm"
             >
                <el-form-item label="会员昵称" prop="nickname">
@@ -382,3 +382,9 @@ export default {
     },
 };
 </script>
+<style lang="scss" scoped>
+::v-deep .el-input .el-input--medium{
+    width: 43% !important;
+}
+
+</style>
diff --git a/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue b/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue
index e19777a8e..1a1440cd7 100644
--- a/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/walletSummary.vue
@@ -13,36 +13,36 @@
             <div class="main" style="flex: 1; align-items: baseline">
                 <div class="bord"></div>
                 <div class="card">
-                    <p>待清分</p>
-                    <p>2121 （元）</p>
+                    <p>账户余额</p>
+                    <p>{{adapayMember.acctBalance}} （元）</p>
                     <p style="text-align: justify">
-                        包括未到清分时间以及尚未执行清分的订单数据
+                        账户余额 = 可用余额 + 冻结余额
                     </p>
                 </div>
                 <div class="bord"></div>
                 <div class="card">
-                    <p>清分在途</p>
-                    <p>2121 （元）</p>
-                    <p>包括未到清分时间以及尚未执行清分的订单数据</p>
+                    <p>可用余额</p>
+                    <p>{{adapayMember.avlBalance}} （元）</p>
+                    <p>该余额大于0时，才可发起取现</p>
                 </div>
                 <div class="bord"></div>
                 <div class="card">
-                    可提现
-                    <p>1203 （元）</p>
-                    <button>提现申请</button>
+                    冻结余额
+                    <p>{{adapayMember.frzBalance}} （元）</p>
+                    <p>当配置了自动结算功能，在每日发起结算时会将可用余额转为冻结金额。该部分金额不允许取现。</p>
                 </div>
                 <div class="bord"></div>
                 <div class="card">
-                    <p>提现申请中</p>
-                    <p>1203 （元）</p>
-                    <button>提现记录</button>
+                    <p>昨日日终余额</p>
+                    <p>{{adapayMember.lastAvlBalance}} （元）</p>
+                    <!-- <button>昨</button> -->
                 </div>
                 <div class="bord"></div>
-                <div class="card">
+                <!-- <div class="card">
                     <p>已提现</p>
                     <p>165（元）</p>
                     <p>以成功提现到绑定银行卡的金额汇总</p>
-                </div>
+                </div> -->
             </div>
         </div>
         <el-tabs
@@ -127,8 +127,12 @@
     </div>
 </template>
 
-<script>
+<script>queryAdapayAccountBalance
+import {
+    queryAdapayAccountBalance
+} from "@/api/adapayMember/adapayMember";
 export default {
+  props:['merchantId'],
     data() {
         return {
             activeName: "first",
@@ -136,7 +140,8 @@ export default {
             buttonBoolean: false,
             //图标，可根据自己的需求匹配
             icon: "el-icon-caret-bottom",
-            createTimeRange:''
+            createTimeRange:'',
+            adapayMember:{}
         };
     },
     methods: {
@@ -154,7 +159,22 @@ export default {
                 this.buttonBoolean = !this.buttonBoolean;
             }
         },
+          getList() {
+            console.log("this.merchantId", this.merchantId);
+            let param = {
+                merchantId: this.merchantId,
+            };
+            queryAdapayAccountBalance(param).then((response) => {
+                console.log("查询 queryAdapayAccountBalance", response);
+                 this.adapayMember = response.data;
+             
+            });
+        },
+
     },
+    created () {
+      this.getList()
+    }
 };
 </script>
 <style lang="scss" scoped>
diff --git a/jsowell-ui/src/views/pile/merchant/detail.vue b/jsowell-ui/src/views/pile/merchant/detail.vue
index 053d01139..c5f826781 100644
--- a/jsowell-ui/src/views/pile/merchant/detail.vue
+++ b/jsowell-ui/src/views/pile/merchant/detail.vue
@@ -8,7 +8,7 @@
     <el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane>
 <!--    <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>-->
     <el-tab-pane label="钱包汇总" name="wallet">
-      <wallet-summary></wallet-summary>
+      <wallet-summary :merchantId="merchantId"></wallet-summary>
     </el-tab-pane>
     <el-tab-pane label="营收报表" name="revenue">
       <revenue :merchantId="merchantId"></revenue>