yizhiyang 1 年之前
父节点
当前提交
5fd01e6bb9

+ 46 - 40
src/components/merchant/HotItem.vue

@@ -2,11 +2,14 @@
   <view class="container">
     <view class="content">
       <view class="img-box">
-        <image :src="
+        <image
+          :src="
             error || !loaded
               ? 'https://cdn.uviewui.com/uview/album/10.jpg'
               : item.cover
-          " mode="scaleToFill"></image>
+          "
+          mode="scaleToFill"
+        ></image>
         <view class="name u-line-1">{{ item.name }}</view>
       </view>
       <view class="pd-10">{{ item.address }}</view>
@@ -17,56 +20,59 @@
 </template>
 
 <script>
-  export default {
-    props: {
-      item: {
-        type: Object,
-        default: () => {},
-      },
+export default {
+  props: {
+    item: {
+      type: Object,
+      default: () => {},
     },
-    filters: {
-      mToKm(v) {
-        return (Number(v) / 1000).toFixed(2) + 'km';
-      },
+  },
+  filters: {
+    mToKm(v) {
+      return (Number(v) / 1000).toFixed(2) + 'km';
     },
-  };
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .container {
+.container {
+  width: 100%;
+  padding: 20rpx;
+  box-sizing: border-box;
+
+  .content {
+    background-color: #ffffff;
     width: 100%;
-    padding: 20rpx;
-    box-sizing: border-box;
+    height: 100%;
 
-    .content {
-      background-color: #ffffff;
-      width: 100%;
-      height: 100%;
+    .img-box {
+      position: relative;
+      height: 240rpx;
 
-      .img-box {
-        position: relative;
+      image {
+        width: calc(50vw - 30rpx);
         height: 240rpx;
-
-        image {
-          width: calc(50vw - 30rpx);
-          height: 240rpx;
-        }
-
-        .name {
-          width: 100%;
-          position: absolute;
-          bottom: 0;
-          left: 0;
-          background-color: rgba(0, 0, 0, 0.2);
-          color: #ffffff;
-          padding: 10rpx;
-          box-sizing: border-box;
-        }
       }
 
-      .pd-10 {
+      .name {
+        width: 100%;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        background-color: rgba(0, 0, 0, 0.2);
+        color: #ffffff;
         padding: 10rpx;
+        box-sizing: border-box;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
     }
+
+    .pd-10 {
+      padding: 10rpx;
+    }
   }
-</style>
+}
+</style>

+ 5 - 1
src/components/merchant/RecommendItem.vue

@@ -9,7 +9,7 @@
               : item.cover
           "
           mode="scaleToFill"
-        ></image>
+        />
         <view class="name u-line-1">{{ item.name }}</view>
       </view>
       <view class="pd-10">{{ item.address }}</view>
@@ -60,6 +60,10 @@ export default {
         color: #ffffff;
         padding: 10rpx;
         box-sizing: border-box;
+        display: inline-block;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
     }
     .pd-10 {

+ 38 - 138
src/components/service/index.vue

@@ -1,14 +1,12 @@
 <template>
-  <view>
-    <view class="sort">
-      <!-- <view class="list" v-for="(item,index) of item" @click="$Router.push(`/pages/business/detail?id=${item.id}`)"> -->
-      <view
-        class="list"
-        :key="index"
-        v-for="(item, index) of item"
-        @click="handlerRouterSkip(item, index)"
-      >
-        <!-- <Image src="../../static/logo.png" @tap="$Router.push('/pages/business/service/index')" /> -->
+  <view class="sort">
+    <view
+      class="list"
+      :key="index"
+      v-for="(item, index) of item"
+      @click="handlerRouterSkip(item, index)"
+    >
+      <view class="list-img">
         <image
           class="img"
           :src="
@@ -18,51 +16,23 @@
           "
           mode="scaleToFill"
         ></image>
-        <view>
-          <view class="item-text">{{ item.address }}</view>
-          <view class="item-flex">
-            <view class="star">
-              <u-rate :count="item.score" :size="14" />
-              <text class="line">|</text>
-              <text class="points">{{ item.score }}分</text>
-            </view>
-            <view>{{ item.sale }}单</view>
-          </view>
-          <view class="list-item">
-            <view class="item-l">{{ item.name }}</view>
-            <view class="item-r">{{ item.distance }}KM</view>
-          </view>
-          <!-- <view class="list-item">
-            <view>
-              <view class="price">券后价
-                <text class="price-item">¥</text>
-                <text class="price-count">19</text>
-              </view>
-              <view class="gate-rate">
-                <text>门市价</text>
-                <text class="gate-rate-item">¥30</text>
-              </view>
-            </view>
-            <view class="appoint">
-              <text class="appoint-item" @click="show = true">预约</text>
-              <text class="Buy" @tap="$Router.push('/pages/business/buy/index')">购买</text>
-            </view>
-          </view> -->
-        </view>
       </view>
-      <!-- 预约弹出框的实现 -->
-      <!-- <u-popup :show="show" mode="center" @close="close" @open="open" :round="20">
-        <view class="popupContent">
-          <text class="popupItem">预约服务</text>
-          <view class="server">
-            <view class="popup-title">时间</view>
-			<u-picker mode="time" v-model="show"></u-picker>
-            <view class="popup-title">联系方式</view>
-            <u-input placeholder="请输入联系方式" border="bottom" clearable />
+
+      <view class="list-main">
+        <view class="item-text">{{ item.address }}</view>
+        <view class="item-flex">
+          <view class="star">
+            <u-rate :count="item.score" :size="14" />
+            <text class="line">|</text>
+            <text class="points">{{ item.score }}分</text>
           </view>
-          <u-button type="primary" shape="circle" size="small" text="确定"/>
+          <view>{{ item.sale }}单</view>
         </view>
-      </u-popup> -->
+        <view class="list-item">
+          <view class="item-l">{{ item.name }}</view>
+          <view class="item-r">{{ item.distance }}KM</view>
+        </view>
+      </view>
     </view>
   </view>
 </template>
@@ -84,12 +54,9 @@ export default {
     click(item) {
       console.log('item', item);
     },
-    open() {
-      // console.log('open');
-    },
+    open() {},
     close() {
       this.show = false;
-      // console.log('close');
     },
 
     // 点击跳转
@@ -112,7 +79,7 @@ export default {
 /*商家服务分类的是实现 */
 
 .sort {
-  background-color: #efefef;
+  min-height: 100vh;
 
   .list {
     height: 250rpx;
@@ -120,10 +87,20 @@ export default {
     padding: 20rpx;
     margin-bottom: 20rpx;
     display: flex;
-    .img {
-      width: 180px;
-      height: calc(100% - 20rpx);
-      margin: 10rpx 20rpx 10rpx 0;
+    .list-img {
+      width: 260rpx;
+      height: 100%;
+      background-color: #ec5729;
+      margin-right: 20rpx;
+
+      image {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .list-main {
+      width: calc(100% - 280rpx);
     }
 
     .item-text {
@@ -179,83 +156,6 @@ export default {
           padding-bottom: 20rpx;
         }
       }
-
-      // .list-item {
-      //   display: flex;
-      //   justify-content: space-between;
-
-      //   .price {
-      //     font-size: 32rpx;
-      //     font-weight: bold;
-      //     color: #fa3534;
-
-      //     .price-item {
-      //       font-size: 24rpx;
-      //       margin-left: 10rpx;
-      //     }
-
-      //     .price-count {
-      //       font-size: 44rpx;
-      //     }
-      //   }
-
-      //   .gate-rate {
-      //     color: #c9c9c9;
-      //     font-size: 26rpx;
-      //     margin: 16rpx 0 0 40rpx;
-
-      //     .gate-rate-item {
-      //       text-decoration: line-through;
-      //     }
-      //   }
-
-      //   .appoint {
-      //     width: 80px;
-      //     height: 32px;
-      //     display: flex;
-      //     margin-top: 20px;
-      //     font-size: 14px;
-
-      //     .appoint-item {
-      //       width: 40px;
-      //       height: 32px;
-      //       line-height: 32px;
-      //       text-align: center;
-      //       display: inline-block;
-      //       box-sizing: border-box;
-      //       border-radius: 16px 0 0 16px;
-      //       border: 1px solid #ec5729;
-      //     }
-
-      //     .Buy {
-      //       width: 40px;
-      //       height: 32px;
-      //       color: #fff;
-      //       line-height: 32px;
-      //       text-align: center;
-      //       display: inline-block;
-      //       border-radius: 0 16px 16px 0;
-      //       background-color: #ec5729;
-      //     }
-      //   }
-      // }
-    }
-  }
-
-  /* 弹框的样式 */
-  .popupContent {
-    width: 600rpx;
-    height: 400rpx;
-    padding: 30rpx;
-    box-sizing: border-box;
-
-    .popupItem {
-      font-size: 34rpx;
-      font-weight: bold;
-    }
-
-    .server {
-      margin: 20rpx 0 20rpx 30rpx;
     }
   }
 }

+ 57 - 58
src/pages/business/hot/index.vue

@@ -1,68 +1,67 @@
 <template>
   <view class="container">
-    <serviceItem :item='init_list' :skipType='0'></serviceItem>
-    <u-empty v-if="init_list.length == 0" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" > </u-empty>
+    <serviceItem :item="init_list" :skipType="0"></serviceItem>
+    <u-empty
+      v-if="init_list.length == 0"
+      mode="data"
+      icon="http://cdn.uviewui.com/uview/empty/data.png"
+    >
+    </u-empty>
   </view>
 </template>
 
 <script>
-  import { getHomePageApi,getCurrentLocation } from '@/api/home';
-  import serviceItem from '@/components/service/index.vue';
-  export default{
-    data(){
-      return{
-        queryParams:{
-          region:null,//地区编码
-          longitude:null,//经度
-          latitude:null,//纬度
+import { getHomePageApi, getCurrentLocation } from '@/api/home';
+import serviceItem from '@/components/service/index.vue';
+export default {
+  data() {
+    return {
+      queryParams: {
+        region: null, //地区编码
+        longitude: null, //经度
+        latitude: null, //纬度
+      },
+      init_list: [],
+    };
+  },
+  components: {
+    serviceItem,
+  },
+  mounted() {
+    this.handlerInitLocation();
+  },
+  methods: {
+    // 获取当前经纬度
+    handlerInitLocation() {
+      uni.getLocation({
+        type: 'gcj02',
+        success: res => {
+          this.queryParams.longitude = res.longitude;
+          this.queryParams.latitude = res.latitude;
+          let point = {
+            latitude: res.latitude,
+            longitude: res.longitude,
+          };
+          getCurrentLocation(point).then(rc => {
+            this.queryParams.region = rc.data.id;
+            this.handlerInitList();
+          });
         },
-        init_list:[]
-      }
-    },
-    components:{
-      serviceItem
+        fail: rs => {
+          uni.showToast({
+            title: rs,
+            icon: 'none',
+          });
+        },
+      });
     },
-    mounted() {
-      this.handlerInitLocation()
+    // 初始化列表信息
+    handlerInitList() {
+      getHomePageApi(this.queryParams).then(res => {
+        this.init_list = res.data.recommends;
+        // this.total = res.data.nears.total
+      });
     },
-    methods:{
-      // 获取当前经纬度
-      handlerInitLocation(){
-        uni.getLocation({
-        	type: 'gcj02',
-        	success: res => {
-        		this.queryParams.longitude = res.longitude;
-        		this.queryParams.latitude = res.latitude;
-            let point = {
-              latitude: res.latitude,
-              longitude: res.longitude
-            }
-            getCurrentLocation(point).then(rc=>{
-              this.queryParams.region = rc.data.id
-              this.handlerInitList()
-            })
-        	},
-        	fail: (rs) => {
-            uni.showToast({
-              title:rs,
-              icon:'none'
-            })
-        	}
-        });
-      },
-      // 初始化列表信息
-      handlerInitList(){
-        getHomePageApi(this.queryParams).then(res=>{
-          this.init_list = res.data.recommends
-          // this.total = res.data.nears.total
-        })
-      }
-    }
-  }
+  },
+};
 </script>
-
-<style lang="scss" scoped>
-  .container{
-
-  }
-</style>

+ 1 - 1
src/pages/tabbar/home/index.vue

@@ -340,7 +340,7 @@ export default {
   background-color: #ffffff;
   height: 360rpx;
   margin: 0 20rpx 20rpx 20rpx;
-  padding: 20rpx 0;
+  padding: 20rpx 0 50rpx 0;
   border-radius: 10rpx;
 
   .grid-text {

+ 263 - 211
src/pages/tabbar/mine/index.vue

@@ -10,13 +10,21 @@
           <view class="user-base" v-if="user_info.nickname">
             <view class="user-nickname">{{ user_info.nickname }}</view>
             <view class="btn-wrap">
-              <view class="btn-content" @tap="$Router.push('/pages/user/settings/index')">设置</view>
+              <view
+                class="btn-content"
+                @tap="$Router.push('/pages/user/settings/index')"
+                >设置</view
+              >
               <view class="btn-content">认证</view>
             </view>
           </view>
 
           <!-- 未登录 -->
-          <view class="clickLogin" v-else @tap="$Router.push('/pages/login/index')">点击登录/注册
+          <view
+            class="clickLogin"
+            v-else
+            @tap="$Router.push('/pages/login/index')"
+            >点击登录/注册
           </view>
         </view>
       </view>
@@ -24,23 +32,35 @@
       <!-- 收藏 -->
       <view class="Collect">
         <u-grid :border="false" col="4">
-          <u-grid-item v-for="(listItem, listIndex) in list1" :key="listIndex" @tap="$Router.push(listItem.url)">
-            <u-icon :customStyle="{ paddingTop: 20 + 'rpx' }" :name="listItem.name" :size="24" color="#fff" />
+          <u-grid-item
+            v-for="(listItem, listIndex) in list1"
+            :key="listIndex"
+            @tap="$Router.push(listItem.url)"
+          >
+            <u-icon
+              :customStyle="{ paddingTop: 20 + 'rpx' }"
+              :name="listItem.name"
+              :size="24"
+              color="#fff"
+            />
             <text class="grid-text">{{ listItem.title }}</text>
           </u-grid-item>
         </u-grid>
       </view>
 
-      <!-- 我的订单 -->
-      <!-- <view
-        class="order-out-box"
-        @tap="$Router.push('/pages/user/myOrder/index')"
-      > -->
       <view class="order-out-box">
         <view class="order-inner-box">
           <u-grid :border="false" col="4" style="background-color: #fff">
-            <u-grid-item v-for="(listItem, listIndex) in list2" :key="listIndex" @tap="gotoOrder(listItem)">
-              <u-icon :customStyle="{ paddingTop: 20 + 'rpx' }" :name="listItem.name" :size="34"></u-icon>
+            <u-grid-item
+              v-for="(listItem, listIndex) in list2"
+              :key="listIndex"
+              @tap="gotoOrder(listItem)"
+            >
+              <u-icon
+                :customStyle="{ paddingTop: 20 + 'rpx' }"
+                :name="listItem.name"
+                :size="34"
+              ></u-icon>
               <text class="grid-text">{{ listItem.title }}</text>
             </u-grid-item>
           </u-grid>
@@ -57,7 +77,10 @@
         </view>
         <view class="income-content">
           <u-grid :border="false" col="4" bgColor="#fff">
-            <u-grid-item v-for="(listItem, listIndex) in incomeList" :key="listIndex">
+            <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>
@@ -68,253 +91,282 @@
 
     <!-- 预约列表 -->
     <view class="appointList">
-      <u-cell icon="setting-fill" title="预约列表" isLink url="/pages/user/appoint/index" />
+      <u-cell
+        icon="setting-fill"
+        title="预约列表"
+        isLink
+        url="/pages/user/appoint/index"
+      />
+      <u-cell
+        icon="setting-fill"
+        title="我要开店"
+        isLink
+        url="/pages/user/appoint/index"
+      />
     </view>
 
     <view class="other-out-box">
       <view class="other-inner-box">
         <u-cell-group :border="false">
-          <u-cell size="large" :border="false" icon="setting-fill" title="我的团队" isLink url=""
-            @tap="$Router.push('/pages/user/mygroup/index')"></u-cell>
-          <u-cell size="large" :border="false" icon="setting-fill" title="关于我们" isLink url=""
-            @tap="$Router.push('/pages/user/aboutmy/index')"></u-cell>
-          <!-- <u-cell size="large" :border="false" icon="setting-fill" title="隐私条款" isLink url="" @tap="$Router.push('/pages/user/privacypolicy/index')"></u-cell> -->
-          <u-cell size="large" :border="false" icon="setting-fill" title="客服中心" isLink url=""
-            @tap="$Router.push('/pages/user/servicecenter/index')"></u-cell>
+          <u-cell
+            size="large"
+            :border="false"
+            icon="setting-fill"
+            title="我的团队"
+            isLink
+            url=""
+            @tap="$Router.push('/pages/user/mygroup/index')"
+          ></u-cell>
+          <u-cell
+            size="large"
+            :border="false"
+            icon="setting-fill"
+            title="关于我们"
+            isLink
+            url=""
+            @tap="$Router.push('/pages/user/aboutmy/index')"
+          ></u-cell>
+          <u-cell
+            size="large"
+            :border="false"
+            icon="setting-fill"
+            title="客服中心"
+            isLink
+            url=""
+            @tap="$Router.push('/pages/user/servicecenter/index')"
+          ></u-cell>
         </u-cell-group>
       </view>
     </view>
   </view>
 </template>
 <script>
-  // import { mapGetters } from 'vuex';
-  import {
-    maintainUserInfo
-  } from "@/api/mine.js"
-  export default {
-    data() {
-      return {
-        list1: [{
-            name: 'photo',
-            title: '收藏',
-            url: '/pages/user/collect/list',
-          },
-          {
-            name: 'lock',
-            title: '积分',
-            url: '/pages/user/score/index',
-          },
-          {
-            name: 'star',
-            title: '询价记录',
-            url: '/pages/user/inquiry/index',
-          },
-          {
-            name: 'hourglass',
-            title: '优惠券',
-            url: '/pages/user/coupon/index',
-          },
-        ],
-        list2: [{
-            name: 'photo',
-            title: '我的订单',
-            type: 0
-          },
-          {
-            name: 'lock',
-            title: '待付款',
-            type: 1
-          },
-          {
-            name: 'star',
-            title: '已完成',
-            type: 2
-          },
-          {
-            name: 'hourglass',
-            title: '待评价',
-            type: 3
-          },
-        ],
-        incomeList: [{
-            num: '0.00',
-            title: '总收益',
-          },
-          {
-            num: '0.00',
-            title: '本月收益',
-          },
-          {
-            num: '0.00',
-            title: '本周收益',
-          },
-          {
-            num: '0.00',
-            title: '可提现',
-          },
-        ],
-        user_info: [] // 个人信息
-      };
-    },
+import { maintainUserInfo } from '@/api/mine.js';
+export default {
+  data() {
+    return {
+      list1: [
+        {
+          name: 'photo',
+          title: '收藏',
+          url: '/pages/user/collect/list',
+        },
+        {
+          name: 'lock',
+          title: '积分',
+          url: '/pages/user/score/index',
+        },
+        {
+          name: 'star',
+          title: '询价记录',
+          url: '/pages/user/inquiry/index',
+        },
+        {
+          name: 'hourglass',
+          title: '优惠券',
+          url: '/pages/user/coupon/index',
+        },
+      ],
+      list2: [
+        {
+          name: 'photo',
+          title: '我的订单',
+          type: 0,
+        },
+        {
+          name: 'lock',
+          title: '待付款',
+          type: 1,
+        },
+        {
+          name: 'star',
+          title: '已完成',
+          type: 2,
+        },
+        {
+          name: 'hourglass',
+          title: '待评价',
+          type: 3,
+        },
+      ],
+      incomeList: [
+        {
+          num: '0.00',
+          title: '总收益',
+        },
+        {
+          num: '0.00',
+          title: '本月收益',
+        },
+        {
+          num: '0.00',
+          title: '本周收益',
+        },
+        {
+          num: '0.00',
+          title: '可提现',
+        },
+      ],
+      user_info: [], // 个人信息
+    };
+  },
 
-    mounted() {
-      this.handlerInitUserMessage()
+  mounted() {
+    this.handlerInitUserMessage();
+  },
+  methods: {
+    // 获取当前用户信息
+    handlerInitUserMessage() {
+      maintainUserInfo().then(res => {
+        this.user_info = res.data;
+      });
+    },
+    // 点击跳转到全部订单
+    gotoOrder(item) {
+      uni.navigateTo({
+        url: `/pages/tabbar/mine/allorder?type=${item.type}`,
+      });
     },
-    methods: {
-      // 获取当前用户信息
-      handlerInitUserMessage() {
-        maintainUserInfo().then(res => {
-          this.user_info = res.data
-        })
-      },
-      // 点击跳转到全部订单
-      gotoOrder(item) {
-        uni.navigateTo({
-          url: `/pages/tabbar/mine/allorder?type=${item.type}`
-        })
-      },
-      // 点击跳转到我的收益
-      handlerSkipMyProfit() {
-        uni.navigateTo({
-          url: '/pages/tabbar/mine/profit/index'
-        })
-      },
+    // 点击跳转到我的收益
+    handlerSkipMyProfit() {
+      uni.navigateTo({
+        url: '/pages/tabbar/mine/profit/index',
+      });
     },
-  };
+  },
+};
 </script>
 <style lang="scss" scoped>
-  .container {
-    padding-top: 5px;
-    min-height: 100vh;
-    background-color: #efefef;
-  }
+.container {
+  min-height: 100vh;
+  background-color: #efefef;
+}
+
+/* 顶部登录 */
+.head-wrap {
+  background-color: #347caf;
+  height: 390rpx;
+  padding-top: 40rpx;
+
+  .content {
+    display: flex;
+    padding: 38rpx 0 0 36rpx;
+    box-sizing: border-box;
 
-  /* 顶部登录 */
-  .head-wrap {
-    padding-top: 5px;
-    margin-top: 5px;
-    background-color: #347caf;
-    height: 390rpx;
+    .clickLogin {
+      font-size: 48rpx;
+      color: #ffffff;
+      margin-top: 40rpx;
+      margin-left: 20rpx;
+    }
 
-    .content {
+    .avatar-wrap {
+      display: inline-block;
+    }
+
+    .user-base {
+      margin-left: 10rpx;
+      vertical-align: middle;
       display: flex;
-      padding: 38rpx 0 0 36rpx;
-      box-sizing: border-box;
+      flex-direction: column;
+      justify-content: space-evenly;
 
-      .clickLogin {
-        font-size: 48rpx;
+      .user-nickname {
+        margin-top: 20rpx;
+        font-size: 40rpx;
         color: #ffffff;
-        margin-top: 40rpx;
-        margin-left: 20rpx;
       }
 
-      .avatar-wrap {
-        display: inline-block;
-      }
-
-      .user-base {
-        margin-left: 10rpx;
-        vertical-align: middle;
+      .btn-wrap {
+        width: 160rpx;
+        margin-top: 20rpx;
         display: flex;
-        flex-direction: column;
-        justify-content: space-evenly;
-
-        .user-nickname {
-          margin-top: 20rpx;
-          font-size: 40rpx;
-          color: #ffffff;
-        }
-
-        .btn-wrap {
-          width: 160rpx;
-          margin-top: 20rpx;
-          display: flex;
-          justify-content: space-between;
+        justify-content: space-between;
 
-          .btn-content {
-            font-size: 24rpx;
-            padding: 0 16rpx;
-            border-radius: 16rpx;
-            background-color: #ffffff;
-          }
+        .btn-content {
+          font-size: 24rpx;
+          padding: 0 16rpx;
+          border-radius: 16rpx;
+          background-color: #ffffff;
         }
       }
     }
+  }
 
-    .Collect {
-      margin-top: 10rpx;
-
-      // 宫格颜色
-      .grid-text {
-        font-size: 30rpx;
-        color: #fff;
-        margin-top: 5rpx;
-        box-sizing: border-box;
-      }
-    }
+  .Collect {
+    margin-top: 10rpx;
 
-    .order-out-box {
-      margin-top: 30rpx;
-      padding: 10rpx 16rpx;
+    // 宫格颜色
+    .grid-text {
+      font-size: 30rpx;
+      color: #fff;
+      margin-top: 5rpx;
       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;
+  .order-out-box {
+    margin-top: 30rpx;
     padding: 10rpx 16rpx;
     box-sizing: border-box;
 
-    .income-inner-box {
-      padding: 20rpx;
+    .order-inner-box {
+      font-size: 30rpx;
+      padding-bottom: 30rpx;
       background-color: $uni-bg-color;
+      border-radius: 10rpx;
+    }
+  }
+}
 
-      .income-head {
-        display: flex;
-        justify-content: space-between;
+.income-out-box {
+  margin-top: 110rpx;
+  padding: 10rpx 16rpx;
+  box-sizing: border-box;
 
-        .my-income {
-          color: $uni-color-primary;
-          font-size: 32rpx;
-          font-weight: 600;
-        }
-      }
+  .income-inner-box {
+    padding: 20rpx;
+    background-color: $uni-bg-color;
 
-      .income-content {
-        .num-box {
-          padding: 20rpx 0;
-          font-size: 36rpx;
-          font-weight: 600;
-          color: $uni-text-color;
-        }
+    .income-head {
+      display: flex;
+      justify-content: space-between;
 
-        .num-title {
-          font-size: 28rpx;
-          color: $uni-text-color-grey;
-        }
+      .my-income {
+        color: $uni-color-primary;
+        font-size: 32rpx;
+        font-weight: 600;
       }
     }
-  }
 
-  .other-out-box {
-    margin-top: 10rpx;
-    padding: 20rpx 16rpx;
-    box-sizing: border-box;
+    .income-content {
+      .num-box {
+        padding: 20rpx 0;
+        font-size: 36rpx;
+        font-weight: 600;
+        color: $uni-text-color;
+      }
 
-    .other-inner-box {
-      background-color: $uni-bg-color;
+      .num-title {
+        font-size: 28rpx;
+        color: $uni-text-color-grey;
+      }
     }
   }
+}
 
-  .appointList {
-    background-color: #fff;
-    margin: 10rpx 16rpx 0 16rpx;
+.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>