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

xiangpei

2025-07-09 a1c289e7dfc5d9a3b8dc7ca9b05857f276c05f8d

 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>