From 587acb1557cebb464aa0e250ff3dbfc436a860fd Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 06 八月 2025 16:27:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/tabbar/user/utils/tool.vue | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 0896956..009080a 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -3,7 +3,7 @@
<!-- 甯哥敤宸ュ叿 -->
<view class="interact-tools" style="margin-bottom: 15px">
- <div class="paddingBox">
+ <view class="paddingBox">
<view class="interact-container">
<view class="interact-item" @click="navigateTo('/pages/mine/address/addressManage')">
<image src="/static/mine/myaddress.png" mode=""></image>
@@ -51,19 +51,25 @@
<image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑娲诲姩</view>
</view> -->
+<!-- </view>-->
-<!-- <view class="interact-item" @click="navigateTo('/pages/mine/myCollect/myCollect')">
+ <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/mine/activity/applyActivityList')">
+ <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>
</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" v-if="isStoreManger" @click="navigateTo('/pages/news/news')">
+ <view class="interact-item" @click="navigateTo('/pages/news/news')">
<image src="/static/mine/shensu.png" mode=""></image>
- <view>鏂伴椈</view>
+ <view>蹇</view>
</view>
<!-- <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/customerManager/customerManager')">
@@ -114,7 +120,7 @@
<view class="interact-item" @click="navigateTo('/pages/passport/entry/seller/index')">
<image src="/static/mine/feedback.png" mode=""></image>
- <view>搴楅摵鍏ラ┗</view>
+ <view>渚涘簲鍟嗗叆椹�</view>
</view>
@@ -122,17 +128,17 @@
<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/goods-manager/goodsList/goodsList')">
+ <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>
</view>
- </div>
+ </view>
</view>
</view>
</template>
--
Gitblit v1.8.0