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

peng

2025-07-02 d3d0b4dbb4f1f8c4784c834e0a39feba8aa5afa5

 pages/tabbar/user/utils/tool.vue

@@ -42,19 +42,14 @@
           <view>我的分销</view>
         </view> -->

               <view class="interact-item" @click="navigateTo('/pages/mine/myCollect')">
            <!--    <view class="interact-item" @click="navigateTo('/pages/mine/myCollect')">
                  <image src="/static/mine/shensu.png" mode=""></image>
                  <view>我的收藏</view>
               </view>
               </view> -->

               <view class="interact-item" @click="navigateTo('/pages/mine/activity/myActivity')">
                  <image src="/static/mine/shensu.png" mode=""></image>
                  <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')">
@@ -62,15 +57,19 @@
                  <view>我的收藏</view>
               </view>

               <view class="interact-item" @click="navigateTo('/pages/userPermissions/userPermissions')">
               <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" @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,15 +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>
@@ -101,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> -->



@@ -132,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>
@@ -141,7 +138,8 @@
</template>

<script>
   import {
   import { getUserInfo } from "@/api/members";
import {
      distribution
   } from "@/api/goods";
   import configs from "@/config/config";
@@ -150,12 +148,24 @@
   export default {
      data() {
         return {
            isStoreManger:false,
            configs,
            storage
         }
      },

      onReady(){
         getUserInfo().then(res => {
            if(res.data.result){
               if(res.data.result.storeId){
                  this.isStoreManger = true;
               }else{
                  this.isStoreManger = false;
               }
            }
         })
      },
      methods: {
			
         handleNavigate(url) {
            uni.navigateTo({
               url,