From a1c289e7dfc5d9a3b8dc7ca9b05857f276c05f8d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 09 七月 2025 18:03:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/tabbar/user/utils/tool.vue | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 9bf9844..d2e4e9d 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -10,10 +10,10 @@
<view>鍦板潃绠＄悊</view>
</view>
- <view class="interact-item" @click="navigateTo('/pages/mine/myTracks')">
+<!-- <view class="interact-item" @click="navigateTo('/pages/mine/myTracks')">
<image src="/static/mine/logistics.png" mode=""></image>
<view>鎴戠殑瓒宠抗</view>
- </view>
+ </view> -->
<view class="interact-item" @click="navigateTo('/pages/order/evaluate/myEvaluate')">
<image src="/static/mine/feedback.png" mode=""></image>
@@ -25,10 +25,10 @@
</view> -->
- <view class="interact-item" @click="navigateTo('/pages/mine/myCollect')">
+<!-- <view class="interact-item" @click="navigateTo('/pages/mine/myCollect')">
<image src="/static/mine/myfavorite.png" mode=""></image>
<view>鎴戠殑鍏虫敞</view>
- </view>
+ </view> -->
@@ -47,24 +47,23 @@
<view>鎴戠殑鏀惰棌</view>
</view> -->
- <view class="interact-item" @click="navigateTo('/pages/mine/activity/myActivity')">
+<!-- <view class="interact-item" @click="navigateTo('/pages/mine/activity/myActivity')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑娲诲姩</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')">
+<!-- <view class="interact-item" @click="navigateTo('/pages/mine/myCollect/myCollect')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑鏀惰棌</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 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/supplier/suppler-order/suppler-order')">
+ <image src="/static/mine/order.png" mode=""></image>
+ <view>鍟嗘埛璁㈠崟绠＄悊</view>
+ </view>
</view>
</div>
--
Gitblit v1.8.0