宋飞扬 1 éve
szülő
commit
7c0d3a0a9b

+ 10 - 8
src/pages/client/clientPackage/orderAll.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="container">
-    <u-sticky bgColor="#fff">
-      <u-tabs :list="list" :current="current" @change="handlerChangeItem" />
+    <u-sticky style="margin-top: 15rpx; margin-left: 20rpx" bgColor="#fff">
+      <u-tabs lineWidth="40" :list="list" :current="current" @change="handlerChangeItem" />
     </u-sticky>
 
     <!-- 订单 -->
@@ -32,15 +32,11 @@ export default {
           type: 'WAIT_PAY',
         },
         {
-          name: '待评价',
+          name: '已付款',
           type: 'WAIT_EVALUATE',
         },
         {
-          name: '已完成',
-          type: 'COMPLETE',
-        },
-        {
-          name: '已取消',
+          name: '待评价',
           type: 'CANCELLED',
         },
       ],
@@ -73,3 +69,9 @@ export default {
   },
 };
 </script>
+
+<style lang="scss" scoped>
+::deep .u-tabs__wrapper__nav__item__text {
+  font-size: 30px;
+}
+</style>

+ 22 - 13
src/pages/client/clientUser/myProfit.vue

@@ -1,5 +1,12 @@
 <template>
   <view class="container">
+    <view class="item-box">
+      <view class="item" :key="item" v-for="item of price_list">
+        <view class="item-text">{{ item.name }}</view>
+        <view class="item-price">{{ item.price }}</view>
+      </view>
+    </view>
+
     <view class="item-box">
       <view class="item" :key="item" v-for="item of price_list1">
         <view class="item-text">{{ item.name }}</view>
@@ -23,19 +30,6 @@
         <button class="btn" @click="handlerWithdrawFunds">提现</button>
       </view>
     </view>
-
-    <view class="footer-item">
-      <img class="img" src="@/static/logo.png" alt="" />
-      <view class="item-box4">
-        <view class="item">
-          <view class="item-text">邀请好友</view>
-          <view class="item-price">推广码:123456</view>
-        </view>
-        <view class="btn-box">
-          <button class="btn">邀请</button>
-        </view>
-      </view>
-    </view>
   </view>
 </template>
 
@@ -43,6 +37,20 @@
 export default {
   data() {
     return {
+      price_list: [
+        {
+          name: '钱包余额(元)',
+          price: '258.00',
+        },
+        {
+          name: '总收益(元)',
+          price: '258.00',
+        },
+        {
+          name: '待转入(元)',
+          price: '258.00',
+        },
+      ],
       price_list1: [
         {
           name: '总收益(元)',
@@ -86,6 +94,7 @@ export default {
 
 <style lang="scss" scoped>
 .container {
+  margin-top: 25rpx;
   background-color: #efefef;
   min-height: calc(100vh - 10rpx);
   .item-box,

+ 8 - 0
src/pages/client/clientUser/setting.vue

@@ -11,6 +11,14 @@
             isLink
             url="/pages/client/clientUser/editData"
           />
+          <u-cell
+            size="large"
+            :border="false"
+            icon="fingerprint"
+            title="安全中心"
+            isLink
+            url="/pages/client/clientUser/editData"
+          />
           <u-cell
             size="large"
             :border="false"

+ 17 - 10
src/pages/client/tabBar/mine.vue

@@ -76,7 +76,7 @@
     <view class="income-out-box">
       <view class="income-inner-box" @click="handlerSkipMyProfit">
         <view class="income-head">
-          <text class="my-income">我的收益</text>
+          <text class="my-income">我的钱包</text>
           <u-icon name="arrow-right" />
         </view>
         <view class="income-content">
@@ -93,7 +93,7 @@
     <!-- 预约列表 -->
     <view class="appointList">
       <u-cell icon="setting-fill" title="预约列表" isLink url="/pages/client/clientUser/appoint" />
-      <u-cell icon="setting-fill" title="我的店铺" isLink />
+      <u-cell icon="setting-fill" title="我要开店" isLink />
     </view>
 
     <view class="other-out-box">
@@ -144,22 +144,22 @@ export default {
       ],
       oderList: [
         {
-          name: 'photo',
-          title: '我的订单',
+          name: 'order',
+          title: '全部订单',
           type: 0,
         },
         {
-          name: 'lock',
+          name: 'bag-fill',
           title: '待付款',
           type: 1,
         },
         {
-          name: 'star',
-          title: '已完成',
+          name: 'car-fill',
+          title: '已付款',
           type: 2,
         },
         {
-          name: 'hourglass',
+          name: 'heart',
           title: '待评价',
           type: 3,
         },
@@ -189,6 +189,12 @@ export default {
           title: '我的团队',
           url: '/pages/client/clientUser/myGroup',
         },
+        {
+          id: '1',
+          icon: 'setting-fill',
+          title: '我要推广',
+          url: '/pages/client/clientUser/myGroup',
+        },
         {
           id: '2',
           icon: 'setting-fill',
@@ -202,7 +208,7 @@ export default {
           url: '/pages/client/clientUser/serviceCenter',
         },
         {
-          id: '3',
+          id: '4',
           icon: 'setting-fill',
           title: '意见反馈',
           url: '/pages/client/clientUser/serviceCenter',
@@ -262,7 +268,7 @@ export default {
     box-sizing: border-box;
 
     .user-nickname {
-      margin-left: -185rpx;
+      margin-left: -215rpx;
       margin-top: 50rpx;
     }
 
@@ -287,6 +293,7 @@ export default {
       .btn-wrap {
         width: 160rpx;
         margin-top: 40rpx;
+        margin-right: -25rpx;
       }
     }
   }