|
@@ -113,7 +113,8 @@
|
|
|
|
|
|
<div class="block5 flex-row justify-between">
|
|
|
<span class="txt6">{{ $t('merchantManage.accountType') }}
|
|
|
- :{{ adminMchObj.bankAccountType === 1 ? $t('merchantManage.debitCard') : (adminMchObj.bankAccountType === 4
|
|
|
+ :{{ adminMchObj.bankAccountType === 1 ? $t('merchantManage.debitCard') : (adminMchObj.bankAccountType ===
|
|
|
+ 4
|
|
|
? $t('merchantManage.corporateAccount') : "") }}</span>
|
|
|
<!-- <span class="word9"></span> -->
|
|
|
</div>
|
|
@@ -124,7 +125,8 @@
|
|
|
<div v-if="adminType < 2">
|
|
|
<span class="word12">{{ $t('merchantManage.joinpayMch') }}:{{ adminMchObj.signStatus == '签约成功' ?
|
|
|
adminMchObj.signStatus : '未签约' }}</span>
|
|
|
- <span class="word12">{{ $t('merchantManage.huifuMch') }}:{{ huifuMchObj != null && huifuMchObj.status == '2' ? '签约成功' : '未签约' }}</span>
|
|
|
+ <span class="word12">{{ $t('merchantManage.huifuMch') }}:{{ huifuMchObj != null && huifuMchObj.status == '2'
|
|
|
+ ? '签约成功' : '未签约' }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -178,21 +180,27 @@ export default {
|
|
|
adminObj.value.promoCodeOpen = '1';
|
|
|
}
|
|
|
ifForeign.value = data.data.ifForeign;
|
|
|
- }
|
|
|
+ }
|
|
|
// else { showFailToast(data.message); }
|
|
|
// console.log('getAdminFun', data);
|
|
|
};
|
|
|
const getAdminMchFun = async () => {
|
|
|
const { data } = await getAdminMch({ id: merchantId.value });
|
|
|
- if (data.code === "00000") {
|
|
|
- adminMchObj.value = data.data;
|
|
|
+ if (data.code === "00000") {
|
|
|
+ if (data.data != null) {
|
|
|
+ adminMchObj.value = data.data;
|
|
|
+ }
|
|
|
}
|
|
|
// console.log('getAdminMchFun', data);
|
|
|
// console.log('adminMchObj', adminMchObj.value.signStatus);
|
|
|
}
|
|
|
const getHuifuMchFun = async () => {
|
|
|
const { data } = await getHuifuMch({ adminId: merchantId.value });
|
|
|
- if (data.code === "00000") { huifuMchObj.value = data.data; }
|
|
|
+ if (data.code === "00000") {
|
|
|
+ if (data.data != null) {
|
|
|
+ huifuMchObj.value = data.data;
|
|
|
+ }
|
|
|
+ }
|
|
|
// console.log('getHuifuMchFun', data);
|
|
|
}
|
|
|
const onSubmit = async () => {
|