From 80d2e306cd5b74f1926f59ff9454f2a04620c8b6 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Tue, 21 May 2024 18:33:54 +0800
Subject: [PATCH] 123

---
 src/page/newUser/index.vue |   52 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index 0289d1b..5afaaf1 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -33,24 +33,24 @@
               <i @click="xy = !xy" class="iconfont xy">&#xe8c7;</i>
             </div>
             <div class="number-all">
-              <showHide :text="userInfo.totalAssets" :flg="xy" />
+              <showHide :text="asstesAll" :flg="xy" />
             </div>
           </van-col>
         </van-row>
         <van-row style="margin-top: 18px">
-          <div class="van-col van-col--8" style="margin-top: 10px">
-            <div class="content-title DINPro">{{ $t("美股總資產") }}(USD)</div>
-            <div>
-              <div class="DINPro" style="font-size: 18px">
-                <showHide :text="userInfo.usTotalAssets" :flg="xy" />
-              </div>
+          <div
+            class="van-col van-col--12"
+            style="margin-top: 10px"
+            v-for="item in listAsstes"
+            :key="item.accectType"
+          >
+            <div class="content-title DINPro">
+              {{ item.title3 }}
+              ({{ item.symbolCode }})
             </div>
-          </div>
-          <div class="van-col van-col--8" style="margin-top: 10px">
-            <div class="content-title">{{ $t("馬股總資產") }}(USD)</div>
             <div>
               <div class="DINPro" style="font-size: 18px">
-                <showHide :text="userInfo.masTotalAssets" :flg="xy" />
+                <showHide :text="item.availableBalance" :flg="xy" />
               </div>
             </div>
           </div>
@@ -102,7 +102,7 @@
             :name="item.title"
           >
             <ul class="money">
-              <li>
+              <li style="text-align: left">
                 <div class="li-title">
                   {{ item.title1 }}({{ item.symbolCode }})
                 </div>
@@ -150,27 +150,30 @@
       listAsstes: [
         {
           title: this.$t("美股資產"),
+          title3: this.$t("美股總資產"),
           title1: this.$t("美股可用"),
           title2: this.$t("美股冻结"),
           accectType: "US",
           symbol: "$",
           symbolCode: "USD",
         },
-        // {
-        //   title: this.$t("印股資產"),
-        //   title1: this.$t("印股可用"),
-        //   title2: this.$t("印股冻结"),
-        //   accectType: "IN",
-        //   symbol: "RM",
-        //   symbolCode: "MYR",
-        // },
         {
           title: this.$t("馬股資產"),
+          title3: this.$t("馬股總資產"),
           title1: this.$t("馬股可用"),
           title2: this.$t("馬股冻结"),
           accectType: "MAS",
           symbol: "RM",
           symbolCode: "MYR",
+        },
+        {
+          title: this.$t("港股资产"),
+          title3: this.$t("港股總資產"),
+          title1: this.$t("港股可用"),
+          title2: this.$t("港股冻结"),
+          accectType: "HK",
+          symbol: "HK$",
+          symbolCode: "HKD",
         },
       ],
       active: this.$t("美股資產"),
@@ -183,6 +186,7 @@
       userInfo: [],
       onlineService: "",
       moneyList: [],
+      asstesAll: "0.00",
     };
   },
   created() {
@@ -209,7 +213,9 @@
             }
           });
         });
-        console.log(this.listAsstes);
+
+        const arr = data.data.filter((item) => item.accectType === "ALL");
+        this.asstesAll = arr[0].totalMoneyUSD;
       }
     },
     tabsChange(e) {
@@ -301,7 +307,7 @@
     },
     async getUserInfo() {
       // 获取用户信息
-      let data = await api.getUserInfo();
+      let data = await api.getUserInfodata();
       if (data.status === 0) {
         // 判断是否登录
         this.$store.commit("dialogVisible", false);
@@ -486,6 +492,8 @@
       color: #2d2f3c;
     }
     .li-USDT {
+      min-width: 180px;
+      text-align: right;
       font-style: normal;
       font-weight: 500;
       font-size: 0.37333rem;

--
Gitblit v1.9.3