diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue index 39f7913..721862b 100644 --- a/src/views/merchant/application/index.vue +++ b/src/views/merchant/application/index.vue @@ -13,7 +13,7 @@ - + diff --git a/src/views/merchant/list/handle/merDetails.vue b/src/views/merchant/list/handle/merDetails.vue index c55c1c3..b79c973 100644 --- a/src/views/merchant/list/handle/merDetails.vue +++ b/src/views/merchant/list/handle/merDetails.vue @@ -172,6 +172,9 @@ export default { initData(){ this.merData = { is_trader:0, + is_margin:0, + is_service:0, + is_goods:0, financial_bank:{ name:'', bank:'', diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue index 1a1ea08..db93dcf 100644 --- a/src/views/merchant/list/handle/merEditForm.vue +++ b/src/views/merchant/list/handle/merEditForm.vue @@ -240,16 +240,17 @@ - + + - + 元, - + 额度 - + + - + 元, - + 额度 - {{merData.is_margin == 1?merData.ot_margin-merData.margin>0 ? '待缴' : '已缴':'无' }} + {{merData.is_margin != 0?merData.ot_margin-merData.margin>0 ? '待缴' : '已缴':'无' }} - {{merData.is_service == 1?merData.ot_service_cost-merData.service_cost>0 ? '待缴' : '已缴':'无'}} + {{merData.is_service != 0?merData.ot_service_cost-merData.service_cost>0 ? '待缴' : '已缴':'无'}} - {{merData.is_goods == 1?merData.ot_goods_cost-merData.goods_cost>0 ? '待缴' : '已缴':'无'}} + {{merData.is_goods != 0?merData.ot_goods_cost-merData.goods_cost>0 ? '待缴' : '已缴':'无'}} - {{merData.is_margin == 1?(merData.ot_margin<+merData.margin)?merData.margin:(merData.ot_margin-merData.margin):'0'}} + {{merData.is_margin != 0?(merData.ot_margin<+merData.margin)?merData.margin:(merData.ot_margin-merData.margin):'0'}} - {{merData.is_service == 1?(merData.ot_service_cost<+merData.service_cost)?merData.service_cost:(merData.ot_service_cost-merData.service_cost):'0'}} + {{merData.is_service != 0?(merData.ot_service_cost<+merData.service_cost)?merData.service_cost:(merData.ot_service_cost-merData.service_cost):'0'}} - {{merData.is_goods == 1?(merData.ot_goods_cost<+merData.goods_cost)?merData.goods_cost:(merData.ot_goods_cost-merData.goods_cost):'0'}} + {{merData.is_goods != 0?(merData.ot_goods_cost<+merData.goods_cost)?merData.goods_cost:(merData.ot_goods_cost-merData.goods_cost):'0'}} @@ -449,22 +451,22 @@ - + - + diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue index 072c6a4..a7561a1 100644 --- a/src/views/merchant/list/handle/merInfo.vue +++ b/src/views/merchant/list/handle/merInfo.vue @@ -175,9 +175,9 @@ 费用余额:保证金:{{merData.margin== 0 ? '无' : merData.margin}},技术服务费:{{merData.service_cost == 0 ? '无' : merData.service_cost}},上架费:{{merData.goods_cost == 0 ? '无' : merData.goods_cost}}
- 支付状态:保证金:{{merData.is_margin == 1?merData.ot_margin-merData.margin>0 ? '待缴' : '已缴':'无' }}, - 技术服务费:{{merData.is_service == 1?merData.ot_service_cost-merData.service_cost>0 ? '待缴' : '已缴':'无'}}, - 上架费:{{merData.is_goods == 1?merData.ot_goods_cost-merData.goods_cost>0 ? '待缴' : '已缴':'无'}} + 支付状态:保证金:{{ marginNumber }}, + 技术服务费:{{ serviceNumber }}, + 上架费:{{ goodsNumber }}
@@ -385,7 +385,16 @@ export default { computed: { companyImage(){ return this.merData.ext?.company_image - } + }, + marginNumber(){ + return this.merData.is_margin == 0?'无':this.merData.ot_margin-this.merData.margin>0 ? '待缴' : '已缴' + }, + serviceNumber(){ + return this.merData.is_service == 0?'无':this.merData.ot_service_cost-this.merData.service_cost>0 ? '待缴' : '已缴' + }, + goodsNumber(){ + return this.merData.is_goods == 0?'无':this.merData.ot_goods_cost-this.merData.goods_cost>0 ? '待缴' : '已缴' + }, }, methods: { lookImg(item) { diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue index 2117511..a18cbf4 100644 --- a/src/views/merchant/list/index.vue +++ b/src/views/merchant/list/index.vue @@ -324,7 +324,7 @@ export default { merchantLoginApi(id) .then(res => { Cookies.set("merchantToken", res.data.token); - window.open(SettingMer.httpUrl + res.data.url); + window.open(`${location.origin}${res.data.url}`); }) .catch(res => { this.$message.error(res.message); diff --git a/src/views/setting/devise/list.vue b/src/views/setting/devise/list.vue index 1127e82..d66d3e7 100644 --- a/src/views/setting/devise/list.vue +++ b/src/views/setting/devise/list.vue @@ -143,7 +143,7 @@ export default { imgUrl:'', tabPosition: "left", modal: false, - BaseURL: SettingMer.httpUrl || 'http://localhost:8080', + BaseURL: `${location.origin}` || 'http://localhost:8080', cardShow: 0, loadingExist: false, isDiy: 1,