From 2f52354a5b1c58cde84e6b53478f2f796f9a3cdb Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 16 Jan 2024 17:09:53 +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=94=AF=E6=8C=81=E7=8B=AC=E7=AB=8B=E8=AE=BE=E7=BD=AE=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E5=95=86=E5=93=81=E8=B5=A0=E9=80=81=E5=85=91=E6=8D=A2?=
 =?UTF-8?q?=E9=A2=9D=E5=BA=A6=E5=80=8D=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchant/list/handle/merEditForm.vue      | 19 ++++++++++++++++---
 src/views/merchant/list/handle/merInfo.vue    | 13 +++++++++----
 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 d192d2a..56c4402 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -310,10 +310,18 @@
            </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>
           <el-row :gutter="24" class="mt20">
+            <el-col :span="24">
+              <el-form-item label="购买商品消费赠送兑换额度倍率：" prop="mer_exchange_quota_multiple" label-width="200">
+                <el-input-number v-model="merData.mer_exchange_quota_multiple" controls-position="right" placeholder="请输入倍率" />
+                <div class="input-tips">为空或者0时，使用总平台统一设置的倍率</div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <!--<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="请输入比例" />
@@ -326,9 +334,14 @@
                 <div class="input-tips">例：设置为0.8，则1个平台积分=0.8个本商户积分</div>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row>-->
+
+
+
+
+
         </div>
-      </el-tab-pane>-->
+      </el-tab-pane>
   </el-tabs>
 </el-form>
 
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index 009067b..7340c23 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -178,11 +178,16 @@
           </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>
+              <div class="value" v-if="merData.mer_exchange_quota_multiple > 0">{{merData.mer_exchange_quota_multiple}}倍</div>
+              <div class="value" v-else>未设置</div>
+            </li>
+            <!--<li class="item">
               <div>商户积分兑换平台积分比例：</div>
               <div class="value">
                 1 : {{merData.mer_integral_platform_rate}}
@@ -191,10 +196,10 @@
             <li class="item">
               <div>平台积分转换商户积分比例：</div>
               <div class="value">{{merData.mer_integral_merchant_rate}} : 1</div>
-            </li>
+            </li>-->
           </ul>
         </div>
-      </el-tab-pane>-->
+      </el-tab-pane>
     </el-tabs>
      <div class="images" v-show="false" v-viewer="{ movable: false }">
       <img v-for="(src,index) in merData.mer_certificate" :src="src" :key="index" />