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

zxl

2025-08-08 3e2ef5dd097474b14adc81a003603720e2a4a90d

 pages/tabbar/user/utils/tool.vue

@@ -51,24 +51,25 @@
                  <image src="/static/mine/shensu.png" mode=""></image>
                  <view>我的活动</view>
               </view> -->
<!--               </view>-->

               <view class="interact-item" @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>

<!--                <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 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')">
@@ -119,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>


@@ -127,11 +128,11 @@
                  <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/supplier/suppler-order/suppler-order')">
               <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>