Merge remote-tracking branch 'origin/dev' into dev

zxl

2025-07-11 9e0d2563ee3adc08b27f365e315855d776fd08f0

 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,21 +47,27 @@
                  <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/myCollect/myCollect')">
               <view class="interact-item" @click="navigateTo('/pages/mine/activity/applayActivityList')">
                  <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> -->

               <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')">
               <view class="interact-item"  @click="navigateTo('/pages/news/news')">
                  <image src="/static/mine/shensu.png" mode=""></image>
                  <view>新闻</view>
               </view>
@@ -126,7 +132,7 @@
                  <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" @click="navigateTo('/pages/supplier/suppler-order/suppler-order')">
                  <image src="/static/mine/order.png" mode=""></image>
                  <view>商户订单管理</view>
               </view>