From 7d87d35f9241b01da0f6cf016c7cc65ef183e8fc Mon Sep 17 00:00:00 2001
From: unclekh <5177787+unclekh@user.noreply.gitee.com>
Date: Mon, 13 Jul 2020 23:14:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=99=AF=E9=A1=B5=E9=9D=A2=E6=80=BB?=
 =?UTF-8?q?=E9=A2=9D=E3=80=81=E5=9C=B0=E5=9D=80=E3=80=81=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B3=95=E5=B8=81=E4=BA=A4=E6=98=93=E7=9A=84?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E3=80=81=E6=8F=90=E5=B8=81=EF=BC=8C=E5=B8=81?=
 =?UTF-8?q?=E5=B8=81=E4=BA=A4=E6=98=93=E7=9A=84=E5=85=85=E5=80=BC=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=85=85=E5=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/balances/banlanes-tabds.vue | 25 +++----
 src/components/common/header.vue           |  2 +-
 src/locales/lang/balances.zh-CN.js         |  2 +-
 src/locales/lang/balances.zh-HK.js         |  2 +-
 src/pages/entry.vue                        | 79 +++++++++++++++++++---
 5 files changed, 85 insertions(+), 25 deletions(-)

diff --git a/src/components/balances/banlanes-tabds.vue b/src/components/balances/banlanes-tabds.vue
index 2f9dc92..aeca8d6 100644
--- a/src/components/balances/banlanes-tabds.vue
+++ b/src/components/balances/banlanes-tabds.vue
@@ -78,19 +78,19 @@
               <el-button type="text" class="white size">o.oooooo</el-button>
             </div>-->
             <div>
-              <!-- 充值 -->
+              <!-- 充值
               <span
                 class="blue"
                 @click="handleTableActionClick('deposit', itembtc)"
                 type="text"
                 >{{ $t('balances.table.header_last_recharge') }}</span
-              >
-              <!-- 提币   -->
+              > -->
+              <!-- 提币
               <span
                 @click="handleTableActionClick('withdrawal', itembtc)"
                 type="text"
                 >{{ $t('balances.table.header_last_mention') }}</span
-              >
+              >  -->
               <!-- 划转 -->
               <span
                 @click="handleTableActionClick('transfer', itembtc)"
@@ -148,18 +148,18 @@
             </div>
 
             <div>
-              <!-- 充值 -->
+              <!-- 充值
               <span
                 @click="handleTableActionClick('deposit', itemETH)"
                 type="text"
                 >{{ $t('balances.table.header_last_recharge') }}</span
-              >
-              <!-- 提币 -->
+              >-->
+              <!-- 提币
               <span
                 @click="handleTableActionClick('withdrawal', itemETH)"
                 type="text"
                 >{{ $t('balances.table.header_last_mention') }}</span
-              >
+              > -->
               <!-- 划转 -->
               <span
                 @click="handleTableActionClick('transfer', itemETH)"
@@ -216,18 +216,18 @@
               }}</span>
             </div>
             <div>
-              <!-- 充值 -->
+              <!-- 充值
               <span
                 @click="handleTableActionClick('deposit', item)"
                 type="text"
                 >{{ $t('balances.table.header_last_recharge') }}</span
-              >
-              <!-- 提币   -->
+              >-->
+              <!-- 提币
               <span
                 @click="handleTableActionClick('withdrawal', item)"
                 type="text"
                 >{{ $t('balances.table.header_last_mention') }}</span
-              >
+              >  -->
               <!-- 划转 -->
               <span
                 @click="handleTableActionClick('transfer', item)"
@@ -682,6 +682,7 @@ export default {
           // 获取btc转usdt资产
           if (this.USDTPrie[i].currencyPair == 'BTC-USDT') {
             // console.log(this.USDTPrie[i].amount);
+            //
             this.btcPrice = this.btcMang * this.USDTPrie[i].amount;
             // console.log('btc'+this.btcPrice);
           }
diff --git a/src/components/common/header.vue b/src/components/common/header.vue
index 2c15e36..92c4da2 100644
--- a/src/components/common/header.vue
+++ b/src/components/common/header.vue
@@ -515,7 +515,7 @@ export default {
           // 保存邀请码信息
           localStorage.setItem('invitationCode', res.data.data.invitationCode);
           this.isSubmit = false;
-          //location.href = '/entry';
+          location.href = '/entry';
         } else {
           this.$message.warning(res.data.msg);
           this.isSubmit = false;
diff --git a/src/locales/lang/balances.zh-CN.js b/src/locales/lang/balances.zh-CN.js
index fa3343e..6f593b2 100644
--- a/src/locales/lang/balances.zh-CN.js
+++ b/src/locales/lang/balances.zh-CN.js
@@ -6,7 +6,7 @@ export default {
       header_last_yes: '可用',
       header_last_no: '冻结',
       header_last_ok: '操作',
-      header_last_recharge: '充值',
+      header_last_recharge: '充币',
       header_last_mention: '提币',
       header_last_deal: '交易',
       header_last_financial: '财务记录',
diff --git a/src/locales/lang/balances.zh-HK.js b/src/locales/lang/balances.zh-HK.js
index 9181765..b636201 100644
--- a/src/locales/lang/balances.zh-HK.js
+++ b/src/locales/lang/balances.zh-HK.js
@@ -6,7 +6,7 @@ export default {
       header_last_yes: '可用',
       header_last_no: '凍結',
       header_last_ok: '操作',
-      header_last_recharge: '充值',
+      header_last_recharge: '充币',
       header_last_mention: '提幣',
       header_last_deal: '交易',
       header_last_financial: '財務記錄',
diff --git a/src/pages/entry.vue b/src/pages/entry.vue
index 5f47a04..40aae71 100644
--- a/src/pages/entry.vue
+++ b/src/pages/entry.vue
@@ -6,24 +6,24 @@
         <!-- 跳转到交易中心,携带交易对 -->
         <a href="javascript:;">
           <p>微信 <i class="el-icon-star-off"></i></p>
-          <p>初始资金：{{ userTimeMoneyDto.wxPayInit }}</p>
-          <p>余额：{{ userTimeMoneyDto.wxPay }}CNY</p>
+          <p>初始资金：{{ userTimeMoneyDto.wxPayInit}} CNY</p>
+          <p>余额：{{ userTimeMoneyDto.wxPay }} CNY</p>
         </a>
       </div>
       <div class="usdItem" element-loading-background="rgba(0, 0, 0, 0.2)">
         <!-- 跳转到交易中心,携带交易对 -->
         <a href="javascript:;">
           <p>支付宝 <i class="el-icon-star-off"></i></p>
-          <p>初始资金：{{ userTimeMoneyDto.aliPayInit }}</p>
-          <p>余额：{{ userTimeMoneyDto.aliPay }}CNY</p>
+          <p>初始资金：{{ userTimeMoneyDto.aliPayInit}} CNY</p>
+          <p>余额：{{ userTimeMoneyDto.aliPay }} CNY</p>
         </a>
       </div>
       <div class="usdItem" element-loading-background="rgba(0, 0, 0, 0.2)">
         <!-- 跳转到交易中心,携带交易对 -->
         <a href="javascript:;">
           <p>银行卡 <i class="el-icon-star-off"></i></p>
-          <p>初始资金：{{ userTimeMoneyDto.bankCardInit }}</p>
-          <p>余额：{{ userTimeMoneyDto.bankCard }}CNY</p>
+          <p>初始资金：{{ userTimeMoneyDto.bankCardInit}} CNY</p>
+          <p>余额：{{ userTimeMoneyDto.bankCard }} CNY</p>
         </a>
       </div>
     </div>
@@ -31,16 +31,16 @@
     <div class="usdList tabs">
       <el-tabs v-model="activeName">
         <el-tab-pane label="BTC" name="BTC"
-          >余额：{{ userTimeMoneyDto.btc }}</el-tab-pane
+          >余额：{{ userTimeMoneyDto.btc }} <br/><br/> 总额≈：{{tatolPrice}} CNY <br/><br/> 地址：{{userTimeMoneyDto.assessUserId}}</el-tab-pane
         >
         <el-tab-pane label="USDT" name="USDT"
-          >余额：{{ userTimeMoneyDto.usdt }}</el-tab-pane
+          >余额：{{ userTimeMoneyDto.usdt }} <br/><br/> 总额≈：{{tatolPrice}} CNY <br/><br/> 地址：{{userTimeMoneyDto.assessUserId}}</el-tab-pane
         >
         <el-tab-pane label="EOS" name="EOS"
-          >余额：{{ userTimeMoneyDto.eos }}</el-tab-pane
+          >余额：{{ userTimeMoneyDto.eos }} <br/><br/> 总额≈：{{tatolPrice}} CNY <br/><br/> 地址：{{userTimeMoneyDto.assessUserId}}</el-tab-pane
         >
         <el-tab-pane label="ETH" name="ETH"
-          >余额：{{ userTimeMoneyDto.eth }}</el-tab-pane
+          >余额：{{ userTimeMoneyDto.eth }} <br/><br/> 总额≈：{{tatolPrice}} CNY <br/><br/> 地址：{{userTimeMoneyDto.assessUserId}}</el-tab-pane
         >
       </el-tabs>
     </div>
@@ -52,22 +52,81 @@
 import NavHeader from '@/components/common/header';
 import Footer from '@/components/common/footer';
 import {getUserTimeMoneyDto} from '@/api/yyyf';
+import {getLeftPrice} from '@/api/currency.js';
 export default {
   name: 'entry',
   data() {
     return {
       activeName: 'BTC',
       userTimeMoneyDto: {},
+      tatolPrice:0
     };
   },
   components: {
     NavHeader,
     Footer,
   },
+  methods:{
+    getUSDTPrie() {
+      getLeftPrice().then(res => {
+        this.USDTPrie = res.data.data;
+        // console.log(this.USDTPrie);
+
+        // 获取币种汇率
+        let cnyAmount = this.USDTPrie[0].cnyAmount;
+        let btcCount=0;
+        let usdtCount=this.userTimeMoneyDto.usdt;
+        let eosCount=0;
+        let ethCount=0;
+
+        for (let i = 0; i < this.USDTPrie.length; i++) {
+          // 获取btc转usdt资产
+          if (this.USDTPrie[i].currencyPair == 'BTC-USDT') {
+            // console.log(this.USDTPrie[i].amount);
+            //
+            btcCount = this.userTimeMoneyDto.btc * this.USDTPrie[i].amount;
+            // console.log('btc'+this.btcPrice);
+          }
+          // return this.btcPrice;
+        }
+        for (let i = 0; i < this.USDTPrie.length; i++) {
+          // 获取btc转usdt资产
+          if (this.USDTPrie[i].currencyPair == 'EOS-USDT') {
+            // console.log(this.USDTPrie[i].amount);
+            //
+            eosCount = this.userTimeMoneyDto.eos * this.USDTPrie[i].amount;
+            // console.log('btc'+this.btcPrice);
+          }
+          // return this.btcPrice;
+        }
+
+        for (let i = 0; i < this.USDTPrie.length; i++) {
+          // 获取btc转usdt资产
+          if (this.USDTPrie[i].currencyPair == 'ETH-USDT') {
+            // console.log(this.USDTPrie[i].amount);
+            //
+            ethCount = this.userTimeMoneyDto.eth * this.USDTPrie[i].amount;
+            // console.log('btc'+this.btcPrice);
+          }
+          // return this.btcPrice;
+        }
+
+        let digitWallet= (btcCount+usdtCount+eosCount+ethCount)*cnyAmount;
+
+        let total=digitWallet+this.userTimeMoneyDto.aliPay+this.userTimeMoneyDto.wxPay+this.userTimeMoneyDto.bankCard;
+        // 获取总资产
+        this.tatolPrice =Math.floor(total*10) / 10;
+
+        // console.log(this.tatolPrice);
+      });
+    }
+  },
   created() {
     getUserTimeMoneyDto().then(res => {
       if (res.data.code === 200) {
         this.userTimeMoneyDto = res.data.data;
+        this.getUSDTPrie();
+
       } else {
         this.$message.warning({
           message: res.data.msg,