diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue index e6cb4d9..c86fb31 100644 --- a/src/views/merchant/list/index.vue +++ b/src/views/merchant/list/index.vue @@ -239,6 +239,14 @@ +
+ + + + + + +
@@ -339,6 +347,8 @@ export default { area_id:'',//区code street_id:'',//街道code village_id:'',//村id + paid_margin:'',//已支付的保证金 + auto_margin_rate:'', //自动扣除保证金比例 options:[], options1:[], options2:[], @@ -358,7 +368,7 @@ export default { value4:'关', value5:'关', }, - formLabelWidth: '120px', + formLabelWidth: '130px', //表单验证规则 rules:{ mer_name:[ @@ -531,6 +541,8 @@ export default { console.log('res',res); if(res.status==200){ this.open2(res.message) + //添加弹出层 + this.popFormVisible=false } } catch (error) { this.open4(error.message) @@ -543,7 +555,8 @@ export default { console.log('res',res); if(res.status==200){ this.open2(res.message) - + //编辑弹出层 + this.popFormVisible=false } } catch (error) { this.open4(error.message) @@ -704,7 +717,8 @@ export default { this.form.mer_password = res.mer_password this.form.real_name = res.real_name this.form.mer_phone = res.mer_phone - + this.form.auto_margin_rate=res.auto_margin_rate//扣除 + this.form.paid_margin=res.paid_margin//支付的保证金 this.form.area_id = res.geo_address.area_id this.form.street_id = res.geo_address.street_id this.form.village_id = res.geo_address.village_id @@ -790,7 +804,7 @@ export default {