From f15ad3456b47e43646234b9c91c3ddd77ab2cd02 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Wed, 05 Jun 2024 10:05:13 +0800
Subject: [PATCH] 123

---
 src/page/newUser/index.vue |  100 +++++++++++++++++++++++++++++++------------------
 1 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index d9a71c6..91a8eb3 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -29,28 +29,28 @@
         <van-row class="van-row-box">
           <van-col span="24">
             <div class="content-all">
-              <span>賬戶總資產(USD)</span>
+              <span>{{ $t("賬戶總資產") }}(USD)</span>
               <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">美股總資產(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">馬股總資產(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>
@@ -61,7 +61,7 @@
               @click="$router.push('/recharge')"
               class="btn-two"
               type="primary"
-              >充值</van-button
+              >{{ $t("hj172") }}</van-button
             >
           </van-col>
           <van-col span="8" style="display: flex; justify-content: center">
@@ -69,7 +69,7 @@
               @click="$router.push('/RechargeSure')"
               class="btn-two"
               type="default"
-              >提款</van-button
+              >{{ $t("提款") }}</van-button
             >
           </van-col>
           <!-- transferIndex -->
@@ -78,7 +78,7 @@
               @click="$router.push('/transferIndex')"
               class="btn-two"
               type="default"
-              >劃轉</van-button
+              >{{ $t("hj245") }}</van-button
             >
           </van-col>
           <!-- <van-col span="6" style="display: flex; justify-content: center">
@@ -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>
@@ -139,7 +139,7 @@
 import { Toast, MessageBox } from "mint-ui";
 import { isNull, pwdReg } from "@/utils/utils";
 import showHide from "@/components/showHide";
-import Vue from "Vue";
+import Vue from "vue";
 export default {
   name: "newUser",
   components: { showHide },
@@ -149,32 +149,53 @@
       xy: true,
       listAsstes: [
         {
-          title: "美股資產",
-          title1: "美股可用",
-          title2: "美股冻结",
+          title: this.$t("美股資產"),
+          title3: this.$t("美股總資產"),
+          title1: this.$t("美股可用"),
+          title2: this.$t("美股冻结"),
           accectType: "US",
           symbol: "$",
           symbolCode: "USD",
         },
         {
-          title: "印股資產",
-          title1: "印股可用",
-          title2: "印股冻结",
-          accectType: "IN",
-          symbol: "RM",
-          symbolCode: "MYR",
-        },
-        {
-          title: "馬股資產",
-          title1: "馬股可用",
-          title2: "馬股冻结",
+          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",
+        },
+        {
+          title: this.$t("印股资产"),
+          title3: this.$t("印股總資產"),
+          title1: this.$t("印股可用"),
+          title2: this.$t("印股冻结"),
+          accectType: "IN",
+          symbol: "₹",
+          symbolCode: "IND",
+        },
+        {
+          title: this.$t("日股资产"),
+          title3: this.$t("日股总资产"),
+          title1: this.$t("日股可用"),
+          title2: this.$t("日股冻结"),
+          accectType: "JP",
+          symbol: "¥",
+          symbolCode: "JPN",
+        },
       ],
-      active: "美股資產",
-      name: "大狗子",
+      active: this.$t("美股資產"),
+      name: "",
       selectUserFlag: true,
       settingDialog: false,
       oldPassword: "", // 旧密码
@@ -183,6 +204,7 @@
       userInfo: [],
       onlineService: "",
       moneyList: [],
+      asstesAll: "0.00",
     };
   },
   created() {
@@ -209,7 +231,9 @@
             }
           });
         });
-        console.log(this.listAsstes);
+
+        const arr = data.data.filter((item) => item.accectType === "ALL");
+        this.asstesAll = arr[0].totalMoneyUSD;
       }
     },
     tabsChange(e) {
@@ -258,7 +282,7 @@
       if (data.status === 0) {
         this.onlineService = data.data.onlineService;
       } else {
-        Toast(data.msg);
+        // Toast(data.msg);
       }
     },
     goWall() {
@@ -301,7 +325,7 @@
     },
     async getUserInfo() {
       // 获取用户信息
-      let data = await api.getUserInfo();
+      let data = await api.getUserInfodata();
       if (data.status === 0) {
         // 判断是否登录
         this.$store.commit("dialogVisible", false);
@@ -486,6 +510,8 @@
       color: #2d2f3c;
     }
     .li-USDT {
+      min-width: 180px;
+      text-align: right;
       font-style: normal;
       font-weight: 500;
       font-size: 0.37333rem;
@@ -988,4 +1014,4 @@
 input[type="file"] {
   display: none !important;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3