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

peng

2025-07-02 d3d0b4dbb4f1f8c4784c834e0a39feba8aa5afa5

 pages/tabbar/user/utils/tool.vue

@@ -52,11 +52,6 @@
                  <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')">
                  <image src="/static/mine/shensu.png" mode=""></image>
                  <view>我的收藏</view>
@@ -66,11 +61,15 @@
                  <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')">
            <!--    <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/customerManager/customerManager')">
                  <image src="/static/mine/shensu.png" mode=""></image>
                  <view>客户管理</view>
               </view>
               </view> -->
               <view class="interact-item" @click="navigateTo('/pages/order/complain/complainList')">
                  <image src="/static/mine/shensu.png" mode=""></image>
                  <view>我的投诉</view>
@@ -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/goods-manager/goodsList/goodsList')">
                  <image src="/static/mine/order.png" mode=""></image>
                  <view>商户订单管理</view>
               </view>

            </view>
         </div>
@@ -152,7 +154,6 @@
         }
      },
      onReady(){
         console.log(123)
         getUserInfo().then(res => {
            if(res.data.result){
               if(res.data.result.storeId){