From d7034b385373b9af40dd372b1e90264d70274f12 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 21 Dec 2023 18:06:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B9=B3=E5=8F=B0=E6=8A=BD=E6=88=90=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchant/list/handle/merEditForm.vue      | 21 ++++++++++++++-----
 src/views/merchant/list/handle/merInfo.vue    | 11 ++++++++--
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index f206832..9686179 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -310,24 +310,35 @@
            </el-row>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="积分设置" name="integral">
+      <el-tab-pane label="其他设置" name="integral">
         <div class="section">
-          <div class="title">基础信息</div>
+          <div class="title">平台&商户积分设置</div>
           <el-row :gutter="24" class="mt20">
             <el-col :span="24">
               <el-form-item label="商户积分兑换平台积分比例：" prop="mer_integral_platform_rate" label-width="200">
-                <el-input-number v-model="merData.mer_integral_platform_rate" controls-position="right" placeholder="请输入比例" />
+                <el-input-number v-model="merData.mer_integral_platform_rate" placeholder="请输入比例" />
                 <div class="input-tips">例：设置为1.5，则1个本商户积分=1.5个平台积分</div>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="平台积分转换商户积分比例：" prop="mer_integral_merchant_rate" label-width="200">
-                <el-input-number v-model="merData.mer_integral_merchant_rate" controls-position="right" placeholder="请输入比例" />
+                <el-input-number v-model="merData.mer_integral_merchant_rate" placeholder="请输入比例" />
                 <div class="input-tips">例：设置为0.8，则1个平台积分=0.8个本商户积分</div>
               </el-form-item>
             </el-col>
           </el-row>
         </div>
+        <div class="section">
+          <div class="title">平台抽成设置</div>
+          <el-row :gutter="24" class="mt20">
+            <el-col :span="24">
+              <el-form-item label="平台抽成比例：" prop="platform_commission" label-width="200">
+                <el-input-number v-model="merData.platform_commission" :step="0.01" :min="0" :max="100" placeholder="请输入比例" /> %
+                <div class="input-tips">例：设置20%；则 商品销售价格 中20%计算入平台抽成</div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
       </el-tab-pane>
   </el-tabs>
 </el-form>
@@ -533,7 +544,7 @@ export default {
 }
 .input-tips{
   font-size: 12px;
-  margin-left: 180px;
+  //margin-left: 180px;
   line-height: 20px;
   color: #9d9d9d;
 }
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index eb89446..4c922c1 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -178,9 +178,9 @@
           </ul>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="积分设置" name="integral">
+      <el-tab-pane label="其他设置" name="integral">
         <div class="section">
-          <div class="title">登录账号</div>
+          <div class="title">平台&商户积分设置</div>
           <ul class="list">
             <li class="item">
               <div>商户积分兑换平台积分比例：</div>
@@ -193,6 +193,13 @@
               <div class="value">{{merData.mer_integral_merchant_rate}} : 1</div>
             </li>
           </ul>
+          <div class="title">平台抽成设置</div>
+          <ul class="list">
+            <li class="item">
+              <div>平台抽成比例：</div>
+              <div class="value">{{merData.platform_commission}}%</div>
+            </li>
+          </ul>
         </div>
       </el-tab-pane>
     </el-tabs>