From 832a37044afeea095d43535bcec6d2e71c4d2409 Mon Sep 17 00:00:00 2001
From: PC-20250623MANY\Administrator <344137771@qq.com>
Date: Sat, 16 Aug 2025 14:29:20 +0800
Subject: [PATCH] 1

---
 src/views/account/account.vue |  169 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 120 insertions(+), 49 deletions(-)

diff --git a/src/views/account/account.vue b/src/views/account/account.vue
index c5b3789..66b2f59 100644
--- a/src/views/account/account.vue
+++ b/src/views/account/account.vue
@@ -11,38 +11,17 @@
       </div>
 
       <div class="flex-between" style="width: 100%">
-        <div class="overview-content">
-          <div class="overview-item">
-            <div class="item-label">{{ $t("hj49") }}</div>
-            <div class="item-value">
-              {{ moneyData.symbol }} {{ moneyData.totalMoney }}
-            </div>
-          </div>
-          <div class="overview-item">
-            <div class="item-label">{{ $t("hj48") }}</div>
-            <div class="item-value">
-              {{ moneyData.symbol }} {{ moneyData.availableBalance }}
-            </div>
-          </div>
-          <div class="overview-item">
-            <div class="item-label">{{ $t("ff1") }}</div>
-            <div class="item-value">
-              {{ moneyData.symbol }} {{ moneyData.freezeMoney }}
-            </div>
-          </div>
-        </div>
-
         <div class="action-buttons">
-			<el-button
-			  type="success"
-			  class="deposit-btn"
-			  @click="trasferireVisible = true"
-			>
-			  <div class="flex-center">
-			    <img src="@/assets/images/account_hz.png" alt="Deposit" />
-			    {{ $t("劃轉") }}
-			  </div>
-			</el-button>
+          <el-button
+            type="success"
+            class="deposit-btn"
+            @click="trasferireVisible = true"
+          >
+            <div class="flex-center">
+              <img src="@/assets/images/account_hz.png" alt="Deposit" />
+              {{ $t("劃轉") }}
+            </div>
+          </el-button>
           <el-button
             type="success"
             class="deposit-btn"
@@ -101,6 +80,29 @@
         <div class="market-header">
           <h3>{{ $t("美国") }}</h3>
         </div>
+
+        <div
+          class="overview-content"
+          v-for="i in moneyData"
+          :key="i.id"
+          v-show="i.accectType == 'US'"
+        >
+          <div class="overview-item">
+            <div class="item-label">{{ $t("hj49") }}</div>
+            <div class="item-value">{{ i.symbol }} {{ i.totalMoney }}</div>
+          </div>
+          <div class="overview-item">
+            <div class="item-label">{{ $t("hj48") }}</div>
+            <div class="item-value">
+              {{ i.symbol }} {{ i.availableBalance }}
+            </div>
+          </div>
+          <div class="overview-item">
+            <div class="item-label">{{ $t("ff1") }}</div>
+            <div class="item-value">{{ i.symbol }} {{ i.freezeMoney }}</div>
+          </div>
+        </div>
+
         <div class="market-content">
           <div class="market-row">
             <div class="market-label">
@@ -149,6 +151,29 @@
         <div class="market-header">
           <h3>{{ $t("hk1") }}</h3>
         </div>
+        
+        <div
+          class="overview-content"
+          v-for="i in moneyData"
+          :key="i.id"
+          v-show="i.accectType == 'HK'"
+        >
+          <div class="overview-item">
+            <div class="item-label">{{ $t("hj49") }}</div>
+            <div class="item-value">{{ i.symbol }} {{ i.totalMoney }}</div>
+          </div>
+          <div class="overview-item">
+            <div class="item-label">{{ $t("hj48") }}</div>
+            <div class="item-value">
+              {{ i.symbol }} {{ i.availableBalance }}
+            </div>
+          </div>
+          <div class="overview-item">
+            <div class="item-label">{{ $t("ff1") }}</div>
+            <div class="item-value">{{ i.symbol }} {{ i.freezeMoney }}</div>
+          </div>
+        </div>
+
         <div class="market-content">
           <div class="market-row">
             <div class="market-label">
@@ -197,11 +222,34 @@
         </div>
       </div>
     </div>
-    <div class="market-data page-w a_card" style="padding-top: 0;">
+    <div class="market-data page-w a_card" style="padding-top: 0">
       <div class="market-section sb_b">
         <div class="market-header">
           <h3>{{ $t("tw") }}</h3>
         </div>
+        
+        <div
+          class="overview-content"
+          v-for="i in moneyData"
+          :key="i.id"
+          v-show="i.accectType == 'TW'"
+        >
+          <div class="overview-item">
+            <div class="item-label">{{ $t("hj49") }}</div>
+            <div class="item-value">{{ i.symbol }} {{ i.totalMoney }}</div>
+          </div>
+          <div class="overview-item">
+            <div class="item-label">{{ $t("hj48") }}</div>
+            <div class="item-value">
+              {{ i.symbol }} {{ i.availableBalance }}
+            </div>
+          </div>
+          <div class="overview-item">
+            <div class="item-label">{{ $t("ff1") }}</div>
+            <div class="item-value">{{ i.symbol }} {{ i.freezeMoney }}</div>
+          </div>
+        </div>
+
         <div class="market-content">
           <div class="market-row">
             <div class="market-label">
@@ -249,11 +297,34 @@
           </div>
         </div>
       </div>
-      
+
       <div class="market-section sb_b">
         <div class="market-header">
           <h3>{{ $t("id1") }}</h3>
         </div>
+        
+        <div
+          class="overview-content"
+          v-for="i in moneyData"
+          :key="i.id"
+          v-show="i.accectType == 'IN'"
+        >
+          <div class="overview-item">
+            <div class="item-label">{{ $t("hj49") }}</div>
+            <div class="item-value">{{ i.symbol }} {{ i.totalMoney }}</div>
+          </div>
+          <div class="overview-item">
+            <div class="item-label">{{ $t("hj48") }}</div>
+            <div class="item-value">
+              {{ i.symbol }} {{ i.availableBalance }}
+            </div>
+          </div>
+          <div class="overview-item">
+            <div class="item-label">{{ $t("ff1") }}</div>
+            <div class="item-value">{{ i.symbol }} {{ i.freezeMoney }}</div>
+          </div>
+        </div>
+
         <div class="market-content">
           <div class="market-row">
             <div class="market-label">
@@ -383,26 +454,26 @@
       </div>
     </div>
 
-	<!-- 划转弹窗 -->
-	<Trasferire
-	  :dialogVisible.sync="trasferireVisible"
-	  v-if="trasferireVisible"
-	  @onClose="getMoney"
-	  :maxNum="Math.floor(moneyData.availableBalance * 100) / 100"
-	></Trasferire>
+    <!-- 划转弹窗 -->
+    <Trasferire
+      :dialogVisible.sync="trasferireVisible"
+      v-if="trasferireVisible"
+      @onClose="getMoney"
+      :moneyData="moneyData"
+    ></Trasferire>
     <!-- 充值弹窗 -->
     <Deposit
       :dialogVisible.sync="depositDialogVisible"
       v-if="depositDialogVisible"
       @onClose="getMoney"
     ></Deposit>
-	
+
     <!-- 提现弹窗 -->
     <Withdraw
       :dialogVisible.sync="withdrawVisible"
       v-if="withdrawVisible"
       @onClose="getMoney"
-      :maxNum="Math.floor(moneyData.availableBalance * 100) / 100"
+      :moneyData="moneyData"
     ></Withdraw>
 
     <!-- 贷款申请弹窗 -->
@@ -464,7 +535,7 @@
     lp,
     bto,
     Deposit,
-	Trasferire,
+    Trasferire,
     Withdraw,
     LoanApplication,
     LoanRecords,
@@ -474,13 +545,13 @@
   data() {
     return {
       nav: 1,
-      moneyData: {}, // 账户金额
+      moneyData: [], // 账户金额
       userInfo: {}, // 用户信息
       positionData: {}, // 账户持仓数据
       depositAmount: "", // 存款金额
       depositMethod: "Bank Transfer", // 存款方式
       depositDialogVisible: false, // 存款弹窗显示状态
-	  trasferireVisible: false, // 存款弹窗显示状态
+      trasferireVisible: false, // 存款弹窗显示状态
       withdrawVisible: false, // 存款弹窗显示状态
       applicationVisible: false, // 申请贷款弹窗显示状态
       recordsVisible: false, // 贷款记录弹窗显示状态
@@ -509,7 +580,7 @@
     async getMoney() {
       let data = await api.getMoney();
       if (data.status === 0) {
-        this.moneyData = data.data[0];
+        this.moneyData = data.data;
       }
     },
     // 获取用户信息
@@ -593,8 +664,8 @@
 .overview-content {
   display: flex;
   justify-content: space-between;
-  margin-bottom: 20px;
-  width: 50%;
+  // margin-bottom: 20px;
+  padding: 15px 20px 0;
 }
 
 .overview-item {
@@ -615,7 +686,7 @@
 
 .action-buttons {
   display: flex;
-  justify-content: flex-end;
+  justify-content: flex-start;
   margin-bottom: 20px;
   width: 50%;
 

--
Gitblit v1.9.3