diff --git a/src/api/coin.js b/src/api/coin.js index 7e5e23c..aeb2370 100644 --- a/src/api/coin.js +++ b/src/api/coin.js @@ -54,7 +54,7 @@ export function getTotal() { } //确认申请商家 -export function getMarketApplyl() { +export function getMarketApply() { return request({ url: marketUrl + '/marketApply', method: 'post', diff --git a/src/pages/echangeGoods/merchant.vue b/src/pages/echangeGoods/merchant.vue index ff5a553..127efc7 100644 --- a/src/pages/echangeGoods/merchant.vue +++ b/src/pages/echangeGoods/merchant.vue @@ -4,16 +4,20 @@
《 - {{$t('exchangeotc.merchant.rule')}} + {{ $t('exchangeotc.merchant.rule') }} 》
- {{$t('exchangeotc.merchant.look')}} + {{ + $t('exchangeotc.merchant.look') + }}
- {{$t('exchangeotc.merchant.promptly')}} + {{ + $t('exchangeotc.merchant.promptly') + }}
@@ -24,18 +28,22 @@ width="536px" >
- {{$t('exchangeotc.merchant.wallet')}} - {{$t('exchangeotc.merchant.fou')}} + {{ $t('exchangeotc.merchant.wallet') }} + {{ $t('exchangeotc.merchant.fou') }} +
+
+ {{ $t('exchangeotc.merchant.deposit') }}:{{ merchantCAmount }} + {{ merchantCion }}
-
{{$t('exchangeotc.merchant.deposit')}}:{{merchantCAmount}} {{merchantCion}}
- {{$t('exchangeotc.merchant.delete')}} + {{ + $t('exchangeotc.merchant.delete') + }} - {{$t('exchangeotc.merchant.sure')}} + {{ + $t('exchangeotc.merchant.sure') + }} @@ -44,8 +52,8 @@
-
{{$t('exchangeotc.merchant.submit')}}
-
{{$t('exchangeotc.merchant.submit_1')}}
+
{{ $t('exchangeotc.merchant.submit') }}
+
{{ $t('exchangeotc.merchant.submit_1') }}
@@ -58,7 +66,7 @@ import NavHeader from '@/components/common/header'; import Footer from '@/components/common/footer'; import {getMerchant} from '@/api/priceSysconf'; -import {getDeposit, getTotal, getMarketApplyl} from '@/api/coin'; +import {getDeposit, getTotal, getMarketApply} from '@/api/coin'; // 获取请求 import {getOTCBtc} from '@/api/btc.js'; @@ -124,10 +132,15 @@ export default { // 确认申请为商家 handleSure() { this.checked = false; - getMarketApplyl().then(res => { + getMarketApply().then(res => { if (res.data.code === 200) { this.dialogVisible = false; - this.dialogSure = true; + // this.dialogSure = true; + // 申請商家成功! + this.$message.success(this.$t('exchangeotc.merchant.bemarket')); + setInterval(() => { + window.location.href = '../exchange'; + }, 1000); } else { this.$message.error(res.data.msg); } @@ -288,4 +301,3 @@ export default { } } - diff --git a/src/pages/exchange.vue b/src/pages/exchange.vue index b9e8824..4a27600 100644 --- a/src/pages/exchange.vue +++ b/src/pages/exchange.vue @@ -29,11 +29,17 @@ {{ $t('exchangeotc.merchant.market') }} - {{ $t('exchangeotc.merchant.name') }} --> + + {{ $t('exchangeotc.merchant.name') }} {{ @@ -59,7 +65,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, cheackApply} from '@/api/coin'; +import {getMarketApply, cheackApply} from '@/api/coin'; export default { name: 'exchange', components: { @@ -101,20 +107,20 @@ export default { this.ifCommentInput = true; }, // 确认申请为商家 - handleSure() { - this.checked = false; - getMarketApplyl().then(res => { - if (res.data.code === 200) { - // 申請商家成功! - this.$message.success(this.$t('exchangeotc.merchant.bemarket')); - setInterval(() => { - location.reload(); //成功刷新页面 - }, 1000); - } else { - this.$message.error(res.data.msg); - } - }); - }, + // handleSure() { + // this.checked = false; + // getMarketApplyl().then(res => { + // if (res.data.code === 200) { + // // 申請商家成功! + // this.$message.success(this.$t('exchangeotc.merchant.bemarket')); + // setInterval(() => { + // location.reload(); //成功刷新页面 + // }, 1000); + // } else { + // this.$message.error(res.data.msg); + // } + // }); + // }, // 查询用户市商状态 getcheckApply() { cheackApply().then(res => { @@ -194,5 +200,13 @@ export default { border-radius: 3px; cursor: pointer; } + a { + color: #fff; + display: inline-block; + padding: 9px 11px; + background-color: #e8494a; + border-radius: 3px; + cursor: pointer; + } }