From 30f27dc831d6a498cdd27b212702bfcc660750d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?user--=E5=8D=B7=E6=AF=9B?= <3121969318@qq.com>
Date: Tue, 23 May 2023 17:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=09=E6=B7=BB=E5=8A=A0=E4=B8=8E=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E2=80=94=E2=80=94=E5=BC=B9=E7=AA=97=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/merchant/list/index.vue | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

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 @@
     <el-form-item label="登陆密码" :label-width="formLabelWidth" prop="mer_password">
       <el-input v-model="form.mer_password" autocomplete="off" placeholder="请输入登陆密码" :disabled="!add"></el-input>
     </el-form-item>
+    <div class="dis">
+    <el-form-item label="已支付的保证金" :label-width="formLabelWidth" class="mer_phone">
+      <el-input v-model="form.paid_margin" style="width:200px"  autocomplete="off" placeholder="请输入已支付的保证金"></el-input>
+    </el-form-item>
+    <el-form-item label="自动扣除保证金比例" :label-width="formLabelWidth" prop="commission_rate">
+      <el-input v-model="form.auto_margin_rate" style="width:200px"  autocomplete="off" ></el-input>
+    </el-form-item>
+   </div>
     <el-form-item label="商户姓名" :label-width="formLabelWidth" prop="real_name">
       <el-input v-model="form.real_name" autocomplete="off" placeholder="请输入商户姓名"></el-input>
     </el-form-item>
@@ -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 {
 <style scoped lang="scss">
 /deep/.el-dialog{
   margin-top: 0 !important;
-  width: 820px;
+  width: 840px;
 }
 .mer_phone{
   width: 400px;