diff --git a/src/components/balances/bibi-balances/bibi-balances-table.vue b/src/components/balances/bibi-balances/bibi-balances-table.vue index f386444..4fbd9b1 100644 --- a/src/components/balances/bibi-balances/bibi-balances-table.vue +++ b/src/components/balances/bibi-balances/bibi-balances-table.vue @@ -479,15 +479,12 @@ export default { addEos({ addr: name.addr, tokenId: name.tokenSymbol, - walletType: 'OTC', + walletType: 'C2C', }).then(res => { - console.log(name.tokenSymbol); - console.log(name.addr); - if (res.data.code === 200) { // 充值成功! this.$message.success(this.$t('balances.table.add')); - // location.reload(); //成功刷新页面 + location.reload(); //成功刷新页面 } else { this.$message.error(res.data.msg); } @@ -496,13 +493,11 @@ export default { addBtc({ addr: name.addr, tokenId: name.tokenSymbol, - walletType: 'OTC', + walletType: 'C2C', }).then(res => { - console.log(name.tokenSymbol); - console.log(name.addr); if (res.data.code === 200) { this.$message.success(this.$t('balances.table.add')); - // location.reload(); //成功刷新页面 + location.reload(); //成功刷新页面 } else { this.$message.error(res.data.msg); } @@ -511,13 +506,11 @@ export default { addEth({ addr: name.addr, tokenId: name.tokenSymbol, - walletType: 'OTC', + walletType: 'C2C', }).then(res => { - console.log(name.tokenSymbol); - console.log(name.addr); if (res.data.code === 200) { this.$message.success(this.$t('balances.table.add')); - // location.reload(); //成功刷新页面 + location.reload(); //成功刷新页面 } else { this.$message.error(res.data.msg); } diff --git a/src/pages/exchange.vue b/src/pages/exchange.vue index 3b6c8d8..3205e46 100644 --- a/src/pages/exchange.vue +++ b/src/pages/exchange.vue @@ -6,9 +6,10 @@
- {{$t('exchangeotc.merchant.name')}} + {{ + $t('exchangeotc.merchant.name') + }}
@@ -45,7 +49,7 @@ import NavHeader from '@/components/common/header'; import Footer from '@/components/common/footer'; import ExchangeTableBi from '@/components/exchange/exchange-tabgle-bi'; import ExchangeTableSell from '@/components/exchange/exchange-table-sell'; - +import {getMarketApplyl} from '@/api/coin'; export default { name: 'exchange', components: { @@ -82,6 +86,17 @@ export default { this.showCommentInput = false; this.ifCommentInput = true; }, + // 确认申请为商家 + handleSure() { + this.checked = false; + getMarketApplyl().then(res => { + if (res.data.code === 200) { + this.$message.success(res.data.msg); + } else { + this.$message.error(res.data.msg); + } + }); + }, }, }; @@ -142,14 +157,13 @@ export default { position: relative; top: -55px; left: -38px; - a { + .apply { color: #fff; display: inline-block; padding: 9px 11px; background-color: #e8494a; border-radius: 3px; + cursor: pointer; } } - - diff --git a/src/views/personal/profile.vue b/src/views/personal/profile.vue index 458ac95..5d87c94 100644 --- a/src/views/personal/profile.vue +++ b/src/views/personal/profile.vue @@ -11,33 +11,41 @@
- {{ $t('personal.profile.basicInfo.userName') }}: + {{ $t('personal.profile.basicInfo.userName') }}: {{ userName }} -
{{ $t('personal.profile.basicInfo.changeNameBtn') }}
+
+ {{ $t('personal.profile.basicInfo.changeNameBtn') }} +
- {{ $t('personal.profile.basicInfo.userName') }}: - -
{{ $t('personal.profile.basicInfo.affirm') }}
-
{{ $t('personal.profile.basicInfo.cancel') }}
+ {{ $t('personal.profile.basicInfo.userName') }}: + +
+ {{ $t('personal.profile.basicInfo.affirm') }} +
+
+ {{ $t('personal.profile.basicInfo.cancel') }} +
- {{ $t('personal.profile.basicInfo.loginPasswrod') }}: + {{ $t('personal.profile.basicInfo.loginPasswrod') }}: ********* -
{{ $t('personal.profile.basicInfo.changePasswordBtn') }}
+
+ {{ $t('personal.profile.basicInfo.changePasswordBtn') }} +
@@ -46,7 +54,9 @@
-

{{ $t('personal.profile.loginHistory.title') }}

+

+ {{ $t('personal.profile.loginHistory.title') }} +

@@ -55,23 +65,30 @@ :label="$t('personal.profile.loginHistory.table_header_time')" > - + @@ -127,33 +144,33 @@ export default { methods: { // 取消商家 getMerchant() { - this.$confirm( - this.$t('exchangeotc.merchant.cao'), - this.$t('exchangeotc.merchant.tishi'), - { - confirmButtonText: this.$t('exchangeotc.merchant.sure'), - cancelButtonText: this.$t('exchangeotc.merchant.delete'), - type: 'warning', - } - ) - .then(() => { - getCancelApply().then(res => { - if (res.data.code === 200) { - this.$message({ - type: 'success', - message: this.$t('exchangeotc.merchant.success'), - }); - } else { - this.$message.error(res.data.msg); - } - }); - }) - .catch(() => { + // this.$confirm( + // this.$t('exchangeotc.merchant.cao'), + // this.$t('exchangeotc.merchant.tishi'), + // { + // confirmButtonText: this.$t('exchangeotc.merchant.sure'), + // cancelButtonText: this.$t('exchangeotc.merchant.delete'), + // type: 'warning', + // } + // ) + // .then(() => { + getCancelApply().then(res => { + if (res.data.code === 200) { this.$message({ - type: 'info', - message: this.$t('exchangeotc.merchant.deled'), + type: 'success', + message: this.$t('exchangeotc.merchant.success'), }); - }); + } else { + this.$message.error(res.data.msg); + } + }); + // }) + // .catch(() => { + // this.$message({ + // type: 'info', + // message: this.$t('exchangeotc.merchant.deled'), + // }); + // }); }, remakeName(e) { if (e == 'cancel') {