Browse Source

🐞 fix:整改我的页面

yizhiyang 1 year ago
parent
commit
73b620626f

+ 13 - 0
src/api/client/home.js

@@ -30,6 +30,19 @@ export function getHomePageApi(data) {
   });
 }
 
+/**
+ *@description 轮播图
+ */
+
+export function getSwiperListApi() {
+  return request({
+    url: '/maintain/listCarouselImages/',
+    methods: get,
+    header: {
+      'content-type': 'application/x-www-form-urlencoded',
+    },
+  });
+}
 /**
  *@description 获取首页分类的数据
  */

+ 44 - 28
src/components/tabbar/index.vue

@@ -1,33 +1,45 @@
 <template>
   <view>
-    <view v-show="true">
-      <u-tabbar :value="currentTab" activeColor="#2D73F0" inactiveColor="#333">
-        <u-tabbar-item
-          v-for="item in clientList"
-          :key="item.name"
-          :text="item.text"
-          :name="item.name"
-          @click="handTab(item)"
-        >
-          <image class="bar_img" slot="active-icon" :src="item.selectedIconPath"></image>
-          <image class="bar_img" slot="inactive-icon" :src="item.iconPath"></image>
-        </u-tabbar-item>
-      </u-tabbar>
-    </view>
-    <view v-show="false">
-      <u-tabbar :value="currentTab" activeColor="#2D73F0" inactiveColor="#333" :border="true">
-        <u-tabbar-item
-          v-for="item in merchantList"
-          :key="item.name"
-          :text="item.text"
-          :name="item.name"
-          @click="handTab(item)"
-        >
-          <image class="bar_img" slot="active-icon" :src="item.selectedIconPath"></image>
-          <image class="bar_img" slot="inactive-icon" :src="item.iconPath"></image>
-        </u-tabbar-item>
-      </u-tabbar>
-    </view>
+    <u-tabbar
+      :value="currentTab"
+      activeColor="#2D73F0"
+      inactiveColor="#333"
+      :fixed="true"
+      :placeholder="true"
+      :safeAreaInsetBottom="true"
+      :border="true"
+      :mid-button="true"
+    >
+      <u-tabbar-item
+        v-for="item in clientList"
+        :key="item.name"
+        :text="item.text"
+        :name="item.name"
+        @click="handTab(item)"
+      >
+        <image class="bar_img" slot="active-icon" :src="item.selectedIconPath" />
+        <image class="bar_img" slot="inactive-icon" :src="item.iconPath" />
+      </u-tabbar-item>
+    </u-tabbar>
+
+    <!-- <u-tabbar
+      :value="currentTab"
+      activeColor="#2D73F0"
+      inactiveColor="#333"
+      :border="true"
+      v-show="false"
+    >
+      <u-tabbar-item
+        v-for="item in merchantList"
+        :key="item.name"
+        :text="item.text"
+        :name="item.name"
+        @click="handTab(item)"
+      >
+        <image class="bar_img" slot="active-icon" :src="item.selectedIconPath" />
+        <image class="bar_img" slot="inactive-icon" :src="item.iconPath" />
+      </u-tabbar-item>
+    </u-tabbar> -->
   </view>
 </template>
 
@@ -128,4 +140,8 @@ export default {
   width: 54rpx;
   height: 54rpx;
 }
+
+::deep .u-tabbar {
+  border-top: 2rpx solid #dadbde;
+}
 </style>

+ 6 - 0
src/pages.json

@@ -169,6 +169,12 @@
             "navigationBarTitleText": "我的收藏"
           }
         },
+        {
+          "path": "cart/index",
+          "style": {
+            "navigationBarTitleText": "购物车"
+          }
+        },
         {
           "path": "myScore",
           "style": {

+ 10 - 0
src/pages/client/clientUser/cart/index.vue

@@ -0,0 +1,10 @@
+<template>
+  <div>购物车</div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style lang="scss" scoped>
+</style>

+ 78 - 0
src/pages/client/tabBar/home/index.scss

@@ -0,0 +1,78 @@
+.home {
+  background-color: #f0efef;
+
+  .nav-bar {
+    ::v-deep .u-navbar__content {
+      background-color: #ffffff;
+    }
+  }
+}
+
+/* 头部搜索栏 */
+.home-header {
+  display: flex;
+  align-items: center;
+  height: 90rpx;
+  line-height: 90rpx;
+  padding: 0 20rpx;
+  background-color: #ffffff;
+
+  .goto-address {
+    display: flex;
+    align-items: center;
+
+    .icon-sanjiaoxing1 {
+      font-size: 24rpx;
+      margin: 17rpx 10rpx 0 6rpx;
+    }
+  }
+
+  .search-item {
+    flex: 1;
+  }
+}
+
+/* 轮播图 */
+.home-swiper {
+  padding: 20rpx;
+  margin-bottom: 10rpx;
+}
+
+/* 商品分类 */
+.home-list {
+  background-color: #ffffff;
+  height: 360rpx;
+  margin: 0 20rpx 20rpx 20rpx;
+  padding: 20rpx 0 50rpx 0;
+  border-radius: 10rpx;
+
+  .grid-text {
+    font-size: 12px;
+    color: #909399;
+    padding: 10rpx 0 20rpx 0rpx;
+    box-sizing: border-box;
+  }
+}
+
+/* 热门推荐 */
+.hot {
+  ::v-deep .u-cell__body {
+    padding: 10rpx 20rpx;
+
+    .hot-title {
+      border-left: 4px solid $uni-color-primary;
+      padding-left: 20rpx;
+    }
+  }
+}
+
+.near {
+  ::v-deep .u-cell__body {
+    padding: 10rpx 20rpx;
+
+    .near-title {
+      border-left: 4px solid $uni-color-primary;
+      padding-left: 20rpx;
+    }
+  }
+}

+ 11 - 86
src/pages/client/tabBar/home/index.vue

@@ -22,7 +22,7 @@
 
       <!-- 轮播图 -->
       <view class="home-swiper">
-        <u-swiper :list="swiperList" indicator @change="change" @click="click" />
+        <u-swiper :list="swiperList" indicator />
       </view>
 
       <!-- 商品分类 -->
@@ -101,7 +101,7 @@
 </template>
 
 <script>
-import { getCurrentLocation, getHomePageApi } from '@/api/client/home';
+import { getCurrentLocation, getHomePageApi, getSwiperListApi } from '@/api/client/home';
 import { mapGetters } from 'vuex';
 import RecommendItem from '@/components/merchant/RecommendItem.vue';
 import HotItem from '@/components/merchant/HotItem.vue';
@@ -181,7 +181,10 @@ export default {
     uni.hideTabBar({
       animation: false,
     });
+
+    this.getSwiperList();
   },
+
   //页面加载
   async onLoad() {
     setTimeout(() => {
@@ -204,12 +207,11 @@ export default {
   },
 
   methods: {
-    //轮播图切换
-    change() {},
-
-    //轮播图点击
-    click(name) {
-      this.$refs.uToast.success(`点击了第${name}个`);
+    /* 轮播图 */
+    getSwiperList() {
+      // getSwiperListApi().then(res => {
+      //   console.log(res);
+      // });
     },
 
     // 获取首页数据
@@ -280,82 +282,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.home {
-  background-color: #f0efef;
-
-  .nav-bar {
-    ::v-deep .u-navbar__content {
-      background-color: #ffffff;
-    }
-  }
-}
-
-/* 头部搜索栏 */
-.home-header {
-  display: flex;
-  align-items: center;
-  height: 90rpx;
-  line-height: 90rpx;
-  padding: 0 20rpx;
-  background-color: #ffffff;
-
-  .goto-address {
-    display: flex;
-    align-items: center;
-
-    .icon-sanjiaoxing1 {
-      font-size: 24rpx;
-      margin: 17rpx 10rpx 0 6rpx;
-    }
-  }
-
-  .search-item {
-    flex: 1;
-  }
-}
-
-/* 轮播图 */
-.home-swiper {
-  padding: 20rpx;
-  margin-bottom: 10rpx;
-}
-
-/* 商品分类 */
-.home-list {
-  background-color: #ffffff;
-  height: 360rpx;
-  margin: 0 20rpx 20rpx 20rpx;
-  padding: 20rpx 0 50rpx 0;
-  border-radius: 10rpx;
-
-  .grid-text {
-    font-size: 12px;
-    color: #909399;
-    padding: 10rpx 0 20rpx 0rpx;
-    box-sizing: border-box;
-  }
-}
-
-/* 热门推荐 */
-.hot {
-  ::v-deep .u-cell__body {
-    padding: 10rpx 20rpx;
-
-    .hot-title {
-      border-left: 4px solid $uni-color-primary;
-      padding-left: 20rpx;
-    }
-  }
-}
-
-.near {
-  ::v-deep .u-cell__body {
-    padding: 10rpx 20rpx;
-
-    .near-title {
-      border-left: 4px solid $uni-color-primary;
-      padding-left: 20rpx;
-    }
-  }
-}
+@import './index.scss';
 </style>

+ 96 - 0
src/pages/client/tabBar/mine/TapList.vue

@@ -0,0 +1,96 @@
+<template>
+  <view>
+    <!-- 预约列表 -->
+    <view class="appointList">
+      <template>
+        <u-cell
+          v-for="item in isLinkList1"
+          :key="item.id"
+          :border="false"
+          :icon="item.icon"
+          :title="item.title"
+          isLink
+          :url="item.url"
+        />
+      </template>
+    </view>
+
+    <view class="other-out-box">
+      <u-cell
+        v-for="item in isLinkList2"
+        :key="item.id"
+        :border="false"
+        :icon="item.icon"
+        :title="item.title"
+        isLink
+        :url="item.url"
+      />
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      isLinkList1: [
+        {
+          id: '0',
+          icon: 'setting-fill',
+          title: '预约列表',
+          url: '/pages/client/clientUser/mine/appoint/appoint',
+        },
+        {
+          id: '1',
+          icon: 'setting-fill',
+          title: '询价列表',
+          url: '/pages/client/clientPackage/inquiryList',
+        },
+      ],
+      isLinkList2: [
+        {
+          id: '0',
+          icon: 'setting-fill',
+          title: '我的店铺',
+          url: '',
+        },
+        {
+          id: '1',
+          icon: 'setting-fill',
+          title: '我的团队',
+          url: '/pages/client/clientUser/myGroup',
+        },
+        {
+          id: '2',
+          icon: 'setting-fill',
+          title: '客服中心',
+          url: '/pages/client/clientPackage/inquiryList',
+        },
+        {
+          id: '3',
+          icon: 'setting-fill',
+          title: '关于我们',
+          url: '/pages/client/clientPackage/mine/setting/aboutMine',
+        },
+      ],
+    };
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.appointList {
+  margin: 20rpx;
+  padding: 20rpx 10rpx;
+  border-radius: 10rpx;
+  background-color: #fff;
+}
+
+.other-out-box {
+  margin: 20rpx;
+  padding: 20rpx 10rpx;
+  margin-top: 0;
+  box-sizing: border-box;
+  background-color: $uni-bg-color;
+}
+</style>

+ 88 - 0
src/pages/client/tabBar/mine/index.scss

@@ -0,0 +1,88 @@
+.container {
+  min-height: 100vh;
+  background-color: #efefef;
+  box-sizing: border-box;
+  .flex {
+    display: flex;
+  }
+  .head-info {
+    background-color: #337bad;
+    height: 360rpx;
+    padding: 20rpx;
+    position: relative;
+    .head-flex {
+      display: flex;
+      align-items: center;
+
+      .nickname {
+        font-size: 40rpx;
+        color: #ffffff;
+        margin-bottom: 20rpx;
+      }
+      .setAuth {
+        width: 90rpx;
+        height: 40rpx;
+        font-size: 24rpx;
+        display: block;
+        cursor: pointer;
+        margin-right: 10rpx;
+        line-height: 40rpx;
+        text-align: center;
+        border-radius: 20rpx;
+        background-color: rgba(255, 255, 255, 0.4);
+      }
+    }
+
+    .Collect {
+      margin-top: 10rpx;
+
+      .grid-text {
+        font-size: 30rpx;
+        color: #fff;
+      }
+    }
+
+    .order-out-box {
+      width: 94%;
+      position: absolute;
+      bottom: -70rpx;
+      .order-inner-box {
+        padding: 30rpx;
+        font-size: 30rpx;
+        border-radius: 10rpx;
+        background-color: $uni-bg-color;
+      }
+    }
+  }
+  .income {
+    padding: 20rpx;
+    border-radius: 10rpx;
+    margin: 90rpx 20rpx 20rpx 20rpx;
+    background-color: $uni-bg-color;
+    .income-head {
+      display: flex;
+      justify-content: space-between;
+
+      .my-income {
+        color: $uni-color-primary;
+        font-size: 32rpx;
+        font-weight: 600;
+      }
+    }
+
+    .income-content {
+      margin: 15rpx 0;
+      .num-box {
+        padding: 20rpx 0;
+        font-size: 36rpx;
+        font-weight: 600;
+        color: $uni-text-color;
+      }
+
+      .num-title {
+        font-size: 28rpx;
+        color: $uni-text-color-grey;
+      }
+    }
+  }
+}

+ 54 - 341
src/pages/client/tabBar/mine/index.vue

@@ -1,40 +1,27 @@
 <template>
   <view class="container">
+    <view :style="{ height: systemBar + 'px', backgroundColor: '#337bad' }" />
     <view>
-      <view class="head-wrap">
-        <view class="content">
-          <view class="avatar-wrap">
-            <u-avatar :src="user_info.avatar" @click="onClickAvatar" size="80"></u-avatar>
-          </view>
-          <view class="user-nickname">
-            <u--text
-              size="18"
-              bold
-              :text="user_info.nickname ? user_info.nickname : 'fadsfdaf'"
-            ></u--text>
-            <u--text size="12" text="欢迎加入车旅程"></u--text>
+      <view class="head-info">
+        <view class="head-flex">
+          <view style="margin-right: 20rpx">
+            <u-avatar
+              :src="user_info.avatar"
+              size="80"
+              @tap="$Router.push('/pages/client/clientUser/personal')"
+            />
           </view>
           <view>
-            <!-- 已登录 -->
-            <!-- <view class="user-base" v-if="user_info.nickname"> -->
-            <view class="user-base">
-              <view class="btn-wrap">
-                <u-icon
-                  size="30"
-                  @tap="$Router.push('/pages/client/clientUser/mine/setting')"
-                  name="setting"
-                ></u-icon>
-              </view>
+            <view class="nickname">{{ user_info.nickname }}</view>
+            <view class="flex">
+              <text class="setAuth" @tap="$Router.push('/pages/client/clientUser/mine/setting')">
+                设置
+              </text>
+              <text class="setAuth">认证</text>
             </view>
-
-            <!-- 未登录 -->
-            <!-- <view class="clickLogin" v-else @tap="$Router.push('/pages/login/index')">
-            点击登录/注册
-          </view> -->
           </view>
         </view>
-
-        <!-- 收藏 -->
+        <!-- 列表 -->
         <view class="Collect">
           <u-grid :border="false" col="4">
             <u-grid-item
@@ -45,14 +32,14 @@
               <u-icon
                 :customStyle="{ paddingTop: 20 + 'rpx' }"
                 :name="listItem.name"
-                :size="24"
+                :size="28"
                 color="#fff"
               />
               <text class="grid-text">{{ listItem.title }}</text>
             </u-grid-item>
           </u-grid>
         </view>
-
+        <!-- 订单 -->
         <view class="order-out-box">
           <view class="order-inner-box">
             <u-grid :border="false" col="4" style="background-color: #fff">
@@ -61,11 +48,7 @@
                 :key="listIndex"
                 @tap="gotoOrder(listItem)"
               >
-                <u-icon
-                  :customStyle="{ paddingTop: 20 + 'rpx' }"
-                  :name="listItem.name"
-                  :size="34"
-                ></u-icon>
+                <u-icon :name="listItem.name" :size="34" />
                 <text class="grid-text">{{ listItem.title }}</text>
               </u-grid-item>
             </u-grid>
@@ -74,175 +57,66 @@
       </view>
 
       <!-- 我的收益 -->
-      <view class="income-out-box">
-        <view class="income-inner-box" @click="handlerSkipMyProfit">
-          <view class="income-head">
-            <text class="my-income">我的钱包</text>
-            <u-icon name="arrow-right" />
-          </view>
-          <view class="income-content">
-            <u-grid :border="false" col="4" bgColor="#fff">
-              <u-grid-item v-for="(listItem, listIndex) in incomeList" :key="listIndex">
-                <view class="num-box">{{ listItem.num }}元</view>
-                <view class="num-title">{{ listItem.title }}</view>
-              </u-grid-item>
-            </u-grid>
-          </view>
+      <view class="income" @click="handlerSkipMyProfit">
+        <view class="income-head">
+          <text class="my-income">我的钱包</text>
+          <u-icon name="arrow-right" />
         </view>
-      </view>
-
-      <!-- 预约列表 -->
-      <view class="appointList">
-        <u-cell
-          icon="setting-fill"
-          title="预约列表"
-          isLink
-          url="/pages/client/clientUser/mine/appoint/appoint"
-        />
-        <u-cell icon="setting-fill" title="我要开店" isLink />
-      </view>
-
-      <view class="other-out-box">
-        <view class="other-inner-box">
-          <u-cell-group :border="false">
-            <u-cell
-              v-for="(item, index) in listData"
-              :key="index"
-              size="large"
-              :border="false"
-              :icon="item.icon"
-              :title="item.title"
-              isLink
-              :url="item.url"
-            ></u-cell>
-            <u-cell
-              :border="false"
-              icon="setting-fill"
-              title="客服中心"
-              size="large"
-              isLink
-              @tap="handleServiceCenterClick"
-            />
-            <u-cell
-              :border="false"
-              icon="setting-fill"
-              title="商务合作"
-              size="large"
-              isLink
-              @tap="handleBusinessCooperationClick"
-            />
-            <u-cell
-              icon="setting-fill"
-              title="意见反馈"
-              size="large"
-              isLink
-              @tap="handleFeedbackClick"
-            />
-          </u-cell-group>
+        <view class="income-content">
+          <u-grid :border="false" col="4" bgColor="#fff">
+            <u-grid-item v-for="(listItem, listIndex) in incomeList" :key="listIndex">
+              <view class="num-box">{{ listItem.num }}元</view>
+              <view class="num-title">{{ listItem.title }}</view>
+            </u-grid-item>
+          </u-grid>
         </view>
       </view>
+      <!-- 列表 -->
+      <TapList></TapList>
     </view>
-    <tabbar currentTab="clientMessage" />
+    <tabbar currentTab="clientMine" />
   </view>
 </template>
 
 <script>
 import { maintainUserInfo } from '@/api/client/mine.js';
-import RichTextWithCopy from '@/components/RichTextWithCopy/RichTextWithCopy';
 import { collectList, oderList, incomeList, listData } from './mine';
-
+import TapList from './TapList.vue';
 export default {
   components: {
-    RichTextWithCopy,
+    TapList,
   },
-
   data() {
     return {
-      content: '这里是客服中心内容,用户可以复制<br>第一行文本<br>第二行文本<br>第三行文本',
+      system: {},
+      systemBar: 0,
+      user_info: [],
       collectList,
       oderList,
       incomeList,
       listData,
-      user_info: {}, // 个人信息
-      avatar: '/pages/static', // 用于存储图片路径
     };
   },
-
-  async mounted() {
-    await this.handlerInitUserMessage();
-  },
-  onShow() {
-    /* 隐藏原生的tabbar */
-    uni.hideTabBar({
-      animation: false,
-    });
+  mounted() {
+    this.handlerInitUserMessage();
   },
   methods: {
-    // 获取当前用户信息
-    handlerInitUserMessage() {
-      maintainUserInfo().then(res => {
-        this.user_info = res.data;
-      });
-    },
-
-    // 点击头像
-    async onClickAvatar() {
-      try {
-        const res = await uni.showActionSheet({
-          itemList: ['拍照', '从相册选择'],
-        });
-
-        if (res.tapIndex === 0) {
-          // 用户选择拍照
-          this.takePhoto();
-        } else if (res.tapIndex === 1) {
-          // 用户选择从相册选择
-          this.chooseImage();
-        }
-      } catch (error) {
-        console.error(error);
-      }
-    },
-
-    // 拍照
-    takePhoto() {
-      uni.chooseImage({
-        sourceType: ['camera'],
-        count: 1,
+    getHeight() {
+      wx.getSystemInfo({
         success: res => {
-          const tempFilePaths = res.tempFilePaths;
-          // 调用上传图片的方法
-          this.uploadAvatar(tempFilePaths[0]);
-        },
-        fail: error => {
-          console.error(error);
+          this.system = res;
         },
       });
+      this.systemBar = this.system.statusBarHeight;
+      console.log(this.systemBar);
     },
-    //从相册中选择
-    chooseImage() {
-      uni.chooseImage({
-        sourceType: ['album'],
-        count: 1,
-        success: res => {
-          const tempFilePaths = res.tempFilePaths;
-          // 调用上传图片的方法
-          this.uploadAvatar(tempFilePaths[0]);
-        },
-        fail: error => {
-          console.error(error);
-        },
+    // 获取当前用户信息
+    handlerInitUserMessage() {
+      maintainUserInfo().then(res => {
+        this.user_info = res.data;
       });
     },
 
-    // 上传头像
-    uploadAvatar(filePath) {
-      // 在这里实现上传头像的逻辑,将filePath作为参数传入
-      const newImagePath = api.uploadImage(filePath);
-      this.user_info.avatar = newImagePath;
-      this.$forceUpdate(); // 手动触发组件的重新渲染
-    },
-
     // 点击跳转到全部订单
     gotoOrder(item) {
       uni.navigateTo({
@@ -256,175 +130,14 @@ export default {
         url: '/pages/client/clientUser/myProfit',
       });
     },
-    // 点击 "客服中心" 菜单项
-    handleServiceCenterClick() {
-      uni.showModal({
-        title: '客服中心',
-        content: '<rich-text-with-copy :content="content"></rich-text-with-copy>',
-        showCancel: false,
-        confirmText: '知道了',
-        richContent: true, // 使用富文本显示内容
-      });
-    },
-
-    // 点击 "商务合作" 菜单项
-    handleBusinessCooperationClick() {
-      uni.showModal({
-        title: '商务合作',
-        content: '111111111111111111',
-        showCancel: false,
-        confirmText: '知道了',
-        richContent: true, // 使用富文本显示内容
-      });
-    },
+  },
 
-    // 点击 "意见反馈" 菜单项
-    handleFeedbackClick() {
-      uni.showModal({
-        title: '意见反馈',
-        content: '',
-        showCancel: false,
-        confirmText: '提交',
-        contentInput: true, // 使用输入框内容
-        inputPlaceHolder: '请输入您的意见反馈,最多500个字符',
-        inputMaxLength: 500, // 设置输入框最大长度
-        success: res => {
-          if (res.confirm) {
-            // 获取用户输入的意见反馈内容
-            const feedback = res.inputValue;
-            console.log('用户的意见反馈内容:', feedback);
-            // 在这里可以将用户的反馈内容进行处理,比如发送给服务器等操作
-          }
-        },
-      });
-    },
+  onLoad() {
+    this.getHeight();
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.container {
-  min-height: 100vh;
-  background-color: #efefef;
-}
-
-/* 顶部登录 */
-.head-wrap {
-  background-color: #c8c9cc;
-  height: 390rpx;
-  padding-top: 40rpx;
-
-  .content {
-    display: flex;
-    justify-content: space-between;
-    padding: 38rpx 0 0 36rpx;
-    box-sizing: border-box;
-
-    .user-nickname {
-      margin-left: -215rpx;
-      margin-top: 50rpx;
-    }
-
-    .clickLogin {
-      font-size: 48rpx;
-      color: #ffffff;
-      margin-top: 40rpx;
-      margin-left: 20rpx;
-    }
-
-    .avatar-wrap {
-      display: inline-block;
-    }
-
-    .user-base {
-      margin-left: 10rpx;
-      vertical-align: middle;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-evenly;
-
-      .btn-wrap {
-        width: 160rpx;
-        margin-top: 40rpx;
-        margin-right: -25rpx;
-      }
-    }
-  }
-
-  .Collect {
-    margin-top: 10rpx;
-
-    // 宫格颜色
-    .grid-text {
-      font-size: 30rpx;
-      color: #fff;
-      margin-top: 5rpx;
-      box-sizing: border-box;
-    }
-  }
-
-  .order-out-box {
-    margin-top: 30rpx;
-    padding: 10rpx 16rpx;
-    box-sizing: border-box;
-
-    .order-inner-box {
-      font-size: 30rpx;
-      padding-bottom: 30rpx;
-      background-color: $uni-bg-color;
-      border-radius: 10rpx;
-    }
-  }
-}
-
-.income-out-box {
-  margin-top: 110rpx;
-  padding: 10rpx 16rpx;
-  box-sizing: border-box;
-
-  .income-inner-box {
-    padding: 20rpx;
-    background-color: $uni-bg-color;
-
-    .income-head {
-      display: flex;
-      justify-content: space-between;
-
-      .my-income {
-        color: $uni-color-primary;
-        font-size: 32rpx;
-        font-weight: 600;
-      }
-    }
-
-    .income-content {
-      .num-box {
-        padding: 20rpx 0;
-        font-size: 36rpx;
-        font-weight: 600;
-        color: $uni-text-color;
-      }
-
-      .num-title {
-        font-size: 28rpx;
-        color: $uni-text-color-grey;
-      }
-    }
-  }
-}
-
-.other-out-box {
-  margin-top: 10rpx;
-  padding: 20rpx 16rpx;
-  box-sizing: border-box;
-
-  .other-inner-box {
-    background-color: $uni-bg-color;
-  }
-}
-
-.appointList {
-  background-color: #fff;
-  margin: 10rpx 16rpx 0 16rpx;
-}
-</style>
+@import './index.scss';
+</style>

+ 2 - 17
src/pages/client/tabBar/mine/mine.js

@@ -11,8 +11,8 @@ export const collectList = [
   },
   {
     name: 'star',
-    title: '询价记录',
-    url: '/pages/client/clientUser/inquiryList',
+    title: '购物车',
+    url: '/pages/client/clientUser/cart/index ',
   },
   {
     name: 'hourglass',
@@ -62,18 +62,3 @@ export const incomeList = [
     title: '可提现',
   },
 ];
-
-export const listData = [
-  {
-    id: '0',
-    icon: 'setting-fill',
-    title: '我的团队',
-    url: '/pages/client/clientUser/myGroup',
-  },
-  {
-    id: '1',
-    icon: 'setting-fill',
-    title: '我要推广',
-    url: '/pages/client/clientUser/myGroup',
-  },
-];