From 2da3d2ea13a94a356e4a7ca6ced1de5d78fd8321 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 17 Apr 2024 11:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E8=B6=85=E5=B8=82?=
 =?UTF-8?q?=20-=20=E7=A7=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/admin/business/index.vue | 8 ++++----
 pages/user/index.vue           | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue
index 851ced4..a7fbb44 100644
--- a/pages/admin/business/index.vue
+++ b/pages/admin/business/index.vue
@@ -73,14 +73,14 @@ export default {
           icon: 'iconfont icon-kefujilu'
         });
       }
-      if(this.service.is_verify && [0,3].includes(Number(merchantInfo.merchant_type))){
+      if(this.service.is_verify && [0,3,4].includes(Number(merchantInfo.merchant_type))){
         list.push({
           title: '订单核销',
           url: '/pages/admin/order_cancellation/index?mer_id=' + merId,
           icon: 'iconfont icon-dingdanhexiao'
         });
       }
-      if(this.service.is_verify && [1,3].includes(Number(merchantInfo.merchant_type))){
+      if(this.service.is_verify && [1,3,4].includes(Number(merchantInfo.merchant_type))){
         list.push({
           title: '提货券核销',
           url: '/pages/users/write_off/index',
@@ -92,7 +92,7 @@ export default {
           icon: 'iconfont icon-daihexiao'
         });
       }
-      if(this.service.customer && [0,1,3].includes(Number(merchantInfo.merchant_type))){
+      if(this.service.customer && [0,1,3,4].includes(Number(merchantInfo.merchant_type))){
         list.push({
           title: '订单管理',
           url: '/pages/admin/order/index?mer_id=' + merId,
@@ -144,7 +144,7 @@ export default {
           icon: 'iconfont icon-erweima1'
         });
       }
-      if(this.service.purchase_permission && [1,3].includes(Number(merchantInfo.merchant_type))){
+      if(this.service.purchase_permission && [1,3,4].includes(Number(merchantInfo.merchant_type))){
         list.push({
           title: '进货',
           url: '/pages/supplier/stock/with_goods',
diff --git a/pages/user/index.vue b/pages/user/index.vue
index f394966..ddd18f9 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -293,6 +293,12 @@
                   <view class="tag-list-item">酒道馆管理中心</view>
                 </view>
               </view>
+              <view class="_list-item" v-if="userInfo.supermarketService" @click="toService(4)">
+                <view class="top">超市管理</view>
+                <view class="tag-list">
+                  <view class="tag-list-item">超市管理中心</view>
+                </view>
+              </view>
             </template>
             <template v-if="identityCurrentName == 'wine'">
               <view class="_list-item" v-if="userInfo.smokeMerService" @click="toService(3)">
@@ -544,7 +550,7 @@
 			},
 			toService(is_sys){
         // 判断：如果为0 || 2 清除商户登录状态
-        if(is_sys == 0 || is_sys == 2 || is_sys == 3){
+        if(is_sys == 0 || is_sys == 2 || is_sys == 3 || is_sys == 4){
           // 商户 || 酒道馆 直接进入登录页面
           this.$store.commit("SHOP_LOGIN", {
             'token': null,