From 54d46bf0cab4cf31d747e198f1797ea8742e7fe4 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 17 七月 2025 18:37:11 +0800
Subject: [PATCH] Merge branch 'dev' into dev_fix_sub
---
pages/tabbar/user/utils/tool.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 740dad8..705e014 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -51,20 +51,21 @@
<image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑娲诲姩</view>
</view> -->
+<!-- </view>-->
- <view class="interact-item" @click="navigateTo('/pages/mine/activity/applayActivityList')">
+ <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/mine/activity/applayActivityList')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鐢宠娲诲姩</view>
</view>
-<!-- <view class="interact-item" @click="navigateTo('/pages/mine/myCollect/myCollect')">
+ <!-- <view class="interact-item" @click="navigateTo('/pages/mine/myCollect/myCollect')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑鏀惰棌</view>
</view> -->
<view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/userPermissions/userPermissions')">
<image src="/static/mine/shensu.png" mode=""></image>
- <view>鐢ㄦ埛鏉冮檺</view>
+ <view>鏂板搴楀憳</view>
</view>
<view class="interact-item" @click="navigateTo('/pages/news/news')">
<image src="/static/mine/shensu.png" mode=""></image>
@@ -127,11 +128,11 @@
<image src="/static/mine/setting.png" mode=""></image>
<view>璁剧疆</view>
</view>
- <view class="interact-item" @click="navigateTo('/pages/goods-manager/goodsList/goodsList')">
+ <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/goods-manager/goodsList/goodsList')">
<image src="/static/mine/setting.png" mode=""></image>
<view>鍟嗗搧绠＄悊</view>
</view>
- <view class="interact-item" @click="navigateTo('/pages/supplier/suppler-order/suppler-order')">
+ <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/supplier/suppler-order/suppler-order')">
<image src="/static/mine/order.png" mode=""></image>
<view>鍟嗘埛璁㈠崟绠＄悊</view>
</view>
--
Gitblit v1.8.0