全景页面删除重资产,显示人民币转换以及密码设置去掉验证码

master
huan.xu 4 years ago
parent 4fd6b74d55
commit 908a2f7504
  1. 51
      src/pages/entry.vue
  2. 4
      src/views/personal/profile.vue
  3. 9
      src/views/personal/setPayPassword.vue

@ -14,7 +14,7 @@
<a href="javascript:;"> <a href="javascript:;">
<p>初始资金{{ userTimeMoneyDto.wxPayInit }} CNY</p> <p>初始资金{{ userTimeMoneyDto.wxPayInit }} CNY</p>
<p>可用资金{{ userTimeMoneyDto.wxPay }} CNY</p> <p>可用资金{{ userTimeMoneyDto.wxPay }} CNY</p>
<p>全部资金{{ tatolPrice }} CNY</p> <!--<p>全部资金{{ tatolPrice }} CNY</p>-->
</a> </a>
</div> </div>
<div class="usdItem alipay"> <div class="usdItem alipay">
@ -22,7 +22,7 @@
<a href="javascript:;"> <a href="javascript:;">
<p>初始资金{{ userTimeMoneyDto.aliPayInit }} CNY</p> <p>初始资金{{ userTimeMoneyDto.aliPayInit }} CNY</p>
<p>可用资金{{ userTimeMoneyDto.aliPay }} CNY</p> <p>可用资金{{ userTimeMoneyDto.aliPay }} CNY</p>
<p>全部资金{{ tatolPrice }} CNY</p> <!-- <p>全部资金{{ tatolPrice }} CNY</p>-->
</a> </a>
</div> </div>
<div class="usdItem bank"> <div class="usdItem bank">
@ -30,7 +30,7 @@
<a href="javascript:;"> <a href="javascript:;">
<p>初始资金{{ userTimeMoneyDto.bankCardInit }}CNY</p> <p>初始资金{{ userTimeMoneyDto.bankCardInit }}CNY</p>
<p>可用资金{{ userTimeMoneyDto.bankCard }} CNY</p> <p>可用资金{{ userTimeMoneyDto.bankCard }} CNY</p>
<p>全部资金{{ tatolPrice }} CNY</p> <!--<p>全部资金{{ tatolPrice }} CNY</p>-->
</a> </a>
</div> </div>
</div> </div>
@ -40,7 +40,7 @@
<div class="tabs-flex"> <div class="tabs-flex">
<div class="flex-1"> <div class="flex-1">
<p>总资产: {{ userTimeMoneyDto.btc }}</p> <p>总资产: {{ userTimeMoneyDto.btc }}</p>
<!-- <p>0 CNY</p>--> <p>{{btcRMBCount}} CNY</p>
</div> </div>
<!-- <div class="flex-1"> <!-- <div class="flex-1">
<p>总资产: 0</p> <p>总资产: 0</p>
@ -60,7 +60,7 @@
<div class="tabs-flex"> <div class="tabs-flex">
<div class="flex-1"> <div class="flex-1">
<p>总资产: {{ userTimeMoneyDto.usdt }}</p> <p>总资产: {{ userTimeMoneyDto.usdt }}</p>
<!-- <p>0 CNY</p>--> <p>{{usdtRMBCount}} CNY</p>
</div> </div>
<!-- <div class="flex-1"> <!-- <div class="flex-1">
<p>总资产: 0</p> <p>总资产: 0</p>
@ -80,7 +80,7 @@
<div class="tabs-flex"> <div class="tabs-flex">
<div class="flex-1"> <div class="flex-1">
<p>总资产: {{ userTimeMoneyDto.eos }}</p> <p>总资产: {{ userTimeMoneyDto.eos }}</p>
<!--<p>0 CNY</p>--> <p>{{eosRMBCount}} CNY</p>
</div> </div>
<!-- <div class="flex-1"> <!-- <div class="flex-1">
<p>总资产: 0</p> <p>总资产: 0</p>
@ -100,7 +100,7 @@
<div class="tabs-flex"> <div class="tabs-flex">
<div class="flex-1"> <div class="flex-1">
<p>总资产: {{ userTimeMoneyDto.eth }}</p> <p>总资产: {{ userTimeMoneyDto.eth }}</p>
<!-- <p>0 CNY</p>--> <p>{{ethRMBCount}} CNY</p>
</div> </div>
<!-- <div class="flex-1"> <!-- <div class="flex-1">
<p>总资产: 0</p> <p>总资产: 0</p>
@ -192,6 +192,11 @@ export default {
// //
isSubmit: false, isSubmit: false,
newwin: undefined, newwin: undefined,
btcRMBCount: 0,
usdtRMBCount: 0,
eosRMBCount: 0,
ethRMBCount: 0
}; };
}, },
components: { components: {
@ -393,8 +398,9 @@ export default {
}); });
}, },
getUSDTPrie() { getUSDTPrie() {
let ths = this;
getLeftPrice().then(res => { getLeftPrice().then(res => {
this.USDTPrie = res.data.data; ths.USDTPrie = res.data.data;
// console.log(this.USDTPrie); // console.log(this.USDTPrie);
// //
@ -406,20 +412,20 @@ export default {
for (let i = 0; i < this.USDTPrie.length; i++) { for (let i = 0; i < this.USDTPrie.length; i++) {
// btcusdt // btcusdt
if (this.USDTPrie[i].currencyPair == 'BTC-USDT') { if (ths.USDTPrie[i].currencyPair == 'BTC-USDT') {
// console.log(this.USDTPrie[i].amount); // console.log(this.USDTPrie[i].amount);
// //
btcCount = this.userTimeMoneyDto.btc * this.USDTPrie[i].amount; btcCount = ths.userTimeMoneyDto.btc * ths.USDTPrie[i].amount;
// console.log('btc'+this.btcPrice); // console.log('btc'+this.btcPrice);
} }
// return this.btcPrice; // return this.btcPrice;
} }
for (let i = 0; i < this.USDTPrie.length; i++) { for (let i = 0; i < this.USDTPrie.length; i++) {
// btcusdt // btcusdt
if (this.USDTPrie[i].currencyPair == 'EOS-USDT') { if (ths.USDTPrie[i].currencyPair == 'EOS-USDT') {
// console.log(this.USDTPrie[i].amount); // console.log(this.USDTPrie[i].amount);
// //
eosCount = this.userTimeMoneyDto.eos * this.USDTPrie[i].amount; eosCount = ths.userTimeMoneyDto.eos * ths.USDTPrie[i].amount;
// console.log('btc'+this.btcPrice); // console.log('btc'+this.btcPrice);
} }
// return this.btcPrice; // return this.btcPrice;
@ -427,25 +433,30 @@ export default {
for (let i = 0; i < this.USDTPrie.length; i++) { for (let i = 0; i < this.USDTPrie.length; i++) {
// btcusdt // btcusdt
if (this.USDTPrie[i].currencyPair == 'ETH-USDT') { if (ths.USDTPrie[i].currencyPair == 'ETH-USDT') {
// console.log(this.USDTPrie[i].amount); // console.log(this.USDTPrie[i].amount);
// //
ethCount = this.userTimeMoneyDto.eth * this.USDTPrie[i].amount; ethCount = ths.userTimeMoneyDto.eth * ths.USDTPrie[i].amount;
// console.log('btc'+this.btcPrice); // console.log('btc'+this.btcPrice);
} }
// return this.btcPrice; // return this.btcPrice;
} }
ths.btcRMBCount = btcCount * cnyAmount;
ths.usdtRMBCount = usdtCount * cnyAmount;
ths.eosRMBCount = eosCount * cnyAmount;
ths.ethRMBCount = ethCount * cnyAmount;
let digitWallet = let digitWallet =
(btcCount + usdtCount + eosCount + ethCount) * cnyAmount; ths.btcRMBCount + ths.usdtRMBCount + ths.eosRMBCount + ths.ethRMBCount;
let total = let total =
digitWallet + digitWallet +
this.userTimeMoneyDto.aliPay + ths.userTimeMoneyDto.aliPay +
this.userTimeMoneyDto.wxPay + ths.userTimeMoneyDto.wxPay +
this.userTimeMoneyDto.bankCard; ths.userTimeMoneyDto.bankCard;
// //
this.tatolPrice = Math.floor(total * 10) / 10; ths.tatolPrice = Math.floor(total * 10) / 10;
// console.log(this.tatolPrice); // console.log(this.tatolPrice);
}); });
@ -575,7 +586,7 @@ export default {
margin: 6px 8px; margin: 6px 8px;
&:first-child { &:first-child {
margin-top: 58px; margin-top: 88px;
} }
} }
} }

@ -46,11 +46,11 @@
>{{ $t('personal.profile.basicInfo.loginPasswrod') }}</span >{{ $t('personal.profile.basicInfo.loginPasswrod') }}</span
> >
<span class="secondaryCont">*********</span> <span class="secondaryCont">*********</span>
<router-link to="/profile/change-password"> <!-- <router-link to="/profile/change-password">
<div class="btnRemake"> <div class="btnRemake">
{{ $t('personal.profile.basicInfo.changePasswordBtn') }} {{ $t('personal.profile.basicInfo.changePasswordBtn') }}
</div> </div>
</router-link> </router-link>-->
</div> </div>
</div> </div>
</div> </div>

@ -16,7 +16,7 @@
</div> </div>
</div> </div>
<div class="secondaryBox majorBoxStyle"> <!-- <div class="secondaryBox majorBoxStyle">
<div class="setBox"> <div class="setBox">
<span class="setItem" <span class="setItem"
>{{ $t('personal.security.setMoneyPassword.code') }}</span >{{ $t('personal.security.setMoneyPassword.code') }}</span
@ -32,7 +32,7 @@
{{ $t('personal.security.resend') }}{{ timerNum }}s {{ $t('personal.security.resend') }}{{ timerNum }}s
</p> </p>
</div> </div>
</div> </div>-->
<div class="secondaryBox majorBoxStyle majorBoxStyleBc"> <div class="secondaryBox majorBoxStyle majorBoxStyleBc">
<div class="setBox"> <div class="setBox">
@ -100,9 +100,10 @@ export default {
}, },
methods: { methods: {
submit() { submit() {
if (this.code === '') { /* if (this.code === '') {
this.$message.warning(this.$t('personal.security.code_p')); this.$message.warning(this.$t('personal.security.code_p'));
} else if (this.moneyPassword === '') { } else */
if (this.moneyPassword === '') {
this.$message.warning( this.$message.warning(
this.$t('personal.security.setMoneyPassword.fund_p') this.$t('personal.security.setMoneyPassword.fund_p')
); );

Loading…
Cancel
Save