From 4e92994cfe50acd50f152f87a17d49259c1433e5 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Thu, 9 May 2024 14:54:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E7=BC=96=E8=BE=91=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=89=A3=E9=99=A4=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E9=87=91=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/merchant/list/handle/merEditForm.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 04119a9..37662df 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="merDataField" size="small" :rules="ruleValidate" :model="merData" label-width="120px"
+  <el-form ref="merDataField" size="small" :rules="ruleValidate" :model="merData" label-width="150px"
            @submit.native.prevent>
     <el-tabs v-loading="loading" type="border-card" v-model="activeName">
       <el-tab-pane label="基本信息" name="detail">
@@ -141,6 +141,12 @@
                 <span>{{ merData.margin }}</span>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="自动扣除保证金比例：" prop="auto_margin_rate">
+                <el-input-number :min="0" v-model="merData.auto_margin_rate" size="small" controls-position="right"
+                                 placeholder="请输入自动扣除保证金比例"/>%
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="手续费设置：" prop="commission_rate">
                 <el-switch v-model="merData.commission_switch" :active-value="1" :inactive-value="0" :width="55"