From efdda7353f4d2c53f57e0f5a700472361667bd85 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 28 Mar 2024 17:46:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E9=85=92=E9=81=93?=
 =?UTF-8?q?=E9=A6=86=E6=98=BE=E7=A4=BA=E5=95=86=E6=88=B7=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/systemForm/setSystem/modifyStoreInfo.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index ff75375..319c613 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -44,14 +44,14 @@
           <span class="basic-label"> 店铺类型：</span>
           {{ merData.merchantType.type_name }}
         </div>
-        <div v-if="config.merchant_type != 2" class="basic-information">
+        <div class="basic-information">
           <div>
             <span class="basic-label">是否开启{{ typeText }}：</span>
             <el-tooltip v-if="merData.is_margin == 1 && merData.mer_state == 0" class="item" effect="dark" content="请先支付店铺保证金！" placement="top-start">
               <el-switch v-model="merData.mer_state" disabled active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" />
             </el-tooltip>
             <el-switch v-else v-model="merData.mer_state" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" />
-            <span class="trip">开启，店铺即可展示在移动端</span>
+            <span class="trip" v-if="config.merchant_type != 2">开启，店铺即可展示在移动端</span>
           </div>
         </div>
         <div class="basic-information">
@@ -573,6 +573,7 @@ export default {
       // 商户类别：0=普通商户，1=酒道馆，2=供应商
       if (type == 1) return '酒道馆'
       else if (type == 2) return '供应商'
+      else if (type == 3) return '烟酒店'
       else '商户'
     }
   },