From 9e0d2563ee3adc08b27f365e315855d776fd08f0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 10:00:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/tabbar/user/utils/tool.vue | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 3086852..b1c458b 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,30 +47,35 @@
<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')">
+ <view class="interact-item" @click="navigateTo('/pages/mine/activity/applayActivityList')">
<image src="/static/mine/shensu.png" mode=""></image>
- <view>娲诲姩</view>
+ <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" @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')">
+ <!-- <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/customerManager/customerManager')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>瀹㈡埛绠＄悊</view>
- </view>
+ </view> -->
<view class="interact-item" @click="navigateTo('/pages/order/complain/complainList')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑鎶曡瘔</view>
@@ -84,10 +89,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 +101,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 +132,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>
@@ -152,7 +160,6 @@
}
},
onReady(){
- console.log(123)
getUserInfo().then(res => {
if(res.data.result){
if(res.data.result.storeId){
--
Gitblit v1.8.0