From d3d0b4dbb4f1f8c4784c834e0a39feba8aa5afa5 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 10:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pages/tabbar/user/utils/tool.vue |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 9bf9844..c7567f9 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -52,11 +52,6 @@
 						<view>鎴戠殑娲诲姩</view>
 					</view>
 
-					<view class="interact-item" @click="navigateTo('/pages/mine/activity/reportActivity')">
-						<image src="/static/mine/shensu.png" mode=""></image>
-						<view>娲诲姩</view>
-					</view>
-
 					<view class="interact-item" @click="navigateTo('/pages/mine/myCollect/myCollect')">
 						<image src="/static/mine/shensu.png" mode=""></image>
 						<view>鎴戠殑鏀惰棌</view>
@@ -65,6 +60,10 @@
 					<view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/userPermissions/userPermissions')">
 						<image src="/static/mine/shensu.png" mode=""></image>
 						<view>鐢ㄦ埛鏉冮檺</view>
+					</view>
+					<view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/news/news')">
+						<image src="/static/mine/shensu.png" mode=""></image>
+						<view>鏂伴椈</view>
 					</view>
 
 				<!-- 	<view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/customerManager/customerManager')">
@@ -84,10 +83,10 @@
 
 
 
-					<view class="interact-item" @click="navigateTo('/pages/mine/signIn')">
+<!-- 					<view class="interact-item" @click="navigateTo('/pages/mine/signIn')">
 						<image src="/static/mine/sign.png" mode=""></image>
 						<view>姣忔棩绛惧埌</view>
-					</view>
+					</view> -->
 
 					<view class="interact-item" @click="navigateTo('/pages/cart/coupon/couponCenter')">
 						<image src="/static/mine/couponcenter.png" mode=""></image>
@@ -96,10 +95,10 @@
 
 
 
-					<view class="interact-item" @click="navigateTo('/pages/promotion/bargain/log')">
+<!-- 					<view class="interact-item" @click="navigateTo('/pages/promotion/bargain/log')">
 						<image src="/static/mine/kanjia.png" mode=""></image>
 						<view>鐮嶄环璁板綍</view>
-					</view>
+					</view> -->
 
 
 
@@ -127,7 +126,10 @@
 						<image src="/static/mine/setting.png" mode=""></image>
 						<view>鍟嗗搧绠$悊</view>
 					</view>
-					
+					<view class="interact-item" @click="navigateTo('/pages/goods-manager/goodsList/goodsList')">
+						<image src="/static/mine/order.png" mode=""></image>
+						<view>鍟嗘埛璁㈠崟绠$悊</view>
+					</view>
 
 				</view>
 			</div>

--
Gitblit v1.8.0