From 3e2ef5dd097474b14adc81a003603720e2a4a90d Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 08 八月 2025 09:53:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/tabbar/user/utils/tool.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 8c5452f..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>
@@ -50,10 +50,10 @@
<!-- <view class="interact-item" @click="navigateTo('/pages/mine/activity/myActivity')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑娲诲姩</view>
- </view>
</view> -->
+<!-- </view>-->
- <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/mine/activity/applayActivityList')">
+ <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/mine/activity/applyActivityList')">
<image src="/static/mine/shensu.png" mode=""></image>
<view>鐢宠娲诲姩</view>
</view>
@@ -65,11 +65,11 @@
<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>
- <view>鏂伴椈</view>
+ <view>蹇</view>
</view>
<!-- <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/customerManager/customerManager')">
@@ -120,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>
@@ -138,7 +138,7 @@
</view>
</view>
- </div>
+ </view>
</view>
</view>
</template>
--
Gitblit v1.8.0