diff --git a/src/api/coin.js b/src/api/coin.js
index 856071e..7e5e23c 100644
--- a/src/api/coin.js
+++ b/src/api/coin.js
@@ -68,3 +68,10 @@ export function getCancelApply() {
method: 'post',
});
}
+// 查询用户市商状态
+export function cheackApply() {
+ return request({
+ url: c2cApi + '/marketUser/getStatusByUserId',
+ method: 'get',
+ });
+}
diff --git a/src/locales/lang/exchange.en.js b/src/locales/lang/exchange.en.js
index cd5fde3..4473ccb 100644
--- a/src/locales/lang/exchange.en.js
+++ b/src/locales/lang/exchange.en.js
@@ -148,6 +148,9 @@ export default {
success: 'Cancellation Successful',
deled: 'Cancelled',
yue: 'Insufficient wallet balance',
+ market: 'The merchant has been certified.',
+ marketcancel: 'Merchant cancellation.',
+ bemarket: 'Business application successful!',
},
},
};
diff --git a/src/locales/lang/exchange.zh-CN.js b/src/locales/lang/exchange.zh-CN.js
index eb24bc3..194af7b 100644
--- a/src/locales/lang/exchange.zh-CN.js
+++ b/src/locales/lang/exchange.zh-CN.js
@@ -139,6 +139,9 @@ export default {
success: '取消成功',
deled: '已取消',
yue: '钱包余额不足',
+ market: '商家已认证',
+ marketcancel: '商家取消中',
+ bemarket: '申请商家成功!',
},
},
};
diff --git a/src/locales/lang/exchange.zh-HK.js b/src/locales/lang/exchange.zh-HK.js
index c3ea0fa..62f5eec 100644
--- a/src/locales/lang/exchange.zh-HK.js
+++ b/src/locales/lang/exchange.zh-HK.js
@@ -139,6 +139,9 @@ export default {
success: '取消成功',
deled: '已取消',
yue: '錢包余額不足',
+ market: '商家已認證',
+ marketcancel: '商家取消中',
+ bemarket: '申請商家成功!',
},
},
};
diff --git a/src/pages/exchange.vue b/src/pages/exchange.vue
index 3205e46..b9e8824 100644
--- a/src/pages/exchange.vue
+++ b/src/pages/exchange.vue
@@ -25,8 +25,19 @@
- {{
- $t('exchangeotc.merchant.name')
+
+ {{
+ $t('exchangeotc.merchant.market')
+ }}
+ {{ $t('exchangeotc.merchant.name') }}
+
+ {{
+ $t('exchangeotc.merchant.marketcancel')
}}
@@ -39,7 +50,6 @@
-
@@ -49,7 +59,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';
+import {getMarketApplyl, cheackApply} from '@/api/coin';
export default {
name: 'exchange',
components: {
@@ -64,8 +74,12 @@ export default {
hackResetBuy: true,
showCommentInput: true, //购买
ifCommentInput: false, //出售
+ applyStatus: '',
};
},
+ created() {
+ this.getcheckApply(); //查询用户市商状态
+ },
methods: {
// 点击切换table栏
hangdelClickShow() {
@@ -91,7 +105,21 @@ export default {
this.checked = false;
getMarketApplyl().then(res => {
if (res.data.code === 200) {
- this.$message.success(res.data.msg);
+ // 申請商家成功!
+ this.$message.success(this.$t('exchangeotc.merchant.bemarket'));
+ setInterval(() => {
+ location.reload(); //成功刷新页面
+ }, 1000);
+ } else {
+ this.$message.error(res.data.msg);
+ }
+ });
+ },
+ // 查询用户市商状态
+ getcheckApply() {
+ cheackApply().then(res => {
+ if (res.data.code === 200) {
+ this.applyStatus = res.data.data;
} else {
this.$message.error(res.data.msg);
}
@@ -157,6 +185,7 @@ export default {
position: relative;
top: -55px;
left: -38px;
+ color: #e8494a;
.apply {
color: #fff;
display: inline-block;
diff --git a/src/pages/index.vue b/src/pages/index.vue
index db0ac61..ebe41e0 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -458,17 +458,17 @@ export default {
if (res.data.code === 200) {
this.rangLoading = false;
// 需求,定死最后一行跌涨幅(永远在最后一行)
- var rightPbj = {
- currencyPair: 'HFH-USDT',
- amount: '0.15',
- highest: '0.15',
- lowest: '0.15',
- total: '0',
- percent: '0',
- };
+ // var rightPbj = {
+ // currencyPair: 'HFH-USDT',
+ // amount: '0.15',
+ // highest: '0.15',
+ // lowest: '0.15',
+ // total: '0',
+ // percent: '0',
+ // };
this.rangeList = res.data.data;
- this.rangeList.push(rightPbj);
+ // this.rangeList.push(rightPbj);
// console.log(this.rangeList);
}
});
diff --git a/src/views/personal/profile.vue b/src/views/personal/profile.vue
index 5d87c94..4f65aea 100644
--- a/src/views/personal/profile.vue
+++ b/src/views/personal/profile.vue
@@ -4,7 +4,11 @@
{{ $t('personal.profile.basicInfo.title') }}
-
+
{{ $t('exchangeotc.merchant.data_del') }}
@@ -104,7 +108,7 @@