feat(coupon，collect): 优惠券和收藏页面的完成

src/components/comment/CommentList.vue

@@ -1,7 +1,11 @@
 <template>
   <view>
     <block>
-      <view class="item" v-for="item in 10">
+      <view
+        class="item"
+        v-for="item in 10"
+        @click="$Router.push('/pages/community/commDetail/index')"
+      >
         <view class="item-avatar">
           <u-avatar src="https://cdn.uviewui.com/uview/album/1.jpg" />
         </view>
@@ -13,8 +17,14 @@
           ></u--text>
           <u-album :urls="urls2"></u-album>
           <view>
-            <text class="iconfont icon-thumb-up" style="font-size: 48rpx;padding: 20rpx 0;"></text>
-            <text class="iconfont icon-heart" style="font-size: 48rpx;padding: 20rpx 0;margin-left: 20rpx;"></text>
+            <text
+              class="iconfont icon-thumb-up"
+              style="font-size: 48rpx; padding: 20rpx 0"
+            ></text>
+            <text
+              class="iconfont icon-heart"
+              style="font-size: 48rpx; padding: 20rpx 0; margin-left: 20rpx"
+            ></text>
           </view>
         </view>
       </view>
@@ -55,10 +65,11 @@ export default {
 .item {
   padding: 10rpx 0;
   display: flex;
-  .item-avatar{}
-  .item-content{
+  .item-avatar {
+  }
+  .item-content {
     margin-left: 10rpx;
-    ::v-deep .u-cell__body{
+    ::v-deep .u-cell__body {
       padding: 0;
     }
   }

src/components/tab/index.vue

@@ -1,7 +1,8 @@
 <template>
   <view>
     <view class="tabs">
-      <view class="tab" :class="{ active: currentIndex === index }" v-for="(item, index) in navList" :key="index" @tap="onClickNav(index)">
+      <view class="tab" :class="{ active: currentIndex === index }" v-for="(item, index) in navList" :key="index"
+        @tap="onClickNav(index)">
         <view class="name-item">{{ item.name }}</view>
       </view>
     </view>
@@ -38,7 +39,8 @@ export default {
   justify-content: space-around;
   font-size: 28rpx;
   color: #ffffff;
-  background-color: #00bcd4;
+  background-color: #347caf;
+
   .name-item {
     padding: 20rpx 0;
     color: #ffffff;

src/pages.json

@@ -71,12 +71,6 @@
             "navigationBarTitleText": "个人中心"
           }
         },
-        {
-          "path": "coupon/index",
-          "style": {
-            "navigationBarTitleText": "优惠券"
-          }
-        },
         {
           "path": "score/index",
           "style": {
@@ -205,12 +199,6 @@
           "style": {
             "navigationBarTitleText": "点赞回复"
           }
-        },
-        {
-          "path": "info/index",
-          "style": {
-            "navigationBarTitleText": "私聊"
-          }
         }
       ]
     },
@@ -254,6 +242,46 @@
           }
         }
       ]
+    },
+    {
+      "root": "pages/community",
+      "pages": [
+        {
+          "path": "commDetail/index",
+          "style": {
+            "navigationBarTitleText": "社区详情"
+          }
+        },
+        {
+          "path": "commSearch/index",
+          "style": {
+            "navigationBarTitleText": "搜索"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages/my",
+      "pages": [
+        {
+          "path": "collect/index",
+          "style": {
+            "navigationBarTitleText": "我的收藏"
+          }
+        },
+        {
+          "path": "coupon/index",
+          "style": {
+            "navigationBarTitleText": "优惠券"
+          }
+        },
+        {
+          "path": "inquiry/index",
+          "style": {
+            "navigationBarTitleText": "询价"
+          }
+        }
+      ]
     }
   ],
   "tabBar": {

src/pages/client/coupon/index.vue

@@ -1,42 +0,0 @@
-<template>
-  <view class="container">
-    <tab :navList="list"></tab>
-  </view>
-</template>
-
-<script>
-import tab from '@/components/tab';
-export default {
-  components: {
-    tab,
-  },
-  data() {
-    return {
-      list: [
-        {
-          id: 0,
-          name: '通用',
-        },
-        {
-          id: 1,
-          name: '满减',
-        },
-        {
-          id: 2,
-          name: '折扣',
-        },
-        {
-          id: 3,
-          name: '赠送',
-        },
-      ],
-      current: 1,
-    };
-  },
-  methods: {
-    sectionChange() {},
-  },
-};
-</script>
-
-<style lang="scss" scoped></style>

src/pages/client/settings/index.vue

@@ -3,9 +3,30 @@
     <view class="main-out-box">
       <view class="main-inner-box">
         <u-cell-group :border="false">
-          <u-cell size="large" :border="false" icon="setting-fill" title="系统设置" isLink url=""></u-cell>
-          <u-cell size="large" :border="false" icon="setting-fill" title="权限设置" isLink url=""></u-cell>
-          <u-cell size="large" :border="false" icon="setting-fill" title="切换身份" isLink url=""></u-cell>
+          <u-cell
+            size="large"
+            :border="false"
+            icon="setting-fill"
+            title="系统设置"
+            isLink
+            url=""
+          ></u-cell>
+          <u-cell
+            size="large"
+            :border="false"
+            icon="setting-fill"
+            title="权限设置"
+            isLink
+            url=""
+          ></u-cell>
+          <u-cell
+            size="large"
+            :border="false"
+            icon="setting-fill"
+            title="切换身份"
+            isLink
+            url=""
+          ></u-cell>
         </u-cell-group>
       </view>
     </view>
@@ -13,10 +34,20 @@
     <view class="policy-out-box">
       <view class="policy-inner-box">
         <u-cell-group :border="false">
-          <u-cell size="large" :border="false" icon="setting-fill" title="隐私管理" isLink url=""></u-cell>
+          <u-cell
+            size="large"
+            :border="false"
+            icon="setting-fill"
+            title="隐私管理"
+            isLink
+            url=""
+          ></u-cell>
         </u-cell-group>
       </view>
     </view>
+    <view class="exit">
+      <u-button type="primary" shape="circle" text="退出登录"></u-button>
+    </view>
   </view>
 </template>
 
@@ -34,8 +65,7 @@
     }
   }
   .policy-out-box {
-    // margin-top: 20rpx;
-    padding: 20rpx 16rpx;
+    padding: 50rpx 16rpx;
     box-sizing: border-box;
     .policy-inner-box {
       background-color: $uni-bg-color;
@@ -43,4 +73,7 @@
     }
   }
 }
+.exit {
+  padding: 200rpx 16rpx;
+}
 </style>

src/pages/community/commDetail/index.vue

@@ -0,0 +1,9 @@
+<template>
+  <div>动态详情</div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style lang="scss" scoped></style>

src/pages/community/commSearch/index.vue

@@ -0,0 +1,9 @@
+<template>
+  <div>搜索</div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style lang="scss" scoped></style>

src/pages/my/collect/index.vue

@@ -0,0 +1,147 @@
+<template>
+  <view class="collect">
+    <view class="text">以下是您收藏的店铺</view>
+
+    <!-- 收藏列表 -->
+    <view class="collect-item">
+      <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
+      <view>
+        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
+        <view class="item-flex">
+          <view class="star">
+            <u-rate :count="count" v-model="value" />
+            <text class="line">|</text>
+          </view>
+          <view>989单</view>
+        </view>
+        <view class="address-flex">
+          <view>宝安中心区美容洗车</view>
+          <view>2.7km</view>
+        </view>
+      </view>
+    </view>
+    <view class="collect-item">
+      <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
+      <view>
+        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
+        <view class="item-flex">
+          <view class="star">
+            <u-rate :count="count" v-model="value" />
+            <text class="line">|</text>
+          </view>
+          <view>989单</view>
+        </view>
+        <view class="address-flex">
+          <view>宝安中心区美容洗车</view>
+          <view>2.7km</view>
+        </view>
+      </view>
+    </view>
+    <view class="collect-item">
+      <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
+      <view>
+        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
+        <view class="item-flex">
+          <view class="star">
+            <u-rate :count="count" v-model="value" />
+            <text class="line">|</text>
+          </view>
+          <view>989单</view>
+        </view>
+        <view class="address-flex">
+          <view>宝安中心区美容洗车</view>
+          <view>2.7km</view>
+        </view>
+      </view>
+    </view>
+    <view class="collect-item">
+      <Image src="https://cdn.uviewui.com/uview/album/1.jpg"></Image>
+      <view>
+        <view class="item-text">途虎养车洗车机(贵州省贵阳市云岩区)</view>
+        <view class="item-flex">
+          <view class="star">
+            <u-rate :count="count" v-model="value" />
+            <text class="line">|</text>
+          </view>
+          <view>989单</view>
+        </view>
+        <view class="address-flex">
+          <view>宝安中心区美容洗车</view>
+          <view>2.7km</view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      count: 5,
+      value: 4,
+    };
+  },
+  onLoad() { },
+  methods: {},
+}
+</script>
+
+<style lang="scss" scoped>
+.collect {
+  height: 100vh;
+  background-color: #efefef;
+
+  .text {
+    text-align: center;
+    padding: 40rpx;
+    color: #999;
+  }
+
+  .collect-item {
+    height: 220rpx;
+    background-color: #fff;
+    padding: 0 20rpx;
+    margin-bottom: 20rpx;
+    display: flex;
+
+    Image {
+      width: 120px;
+      height: calc(100% - 20rpx);
+      margin: 10rpx 20rpx 10rpx 0;
+    }
+
+    .item-text {
+      font-weight: bold;
+      margin: 10rpx 0 10rpx;
+      color: #333;
+    }
+
+    .item-flex {
+      display: flex;
+      justify-content: space-between;
+      font-size: 14px;
+      margin: 0 20rpx 30rpx 0;
+      color: #0d0d0d66;
+
+      .star {
+        display: flex;
+
+        .line {
+          margin-left: 18rpx;
+          margin-top: 5rpx;
+          font-size: 24rpx;
+        }
+      }
+    }
+
+    .address-flex {
+      display: flex;
+      justify-content: space-between;
+      font-size: 12px;
+      color: #999;
+      margin-right: 20rpx;
+    }
+  }
+}
+</style>

src/pages/my/coupon/index.vue

@@ -0,0 +1,157 @@
+<template>
+  <view class="container">
+    <tab :navList="list" />
+
+    <!-- 优惠券的可用和失效 -->
+    <view class="use">
+      <u-tabs
+        :list="list2"
+        lineWidth="70"
+        lineColor="#347caf"
+        :scrollable="false"
+        :activeStyle="{
+          color: '#347caf',
+          fontWeight: 'bold',
+          transform: 'scale(1.05)',
+        }"
+        :inactiveStyle="{
+          color: '#b7b6b8',
+          transform: 'scale(1)',
+        }"
+        itemStyle="padding-left: 90rpx; padding-right: 80rpx; height: 120rpx;"
+      />
+    </view>
+
+    <!-- 优惠券可用 -->
+    <view class="couponUse">
+      <view class="useLeft">
+        <view>满500减100元</view>
+        <text>2320-07-02 ~ 202-08-03</text>
+      </view>
+      <view class="useRight">
+        <view class="text">2<text>折</text></view>
+        <view>折扣</view>
+        <view class="gouUse">去使用</view>
+      </view>
+    </view>
+    <!-- 优惠券失效 -->
+    <view class="couponDisUse couponUse">
+      <view class="useLeft">
+        <view>满500减100元</view>
+        <text>2320-07-02 ~ 202-08-03</text>
+      </view>
+      <view class="useRight">
+        <view class="text">2<text>折</text></view>
+        <view>折扣</view>
+        <view class="gouUse">去使用</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import tab from '@/components/tab';
+export default {
+  components: {
+    tab,
+  },
+  data() {
+    return {
+      list: [
+        {
+          id: 0,
+          name: '通用',
+        },
+        {
+          id: 1,
+          name: '满减',
+        },
+        {
+          id: 2,
+          name: '折扣',
+        },
+        {
+          id: 3,
+          name: '赠送',
+        },
+      ],
+      list2: [
+        {
+          name: '可用',
+        },
+        {
+          name: '失效',
+        },
+      ],
+      current: 1,
+    };
+  },
+  methods: {
+    sectionChange() {},
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.container {
+  height: 100vh;
+  background-color: #efefef;
+  .use {
+    padding: 0 140rpx;
+  }
+
+  /* 优惠券可用 */
+  .couponUse {
+    margin: 20rpx 30rpx;
+    height: 200rpx;
+    display: flex;
+    background-color: #fff;
+    box-sizing: border-box;
+    .useLeft {
+      width: 380rpx;
+      padding: 20rpx;
+      > view {
+        font-size: 40rpx;
+        margin: 20rpx;
+        color: #333;
+      }
+      > text {
+        font-size: 28rpx;
+        color: #5f5f5f;
+      }
+    }
+    .useRight {
+      height: 100%;
+      padding: 10rpx;
+      color: #fff;
+      text-align: center;
+      box-sizing: border-box;
+      width: calc(100% - 380rpx);
+      background-color: #347caf;
+      .text {
+        font-size: 50rpx;
+        > text {
+          margin-left: 5rpx;
+          font-size: 24rpx;
+        }
+      }
+      .gouUse {
+        width: 180rpx;
+        height: 60rpx;
+        line-height: 60rpx;
+        color: #347caf;
+        margin: 16rpx 0 0 60rpx;
+        background-color: #fff;
+      }
+    }
+  }
+  .couponDisUse {
+    .useRight {
+      background-color: #cecece;
+      .gouUse {
+        color: #cecece;
+      }
+    }
+  }
+}
+</style>

src/pages/my/inquiry/index.vue

@@ -0,0 +1,13 @@
+<template>
+  <view>
+    询价
+  </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped></style>

src/pages/tabbar/community/index.vue

@@ -1,14 +1,36 @@
 <template>
   <view>
+    <!-- 关注和推荐 -->
     <u-navbar leftIcon="search" leftIconSize="32">
       <view slot="center">
         <u-tabs :list="list" lineWidth="32" />
       </view>
     </u-navbar>
+    <!-- 消息列表 -->
     <view class="content" :style="{ marginTop: totalHeight + 'px' }">
-      <swiper class="swiper" style="height: 100vh" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
+      <!-- 搜索 -->
+      <view
+        class="search-item"
+        @click="$Router.push('/pages/community/commSearch/index')"
+      >
+        <u-search :showAction="true" actionText="取消" />
+      </view>
+      <swiper
+        class="swiper"
+        style="height: 100vh"
+        :indicator-dots="indicatorDots"
+        :autoplay="autoplay"
+        :interval="interval"
+        :duration="duration"
+      >
         <swiper-item>
-          <scroll-view scroll-y="true" class="scroll-y" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll">
+          <scroll-view
+            scroll-y="true"
+            class="scroll-y"
+            @scrolltoupper="upper"
+            @scrolltolower="lower"
+            @scroll="scroll"
+          >
             <view style="padding: 10rpx 20rpx; background-color: #ffffff">
               <comment-list></comment-list>
             </view>
@@ -28,8 +50,8 @@
 <script>
 import CommentList from '@/components/comment/CommentList.vue';
 export default {
-  components:{
-    CommentList
+  components: {
+    CommentList,
   },
   data() {
     return {
@@ -42,7 +64,6 @@ export default {
       old: {
         scrollTop: 0,
       },
-
     };
   },
   computed: {
@@ -80,4 +101,11 @@ export default {
   height: 100vh;
 }
 
+.search-item {
+  padding: 0 20rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  background-color: #ffffff;
+  margin-bottom: 10rpx;
+}
 </style>

src/pages/tabbar/home/index.vue

@@ -59,7 +59,12 @@
     </view>
     <!-- 热门推荐 -->
     <view class="hot">
-      <u-cell :border="false" value="查看更多" isLink>
+      <u-cell
+        :border="false"
+        value="查看更多"
+        isLink
+        @click="$Router.push('/pages/business/hot/index')"
+      >
         <view slot="title" class="hot-title"> 热门推荐 </view>
       </u-cell>
       <block v-if="homeData.recommendMerchants.length > 0">
@@ -86,7 +91,12 @@
     </view>
     <!-- 附近商家 -->
     <view class="near">
-      <u-cell :border="false" value="查看更多" isLink>
+      <u-cell
+        :border="false"
+        value="查看更多"
+        isLink
+        @click="$Router.push('/pages/business/nearby/index')"
+      >
         <view slot="title" class="near-title"> 附近商家 </view>
       </u-cell>
       <block v-if="homeData.nearbyMerchants.length > 0">

src/pages/tabbar/message/index.vue

@@ -3,18 +3,12 @@
     <u-navbar>
       <view slot="left"></view>
       <view slot="center">
-        <u-tabs :list="list" lineWidth="60" :current="current" @change="changeInfo"/>
+        <u-tabs :list="list" lineWidth="60" :current="current" @change="changeInfo" />
       </view>
     </u-navbar>
     <view :style="{ marginTop: totalHeight + 'px' }">
       <!-- 系统通知 -->
-      <view
-      v-if="current == 0"
-        class="orderList"
-        v-for="item in orderList"
-        :key="item.id"
-        @tap="$Router.push(item.url)"
-      >
+      <view v-if="current == 0" class="orderList" v-for="item in orderList" :key="item.id" @tap="$Router.push(item.url)">
         <image :src="item.img" style="width: 40px; height: 40px" />
         <view class="orderItem">
           <view class="order1">{{ item.name }}</view>
@@ -22,12 +16,10 @@
         </view>
         <u-icon name="arrow-right"></u-icon>
       </view>
+
       <!-- 消息通知 -->
       <view class="message" v-if="current == 1" @tap="$Router.push(infoUrl)">
-        <image
-          src="/static/images/home-select.png"
-          style="width: 40px; height: 40px"
-        />
+        <image src="/static/images/home-select.png" style="width: 40px; height: 40px" />
         <view class="business">
           <view class="businessItem">商家</view>
           <view class="messages">您好，请问有什么需要帮助的吗？</view>
@@ -54,7 +46,7 @@ export default {
           },
         },
       ],
-      current:0,
+      current: 0,
       orderList: [
         {
           id: '1',
@@ -95,7 +87,7 @@ export default {
       type: 'warning',
       value: 99999,
       flag: true,
-      infoUrl:'/pages/message/info/index'
+      infoUrl: '/pages/message/info/index'
     };
   },
   computed: {
@@ -107,7 +99,7 @@ export default {
     change(e) {
       console.log('-----------', e);
     },
-    changeInfo(index){
+    changeInfo(index) {
       this.current = index.index;
     }
   },
@@ -119,6 +111,7 @@ export default {
   min-height: 100vh;
   background-color: #fff;
 }
+
 .orderList {
   display: flex;
   padding: 30rpx;
@@ -127,19 +120,23 @@ export default {
   image {
     margin-right: 10rpx;
   }
+
   .orderItem {
     flex: 1;
+
     .order1 {
       font-size: 16px;
       margin-bottom: 10rpx;
       color: #232323;
     }
+
     .order2 {
       font-size: 12px;
       color: #9ca3af;
     }
   }
 }
+
 .message {
   display: flex;
   padding: 30rpx;
@@ -148,18 +145,22 @@ export default {
   image {
     margin-right: 10rpx;
   }
+
   .business {
     flex: 1;
+
     .businessItem {
       font-size: 16px;
       margin-bottom: 10rpx;
       color: #232323;
     }
+
     .messages {
       font-size: 12px;
       color: #9ca3af;
     }
   }
+
   .time {
     .timeItem {
       color: #9ca3af;

src/pages/tabbar/mine/index.vue

@@ -5,27 +5,39 @@
         <view class="avatar-wrap" @tap="$Router.push('/pages/client/personalCenter/index')">
           <u-avatar :src="user_info.avatar" size="80"></u-avatar>
         </view>
-        <view class="user-base">
-          <view class="user-nickname" @tap="$Router.push('/pages/login/index')">{{ user_info.nickname }}</view>
-          <view class="btn-wrap">
-            <view class="btn-content" @tap="$Router.push('/pages/client/settings/index')">设置</view>
-            <view class="btn-content">认证</view>
+        <view>
+          <!-- 已登录 -->
+          <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/client/settings/index')">设置</view>
+              <view class="btn-content">认证</view>
+            </view>
+          </view>
+
+          <!-- 未登录 -->
+          <view class="clickLogin" v-else @tap="$Router.push('/pages/login/index')">
+            点击登录
           </view>
         </view>
       </view>
-      <view>
+
+      <!-- 收藏 -->
+      <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="22"></u-icon>
+            <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">
         <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">
-              <u-icon :customStyle="{ paddingTop: 20 + 'rpx' }" :name="listItem.name" :size="22"></u-icon>
+              <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>
@@ -33,14 +45,15 @@
       </view>
     </view>
 
+    <!-- 我的收益 -->
     <view class="income-out-box">
       <view class="income-inner-box">
         <view class="income-head">
           <text class="my-income">我的收益</text>
-          <u-icon name="arrow-right"></u-icon>
+          <u-icon name="arrow-right" />
         </view>
         <view class="income-content">
-          <u-grid :border="false" col="4">
+          <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>
@@ -50,6 +63,11 @@
       </view>
     </view>
 
+    <!-- 预约列表 -->
+    <view class="appointList">
+      <u-cell icon="setting-fill" title="预约列表" isLink url="/pages/componentsB/tag/tag" />
+    </view>
+
     <view class="other-out-box">
       <view class="other-inner-box">
         <u-cell-group :border="false">
@@ -72,11 +90,12 @@ export default {
         {
           name: 'photo',
           title: '收藏',
+          url: '/pages/my/collect/index',
         },
         {
           name: 'lock',
           title: '积分',
-          url: '/pages/client/score/index'
+          url: '/pages/client/score/index',
         },
         {
           name: 'star',
@@ -85,7 +104,7 @@ export default {
         {
           name: 'hourglass',
           title: '优惠券',
-          url: '/pages/client/coupon/index',
+          url: '/pages/my/coupon/index',
         },
       ],
       list2: [
@@ -126,9 +145,9 @@ export default {
       ],
     };
   },
-  computed:{
-    ...mapGetters(['user_info'])
-  }
+  computed: {
+    ...mapGetters(['user_info']),
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -136,15 +155,22 @@ export default {
   min-height: 100vh;
   background-color: #efefef;
 }
+
+/* 顶部登录 */
 .head-wrap {
-  background-color: $uni-color-primary;
-  height: 416rpx;
+  background-color: #347caf;
+  height: 390rpx;
 
   .content {
     display: flex;
     padding: 38rpx 0 0 36rpx;
     box-sizing: border-box;
 
+    .clickLogin {
+      font-size: 48rpx;
+      color: #ffffff;
+    }
+
     .avatar-wrap {
       display: inline-block;
     }
@@ -157,12 +183,14 @@ export default {
       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;
 
@@ -175,35 +203,53 @@ export default {
       }
     }
   }
+
+  .Collect {
+    margin-top: 10rpx;
+
+    // 宫格颜色
+    .grid-text {
+      font-size: 30rpx;
+      color: #fff;
+      margin-top: 5rpx;
+      box-sizing: border-box;
+    }
+  }
+
   .order-out-box {
-    margin-top: 20rpx;
-    padding: 0 16rpx;
+    margin-top: 30rpx;
+    padding: 10rpx 16rpx;
     box-sizing: border-box;
+
     .order-inner-box {
-      padding-bottom: 20rpx;
+      font-size: 30rpx;
+      padding-bottom: 30rpx;
       background-color: $uni-bg-color;
-      border-radius: 20rpx;
+      border-radius: 10rpx;
     }
   }
 }
 
 .income-out-box {
-  margin-top: 60rpx;
-  padding: 0 16rpx;
+  margin-top: 110rpx;
+  padding: 10rpx 16rpx;
   box-sizing: border-box;
+
   .income-inner-box {
     padding: 20rpx;
     background-color: $uni-bg-color;
-    border-radius: 20rpx;
+
     .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;
@@ -211,6 +257,7 @@ export default {
         font-weight: 600;
         color: $uni-text-color;
       }
+
       .num-title {
         font-size: 28rpx;
         color: $uni-text-color-grey;
@@ -220,12 +267,17 @@ export default {
 }
 
 .other-out-box {
-  margin-top: 60rpx;
-  padding: 0 16rpx;
+  margin-top: 10rpx;
+  padding: 20rpx 16rpx;
   box-sizing: border-box;
+
   .other-inner-box {
     background-color: $uni-bg-color;
-    border-radius: 20rpx;
   }
 }
+
+.appointList {
+  background-color: #fff;
+  margin: 10rpx 16rpx 0 16rpx;
+}
 </style>