zhixinlian
/
fontend-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
huan.xu 4 years ago
parent 4fd6b74d55
commit 908a2f7504
3 changed files with 451 additions and 439 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 105
      src/pages/entry.vue
  2. 4
      src/views/personal/profile.vue
  3. 9
      src/views/personal/setPayPassword.vue

105
src/pages/entry.vue
Unescape View File

@ -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>
@ -119,7 +119,7 @@
</el-tabs> </el-tabs>
</div> </div>
<a href="javascript:;" class="entry-btn" @click="goIndex"> <a href="javascript:;" class="entry-btn" @click="goIndex">
<img src="../images/entry/btn.png" /> <img src="../images/entry/btn.png"/>
</a> </a>
<!-- <div class="usdList"> <!-- <div class="usdList">
<div class="usdItem" element-loading-background="rgba(0, 0, 0, 0.2)"> <div class="usdItem" element-loading-background="rgba(0, 0, 0, 0.2)">
@ -169,16 +169,16 @@
</template> </template>
<script> <script>
import NavHeader from '@/components/common/header'; import NavHeader from '@/components/common/header';
import Footer from '@/components/common/footer'; import Footer from '@/components/common/footer';
import {getUserTimeMoneyDto} from '@/api/yyyf'; import {getUserTimeMoneyDto} from '@/api/yyyf';
import {getLeftPrice} from '@/api/currency.js'; import {getLeftPrice} from '@/api/currency.js';
import {submit, reStart} from '@/api/yyyf'; import {submit, reStart} from '@/api/yyyf';
import {logOut} from '@/api/user'; import {logOut} from '@/api/user';
import {signUp, signIn} from '@/api/user'; import {signUp, signIn} from '@/api/user';
import {yyyfUrl} from '@/api/app.js'; import {yyyfUrl} from '@/api/app.js';
export default { export default {
name: 'entry', name: 'entry',
data() { data() {
return { return {
@ -192,6 +192,11 @@ export default {
//防止重复提交 //防止重复提交
isSubmit: false, isSubmit: false,
newwin: undefined, newwin: undefined,
btcRMBCount: 0,
usdtRMBCount: 0,
eosRMBCount: 0,
ethRMBCount: 0
}; };
}, },
components: { components: {
@ -208,7 +213,7 @@ export default {
} else { } else {
ths.$message.warning({ ths.$message.warning({
message: res.data.msg, message: res.data.msg,
onClose: function() { onClose: function () {
ths.closeWindow(); ths.closeWindow();
}, },
}); });
@ -248,7 +253,7 @@ export default {
} }
}); });
}, },
winOpen: function() { winOpen: function () {
if (this.newwin != undefined) { if (this.newwin != undefined) {
if ( if (
navigator.userAgent.indexOf('Firefox') != -1 || navigator.userAgent.indexOf('Firefox') != -1 ||
@ -268,7 +273,7 @@ export default {
'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, copyhistory=yes, height=600,width=1100,left=180,top=100' 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, copyhistory=yes, height=600,width=1100,left=180,top=100'
); );
}, },
closeWindow: function() { closeWindow: function () {
if ( if (
navigator.userAgent.indexOf('Firefox') != -1 || navigator.userAgent.indexOf('Firefox') != -1 ||
navigator.userAgent.indexOf('Chrome') != -1 navigator.userAgent.indexOf('Chrome') != -1
@ -323,7 +328,7 @@ export default {
goIndex() { goIndex() {
this.winOpen(); this.winOpen();
}, },
submitExam: function() { submitExam: function () {
let self = this; let self = this;
//防止重复提交 //防止重复提交
if (!self.isSubmit) { if (!self.isSubmit) {
@ -336,7 +341,7 @@ export default {
if (res.data.code === 200) { if (res.data.code === 200) {
this.$message.success({ this.$message.success({
message: '提交成功', message: '提交成功',
onClose: function() { onClose: function () {
if (self.reqType == 0) { if (self.reqType == 0) {
self.closeWindow(); self.closeWindow();
} else { } else {
@ -349,14 +354,14 @@ export default {
} else { } else {
this.$message.warning({ this.$message.warning({
message: res.data.msg, message: res.data.msg,
onClose: function() { onClose: function () {
self.closeWindow(); self.closeWindow();
}, },
}); });
} }
}); });
}, },
reStartTest: function() { reStartTest: function () {
let self = this; let self = this;
//防止重复提交 //防止重复提交
if (!self.isSubmit) { if (!self.isSubmit) {
@ -370,7 +375,7 @@ export default {
if (res.data.code === 200) { if (res.data.code === 200) {
this.$message.success({ this.$message.success({
message: '重新开始成功', message: '重新开始成功',
onClose: function() { onClose: function () {
let signParams = { let signParams = {
tel: res.data.data.tel, tel: res.data.data.tel,
nickName: res.data.data.nickName, nickName: res.data.data.nickName,
@ -385,7 +390,7 @@ export default {
} else { } else {
this.$message.warning({ this.$message.warning({
message: res.data.msg, message: res.data.msg,
onClose: function() { onClose: function () {
self.closeWindow(); self.closeWindow();
}, },
}); });
@ -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++) {
// 获取btc转usdt资产 // 获取btc转usdt资产
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++) {
// 获取btc转usdt资产 // 获取btc转usdt资产
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++) {
// 获取btc转usdt资产 // 获取btc转usdt资产
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);
}); });
@ -470,11 +481,11 @@ export default {
ths.reqType = localStorage.getItem('reqType'); ths.reqType = localStorage.getItem('reqType');
} }
}, },
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.entry-wrapper { .entry-wrapper {
.entry-content { .entry-content {
background: url(../images/entry/bg.jpg); background: url(../images/entry/bg.jpg);
background-size: cover; background-size: cover;
@ -517,9 +528,9 @@ export default {
padding: 24px; padding: 24px;
margin: 0; margin: 0;
} }
} }
.paylist { .paylist {
position: relative; position: relative;
&::before { &::before {
@ -533,9 +544,9 @@ export default {
left: 40px; left: 40px;
background-size: cover; background-size: cover;
} }
} }
.usdList { .usdList {
margin: 0 auto; margin: 0 auto;
width: 815px; width: 815px;
margin-top: 110px; margin-top: 110px;
@ -575,7 +586,7 @@ export default {
margin: 6px 8px; margin: 6px 8px;
&:first-child { &:first-child {
margin-top: 58px; margin-top: 88px;
} }
} }
} }
@ -653,5 +664,5 @@ export default {
} }
} }
} }
} }
</style> </style>

4
src/views/personal/profile.vue
Unescape View File

@ -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>

9
src/views/personal/setPayPassword.vue
Unescape View File

@ -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')
); );

Write Preview
Loading…
Cancel
Save