Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-wx into dev

zhanghua

2025-06-11 1eefd113e28e802348a9cae69a41945c1dc48b0f

 pages/tabbar/user/utils/tool.vue

@@ -37,13 +37,40 @@
           <view>我的积分</view>
         </view>
         
         <view class="interact-item" @click="distribution">
               <!--    <view class="interact-item" @click="distribution">
           <image src="/static/mine/distribution.png" mode=""></image>
           <view>我的分销</view>
         </view> -->

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

               <view class="interact-item" @click="navigateTo('/pages/userPermissions/userPermissions')">
                  <image src="/static/mine/shensu.png" mode=""></image>
                  <view>用户权限</view>
               </view>

               <view class="interact-item" @click="navigateTo('/pages/customerManager/customerManager')">
                  <image src="/static/mine/shensu.png" mode=""></image>
                  <view>客户管理</view>
               </view>
         <view class="interact-item" @click="navigateTo('/pages/order/complain/complainList')">
           <image src="/static/mine/shensu.png" mode=""></image>
           <view>我的投诉</view>
@@ -114,7 +141,9 @@
</template>

<script>
import { distribution } from "@/api/goods";
   import {
      distribution
   } from "@/api/goods";
import configs from "@/config/config";
import storage from "@/utils/storage";

@@ -137,14 +166,17 @@
            '/pages/mine/set/setUp',
            '/pages/mine/set/editionIntro',
            '/pages/mine/set/feedBack',
            '/pages/goods-manager/goodsList/goodsList'
               '/pages/goods-manager/goodsList/goodsList',
               '/pages/mine/set/feedBack',
               '/pages/mine/activity/myActivity',
               '/pages/mine/myCollect/myCollect',
               '/pages/mine/myCollect'
         ]
         if (!ignores.includes(url)) {
            if (this.$options.filters.tipsToLogin('normal')) {
               this.handleNavigate(url)
            }
         }
         else {
            } else {
            this.handleNavigate(url)
         }
    },
@@ -207,22 +239,26 @@
  .interactBox {
    height: 156rpx;
  }

  .interact-container {
    margin: 0 20rpx;
    background: #fff;
    border-radius: 20rpx;
    box-shadow: 0 4rpx 24rpx 0 rgba($color: #f6f6f6, $alpha: 1);

    .interact-item-img {
      width: 52rpx !important;
      height: 52rpx !important;
      // margin-bottom:  !important;
      margin: 0 auto 6rpx auto !important;
    }

    image {
      width: 52rpx;
      height: 52rpx;
      margin-bottom: 6rpx;
    }

    display: flex;
    align-items: center;
    flex-wrap: wrap;