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

申请取消商家按钮修改

Browse Source
master
钟海欣 5 years ago
parent b0b62021c1
commit 702dce68f0
3 changed files with 98 additions and 74 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. 19
      src/components/balances/bibi-balances/bibi-balances-table.vue
  2. 32
      src/pages/exchange.vue
  3. 121
      src/views/personal/profile.vue

19
src/components/balances/bibi-balances/bibi-balances-table.vue
Unescape View File

@ -479,15 +479,12 @@ export default {
addEos({ addEos({
addr: name.addr, addr: name.addr,
tokenId: name.tokenSymbol, tokenId: name.tokenSymbol,
walletType: 'OTC', walletType: 'C2C',
}).then(res => { }).then(res => {
console.log(name.tokenSymbol);
console.log(name.addr);
if (res.data.code === 200) { if (res.data.code === 200) {
// 充值成功！ // 充值成功！
this.$message.success(this.$t('balances.table.add')); this.$message.success(this.$t('balances.table.add'));
// location.reload(); //成功刷新页面 location.reload(); //成功刷新页面
} else { } else {
this.$message.error(res.data.msg); this.$message.error(res.data.msg);
} }
@ -496,13 +493,11 @@ export default {
addBtc({ addBtc({
addr: name.addr, addr: name.addr,
tokenId: name.tokenSymbol, tokenId: name.tokenSymbol,
walletType: 'OTC', walletType: 'C2C',
}).then(res => { }).then(res => {
console.log(name.tokenSymbol);
console.log(name.addr);
if (res.data.code === 200) { if (res.data.code === 200) {
this.$message.success(this.$t('balances.table.add')); this.$message.success(this.$t('balances.table.add'));
// location.reload(); //成功刷新页面 location.reload(); //成功刷新页面
} else { } else {
this.$message.error(res.data.msg); this.$message.error(res.data.msg);
} }
@ -511,13 +506,11 @@ export default {
addEth({ addEth({
addr: name.addr, addr: name.addr,
tokenId: name.tokenSymbol, tokenId: name.tokenSymbol,
walletType: 'OTC', walletType: 'C2C',
}).then(res => { }).then(res => {
console.log(name.tokenSymbol);
console.log(name.addr);
if (res.data.code === 200) { if (res.data.code === 200) {
this.$message.success(this.$t('balances.table.add')); this.$message.success(this.$t('balances.table.add'));
// location.reload(); //成功刷新页面 location.reload(); //成功刷新页面
} else { } else {
this.$message.error(res.data.msg); this.$message.error(res.data.msg);
} }

32
src/pages/exchange.vue
Unescape View File

@ -6,9 +6,10 @@
<ul class="exchange-menu"> <ul class="exchange-menu">
<li class="mensu-item"> <li class="mensu-item">
<a <a
:class="showCommentInput === true?'buyTwo':'buy'" :class="showCommentInput === true ? 'buyTwo' : 'buy'"
@click="hangdelClickShow()" @click="hangdelClickShow()"
>{{$t('order.adver.adver_buy')}}</a> >{{ $t('order.adver.adver_buy') }}</a
>
</li> </li>
<li class="mensu-item"> <li class="mensu-item">
<div class="line"></div> <div class="line"></div>
@ -16,14 +17,17 @@
<li class="mensu-item"> <li class="mensu-item">
<a <a
class="sell" class="sell"
:class="ifCommentInput === true?'buyTwo':'buy'" :class="ifCommentInput === true ? 'buyTwo' : 'buy'"
@click="hangdelClick()" @click="hangdelClick()"
>{{$t('order.adver.adver_sell')}}</a> >{{ $t('order.adver.adver_sell') }}</a
>
</li> </li>
</ul> </ul>
<!-- 申请商家 --> <!-- 申请商家 -->
<div class="merchant"> <div class="merchant">
<a href="./echangeGoods/merchant">{{$t('exchangeotc.merchant.name')}}</a> <span class="apply" @click="handleSure()">{{
$t('exchangeotc.merchant.name')
}}</span>
</div> </div>
<!-- 判断点击的时候什么 切换对应的子组件 --> <!-- 判断点击的时候什么 切换对应的子组件 -->
<!-- 购买 --> <!-- 购买 -->
@ -45,7 +49,7 @@ import NavHeader from '@/components/common/header';
import Footer from '@/components/common/footer'; import Footer from '@/components/common/footer';
import ExchangeTableBi from '@/components/exchange/exchange-tabgle-bi'; import ExchangeTableBi from '@/components/exchange/exchange-tabgle-bi';
import ExchangeTableSell from '@/components/exchange/exchange-table-sell'; import ExchangeTableSell from '@/components/exchange/exchange-table-sell';
import {getMarketApplyl} from '@/api/coin';
export default { export default {
name: 'exchange', name: 'exchange',
components: { components: {
@ -82,6 +86,17 @@ export default {
this.showCommentInput = false; this.showCommentInput = false;
this.ifCommentInput = true; 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);
}
});
},
}, },
}; };
</script> </script>
@ -142,14 +157,13 @@ export default {
position: relative; position: relative;
top: -55px; top: -55px;
left: -38px; left: -38px;
a { .apply {
color: #fff; color: #fff;
display: inline-block; display: inline-block;
padding: 9px 11px; padding: 9px 11px;
background-color: #e8494a; background-color: #e8494a;
border-radius: 3px; border-radius: 3px;
cursor: pointer;
} }
} }
</style> </style>

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

@ -11,33 +11,41 @@
<div class="secondaryBox majorBoxStyle majorBoxStyleBc"> <div class="secondaryBox majorBoxStyle majorBoxStyleBc">
<div v-show="isRemake === false" class="profileContent"> <div v-show="isRemake === false" class="profileContent">
<span class="secondaryTitle">{{ $t('personal.profile.basicInfo.userName') }}：</span> <span class="secondaryTitle"
>{{ $t('personal.profile.basicInfo.userName') }}：</span
>
<span class="secondaryCont">{{ userName }}</span> <span class="secondaryCont">{{ userName }}</span>
<div <div class="btnRemake" @click="remakeName">
class="btnRemake" {{ $t('personal.profile.basicInfo.changeNameBtn') }}
@click="remakeName" </div>
>{{ $t('personal.profile.basicInfo.changeNameBtn') }}</div>
</div> </div>
<div v-show="isRemake == true" class="profileContent"> <div v-show="isRemake == true" class="profileContent">
<span class="secondaryTitle">{{ $t('personal.profile.basicInfo.userName') }}：</span> <span class="secondaryTitle"
<el-input v-model="userName" :placeholder="$t('personal.profile.basicInfo.userName_p')"></el-input> >{{ $t('personal.profile.basicInfo.userName') }}：</span
<div >
class="btnHandle" <el-input
@click="renameSuccess" v-model="userName"
>{{ $t('personal.profile.basicInfo.affirm') }}</div> :placeholder="$t('personal.profile.basicInfo.userName_p')"
<div ></el-input>
class="btnHandle" <div class="btnHandle" @click="renameSuccess">
@click="remakeName('cancel')" {{ $t('personal.profile.basicInfo.affirm') }}
>{{ $t('personal.profile.basicInfo.cancel') }}</div> </div>
<div class="btnHandle" @click="remakeName('cancel')">
{{ $t('personal.profile.basicInfo.cancel') }}
</div>
</div> </div>
</div> </div>
<div class="secondaryBox majorBoxStyle"> <div class="secondaryBox majorBoxStyle">
<div class="profileContent"> <div class="profileContent">
<span class="secondaryTitle">{{ $t('personal.profile.basicInfo.loginPasswrod') }}：</span> <span class="secondaryTitle"
>{{ $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">{{ $t('personal.profile.basicInfo.changePasswordBtn') }}</div> <div class="btnRemake">
{{ $t('personal.profile.basicInfo.changePasswordBtn') }}
</div>
</router-link> </router-link>
</div> </div>
</div> </div>
@ -46,7 +54,9 @@
<div class="loginHistory" :style="{height: calac + 'px'}"> <div class="loginHistory" :style="{height: calac + 'px'}">
<div class="majorBox"> <div class="majorBox">
<div class="majorTitleBox majorBoxStyle"> <div class="majorTitleBox majorBoxStyle">
<p class="majorTitle">{{ $t('personal.profile.loginHistory.title') }}</p> <p class="majorTitle">
{{ $t('personal.profile.loginHistory.title') }}
</p>
</div> </div>
</div> </div>
<el-table :data="loginHistory" stripe style="width: 100%"> <el-table :data="loginHistory" stripe style="width: 100%">
@ -55,23 +65,30 @@
:label="$t('personal.profile.loginHistory.table_header_time')" :label="$t('personal.profile.loginHistory.table_header_time')"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span class="timeData">{{ scope.row.createTime.split(' ')[0].replace(/-/g, '/') }}</span> <span class="timeData">{{
<span class="timeData timeDataAfter">{{ scope.row.createTime.split(' ')[1] }}</span> scope.row.createTime.split(' ')[0].replace(/-/g, '/')
}}</span>
<span class="timeData timeDataAfter">{{
scope.row.createTime.split(' ')[1]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="mobilePhone" :label="$t('personal.profile.loginHistory.phone')"></el-table-column> <el-table-column
prop="mobilePhone"
:label="$t('personal.profile.loginHistory.phone')"
></el-table-column>
<el-table-column prop="ipAddress" label="IP"></el-table-column> <el-table-column prop="ipAddress" label="IP"></el-table-column>
<el-table-column <el-table-column
prop="status" prop="status"
:label="$t('personal.profile.loginHistory.table_header_status')" :label="$t('personal.profile.loginHistory.table_header_status')"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span <span v-show="scope.row.status === 'SUCCESS'">{{
v-show="scope.row.status === 'SUCCESS'" $t('personal.profile.loginHistory.success')
>{{ $t('personal.profile.loginHistory.success') }}</span> }}</span>
<span <span v-show="scope.row.status === 'FAIL'">{{
v-show="scope.row.status === 'FAIL'" $t('personal.profile.loginHistory.fail')
>{{ $t('personal.profile.loginHistory.fail') }}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -127,33 +144,33 @@ export default {
methods: { methods: {
// 取消商家 // 取消商家
getMerchant() { getMerchant() {
this.$confirm( // this.$confirm(
this.$t('exchangeotc.merchant.cao'), // this.$t('exchangeotc.merchant.cao'),
this.$t('exchangeotc.merchant.tishi'), // this.$t('exchangeotc.merchant.tishi'),
{ // {
confirmButtonText: this.$t('exchangeotc.merchant.sure'), // confirmButtonText: this.$t('exchangeotc.merchant.sure'),
cancelButtonText: this.$t('exchangeotc.merchant.delete'), // cancelButtonText: this.$t('exchangeotc.merchant.delete'),
type: 'warning', // type: 'warning',
} // }
) // )
.then(() => { // .then(() => {
getCancelApply().then(res => { getCancelApply().then(res => {
if (res.data.code === 200) { if (res.data.code === 200) {
this.$message({
type: 'success',
message: this.$t('exchangeotc.merchant.success'),
});
} else {
this.$message.error(res.data.msg);
}
});
})
.catch(() => {
this.$message({ this.$message({
type: 'info', type: 'success',
message: this.$t('exchangeotc.merchant.deled'), 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) { remakeName(e) {
if (e == 'cancel') { if (e == 'cancel') {

Write Preview
Loading…
Cancel
Save