Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppGridManagement/AddFamily.vue

@@ -21,7 +21,8 @@
             </div>
             <div class="userInfo">
               <div>
-               <img src="./components/img/user-img.png" alt="" class="userImg" >
+               <img src="item.photo" alt="" class="userImg"  v-if="item.photo">
+               <img src="./components/img/user-img.png" alt="" class="userImg" v-else>
               </div>
               <div class="info">
                  <div class="name">
@@ -172,9 +173,10 @@ export default {
           padding-right: 48px;
           width: calc(100% - 100px);
           .userImg {
-          padding-right: 32px;
+          margin-right: 32px;
           width: 80px;
           height: 80px;
+          border-radius: 50%;
           }
           .info {
           width: calc(100% - 120px);

src/apps/AppGridManagement/AppGridManagement.vue

@@ -1,14 +1,17 @@
 <template>
   <div class="AppGridManagement">
-    <div class="pad-t32" v-if="component != 'Map' && isAdmin"></div>
-    <div class="select-gird" v-if="component != 'Map' && isAdmin">
-      <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
-      <div @click="linkTo('./SelectGird')">
-        {{params.girdName}}
-        <img src="./components/img/down-icon.png" alt="" class="down-icon"> 
+    <div class="header" v-if="component != 'Map' && isAdmin">
+      <div class="pad-t32"></div>
+      <div class="select-gird">
+        <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
+        <div @click="linkTo('./SelectGird')">
+          {{params.girdName}}
+          <img src="./components/img/down-icon.png" alt="" class="down-icon"> 
+        </div>
+        <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
       </div>
-      <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
     </div>
+    
     <component v-if="refresh && isAdmin" :is="component" @change="onChange" :params="params"> </component>
     <div class="tabs" v-if="isTab && isAdmin">
       <div class="item" @click="tabClick(index, item.component)" v-for="(item, index) in tabs" :key="index">
@@ -129,6 +132,13 @@ export default {
 .pad-t32{
   padding-top: 32px;
 }
+.header{
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 9;
+  width: 100%;
+}
 .select-gird{
   width: calc(100% - 60px);
   padding: 24px 32px;

src/apps/AppGridManagement/FamilyList.vue

@@ -150,6 +150,7 @@ export default {
           margin-right: 32px;
           width: 80px;
           height: 80px;
+          border-radius: 50%;
         }
           .userInfo {
             width: 100%;

src/apps/AppGridManagement/Organization.vue

@@ -65,6 +65,7 @@ export default {
 <style lang="scss" scoped>
 .Organization {
   background-color: #f5f5f5;
+  padding-top: 160px;
   .title{
     font-size: 38px;
     font-family: PingFangSC-Semibold, PingFang SC;

src/apps/AppGridManagement/Statistics.vue

@@ -113,7 +113,7 @@ uni-page-body {
   height: 100%;
 }
 .Statistics {
-  padding: 0 30px;
+  padding: 130px 30px 0;
   box-sizing: border-box;
 
   .middle {

src/sass/AppHome/AppHome.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="AppHome">
-    <div>111111</div>
+    <component v-if="refresh" :is="component" @change="onChange" :params="params"> </component>
     <div class="tabs">
       <div class="item" @click="tabClick(index, item.component)" v-for="(item, index) in tabs" :key="index">
         <img :src="tabIndex == index ? item.activeImg : item.img" alt="" />
@@ -93,6 +93,7 @@ export default {
     bottom: 0;
     left: 0;
     display: flex;
+    z-index: 999;
     .item {
       flex: 1;
       text-align: center;

src/sass/AppHome/feedback.vue

@@ -0,0 +1,95 @@
+<template>
+  <div class="feedback">
+    <div class="suggest">
+        <div class="title">请输入您的宝贵意见</div>
+        <textarea v-model="content" placeholder="请输入（500字以内）" placeholder-style="font-size: 16px;"></textarea>
+    </div>
+    <div class="space"></div>
+    <div class="photo">
+      <div class="photo-title">图片 <span>（最多9张）</span></div>
+      <div class="pad-120">
+        <AiUploader :limit="9" multiple :def.sync="picture" placeholder="上传图片"></AiUploader>
+      </div>
+    </div>
+    <div style="height: 56px;"></div>
+    <div class="btn" @click="submit">保存</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'feedback',
+
+  data() {
+    return {
+      content: '',
+      picture: []
+    }
+  },
+
+  methods: {
+    submit() {}
+  },
+  onShow() {
+    document.title = '意见反馈'
+    
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.feedback {
+  .suggest {
+    padding: 0 30px;
+    box-sizing: border-box;
+    background-color: #FFFFFF;
+
+    .title {
+      width: 100%;
+      height: 120px;
+      line-height: 120px;
+      font-size: 32px;
+      color: #333333;
+    }
+  }
+
+  .space {
+    width: 100%;
+    height: 16px;
+    background-color: #F5F5F5;
+  }
+
+  .photo {
+    background-color: #FFFFFF;
+    padding: 20px 30px;
+
+    .photo-title {
+      width: 100%;
+      height: 100px;
+      line-height: 80px;
+      color: #333333;
+
+      & > span {
+        color: #999999;
+      }
+    }
+
+    .pad-120 {
+      // padding-left: 20px;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    bottom: 0px;
+    left: 0px;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background-color: #1365DD;
+    color: #FFFFFF;
+  }
+
+}
+</style>

src/sass/AppHome/home.vue

@@ -1,6 +1,110 @@
 <template>
   <div class="home">
-    <div>1111</div>
+    <div class="header-img">
+      <img src="./components/img/home-banner-center.png" alt="">
+    </div>
+    <div class="tab-flex">
+      <div class="item" v-for="(item, index) in tabs" :key="index">
+        <img :src="item.icon" alt="">
+        <p>{{item.text}}</p>
+      </div>
+    </div>
+    <div class="app-list">
+      <div class="item" v-for="(item, index) in appList" :key="index">
+        <img :src="item.icon" alt="">
+        <p>{{item.text}}</p>
+      </div>
+    </div>
+    <div class="banner-img">
+      <img src="./components/img/home-banner-center.png" alt="">
+    </div>
+    <div class="notice">
+      <div class="left">
+        <img src="./components/img/notice.png" alt="">
+      </div>
+      <div class="right">
+        <p><span>最新</span>市委人大工作会议召开关于各县(市委人大工作会议召开关于各县</p>
+        <p><span>最新</span>市委人大工作会议召开关于各县(市委人大工作会议召开关于各县</p>
+      </div>
+    </div>
+    <div class="matter">
+      <div class="left">
+        <div>
+          <p :class="tabIndex == 1 ? 'title-matter' : 'title-matter active'" @click="tabIndex = 0">待办事件</p>
+          <p :class="tabIndex == 1 ? 'title-meet active' : 'title-meet'" @click="tabIndex = 1">待参加会议</p>
+          <span class="tips" :class="tabIndex == 1 ? 'right-tips' : 'left-tips'"></span>
+        </div>
+        <p class="text">即刻提醒,及时跟进工作进度</p>
+      </div>
+      <div class="right">
+        <img src="./components/img/matter-banner.png" alt="">
+      </div>
+    </div>
+    <div class="matter-list" v-if="tabIndex != 1">
+      <div class="item">
+        <p>
+          <span>待处理</span>
+          张家湾地铁站门口有大量建筑垃圾没有进行张家湾地铁站门口有大量建筑垃圾没有进行张家湾地铁站门口有大量建筑垃圾没有进行张家湾地铁站门口有大量建筑垃圾没有进行
+        </p>
+        <div class="flex">
+          <div class="time">
+            <img src="./components/img/time-icon.png" alt="">2022-01-10 14:00:08
+          </div>
+          <div class="type">民生服务</div>
+        </div>
+      </div>
+      <div class="item">
+        <p>
+          <span>待处理</span>
+          张家湾地铁站门口有大量建筑垃圾没有进行张家湾地铁站门口有大量建筑垃圾没有进行张家湾地铁站门口有大量建筑垃圾没有进行张家湾地铁站门口有大量建筑垃圾没有进行
+        </p>
+        <div class="flex">
+          <div class="time">
+            <img src="./components/img/time-icon.png" alt="">2022-01-10 14:00:08
+          </div>
+          <div class="type">民生服务</div>
+        </div>
+      </div>
+      <div class="item">
+        <p>
+          <span>待处理</span>
+          张家湾地铁站门口有大量建筑垃圾没有进行张家湾地铁站门口有大量建筑垃圾没有进行张家湾地铁站门口有大量建筑垃圾没有进行张家湾地铁站门口有大量建筑垃圾没有进行
+        </p>
+        <div class="flex">
+          <div class="time">
+            <img src="./components/img/time-icon.png" alt="">2022-01-10 14:00:08
+          </div>
+          <div class="type">民生服务</div>
+        </div>
+      </div>
+    </div>
+    <div class="meet-list">
+      <div class="item">
+        <div class="item-content">
+          <p class="title">区统计局数据上报会议</p>
+          <div class="time-flex">
+            <div class="time">
+              <h2>14:30</h2>
+              <p>2022年1月9日 周二</p>
+            </div>
+            <img src="./components/img/home-right-big.png" alt="">
+            <div class="time">
+              <h2>14:30</h2>
+              <p>2022年1月9日 周二</p>
+            </div>
+          </div>
+          <div class="info">
+            <span class="label">发起人员：</span>
+            <span class="value">李维民</span>
+          </div>
+          <div class="info">
+            <span class="label">会议地点：</span>
+            <span class="value">综合楼6楼 大会议室综合楼6楼 大会议室综合楼6楼 大会议室</span>
+          </div>
+          <img src="./components/img/status0.png" alt="" class="status-img">
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -9,7 +113,59 @@ export default {
   name: 'home',
   data() {
     return {
-      
+      tabs: [
+        {
+          icon: require('./components/img/mdtj.png'),
+          text: '矛盾调解'
+        },
+        {
+          icon: require('./components/img/wggl.png'),
+          text: '网格管理'
+        },
+        {
+          icon: require('./components/img/tsrq.png'),
+          text: '特殊人群'
+        },
+        {
+          icon: require('./components/img/zfww.png'),
+          text: '走访慰问'
+        }
+      ],
+      appList: [
+        {
+          icon: require('./components/img/hytz.png'),
+          text: '会议通知'
+        },
+        {
+          icon: require('./components/img/txl.png'),
+          text: '通讯录'
+        },
+        {
+          icon: require('./components/img/wjbd.png'),
+          text: '问卷表单'
+        },
+        {
+          icon: require('./components/img/swjl.png'),
+          text: '事务记录'
+        },
+        {
+          icon: require('./components/img/yfzr.png'),
+          text: '以房找人'
+        },
+        {
+          icon: require('./components/img/jmgl.png'),
+          text: '居民管理'
+        },
+        {
+          icon: require('./components/img/jkgl.png'),
+          text: '健康管理'
+        },
+        {
+          icon: require('./components/img/gd.png'),
+          text: '更多'
+        },
+      ],
+      tabIndex: 1
     }
   },
 
@@ -25,6 +181,318 @@ export default {
 
 <style lang="scss" scoped>
 .home {
-  
+  position: relative;
+  overflow: hidden;
+  background-color: #F4F7FD;
+  height: calc(100% - 98px);
+  .header-img{
+    width: 100%;
+    img{
+      width: 100%;
+      height: 324px;
+    }
+  }
+  .tab-flex{
+    width: calc(100% - 64px);
+    background: #FFF;
+    box-shadow: 0px 2px 4px 0px rgba(146, 211, 255, 0.3);
+    border-radius: 16px;
+    display: flex;
+    position: absolute;
+    top: 300px;
+    left: 30px;
+    .item{
+      flex: 1;
+      text-align: center;
+      padding-bottom: 30px;
+      img{
+        width: 88px;
+        height: 88px;
+        margin-top: 32px;
+      }
+      p{
+        margin-top: 4px;
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #333;
+        line-height: 40px;
+      }
+    }
+  }
+  .app-list{
+    width: 100%;
+    background: #FFF;
+    border-radius: 16px 16px 0px 0px;
+    padding: 194px 32px 16px;
+    box-sizing: border-box;
+    overflow: hidden;
+    .item{
+      width: 25%;
+      float: left;
+      text-align: center;
+      padding-bottom: 32px;
+      img{
+        width: 48px;
+        height: 48px;
+      }
+      p{
+        margin-top: 8px;
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #333;
+        line-height: 40px;
+      }
+    }
+  }
+  .banner-img{
+    width: 100%; 
+    padding: 0 24px 48px;
+    background-color: #fff;
+    box-sizing: border-box;
+    img{
+      width: 100%;
+      height: 168px;
+      border-radius: 16px;
+    }
+  }
+  .notice{
+    padding: 24px 58px 22px 32px;
+    box-sizing: border-box;
+    background-color: #fff;
+    display: flex;
+    margin-bottom: 12px;
+    .left{
+      width: 94px;
+      img{
+        width: 68px;
+        height: 82px;
+      }
+    }
+    .right{
+      width: calc(100% - 94px);
+      p{
+        width: 100%;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        margin-bottom: 18px;
+        span{
+          display: inline-block;
+          padding: 0 6px;
+          line-height: 36px;
+          border-radius: 4px;
+          border: 1px solid #23C3E4;
+          box-sizing: border-box;
+          font-size: 26px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #23C3E4;
+          margin-right: 16px;
+        }
+      }
+    }
+  }
+  .matter{
+    background-color: #fff;
+    padding: 20px 24px 28px 32px;
+    box-sizing: border-box;
+    display: flex;
+    border-bottom: 2px solid #f3f6f9;
+    .left{
+      width: calc(100% - 328px);
+      padding-top: 58px;
+      div{
+        display: flex;
+        justify-content: space-between;
+        position: relative;
+        height: 52px;
+        p{
+          font-size: 30px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #999;
+          line-height: 42px;
+          position: absolute;
+          top: 0;
+          z-index: 9;
+        }
+        .title-matter{
+          left: 0;
+        }
+        .title-meet{
+          right: 0;
+        }
+        .active{
+          font-size: 38px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 52px;
+        }
+        .tips{
+          display: inline-block;
+          width: 28px;
+          height: 28px;
+          background: linear-gradient(63deg, rgba(228, 244, 252, 0.62) 0%, #D6EDF8 28%, #3AB3F0 100%);
+          border-radius: 50%;
+          position: absolute;
+          top: 0;
+          z-index: 1;
+        }
+        .right-tips{
+          right: -10px;
+        }
+        .left-tips{
+          left: 128px;
+        }
+      }
+      .text{
+        font-size: 26px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #999;
+        line-height: 36px;
+        margin-top: 8px;
+      }
+    }
+    .right{
+      width: 328px;
+      img{
+        width: 286px;
+        height: 170px;
+      }
+    }
+  }
+  .matter-list{
+    .item{
+      padding: 32px 32px 48px 24px;
+      box-sizing: border-box;
+      background-color: #fff;
+      border-bottom: 1px solid #ddd;
+      p{
+        width: 100%;
+        text-overflow: -o-ellipsis-lastline;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        line-clamp: 2;
+        -webkit-box-orient: vertical;
+        font-size: 30px;
+        font-family: PingFang-SC-Medium, PingFang-SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 40px;
+        span{
+          display: inline-block;
+          padding: 0 10px;
+          font-size: 24px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #FFF;
+          line-height: 40px;
+          border-radius: 8px;
+          margin-right: 16px;
+          background-color: #F1826D;
+        }
+      }
+      .flex{
+        margin-top: 32px;
+        display: flex;
+        justify-content: space-between;
+        img{
+          width: 28px;
+          height: 28px;
+          margin-right: 4px;
+          vertical-align: text-bottom;
+        }
+        .time{
+          font-size: 24px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #666;
+          line-height: 34px;
+        }
+        .type{
+          display: inline-block;
+          padding: 0 14px;
+          font-size: 24px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #44B6F0;
+          line-height: 34px;
+          border-radius: 18px;
+          border: 1px solid #44B6F0;
+        }
+      }
+    }
+  }
+  .meet-list{
+    .item{
+      padding: 0 32px 32px 32px;
+      background-color: #fff;
+      .item-content{
+        padding: 32px 32px 22px 32px;
+        background-color: #F7F9FF;
+        position: relative;
+        .title{
+          width: 640px;
+          font-size: 32px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 44px;
+        }
+        .time-flex{
+          display: flex;
+          justify-content: space-between;
+          padding: 48px 0;
+          img{
+            width: 88px;
+            height: 88px;
+          }
+          .time{
+            width: 200px;
+            text-align: center;
+            h2{
+              font-size: 60px;
+              font-family: PingFangSC-Medium, PingFang SC;
+              font-weight: 500;
+              color: #333;
+              line-height: 84px;
+            }
+            p{
+              font-size: 22px;
+              font-family: PingFangSC-Regular, PingFang SC;
+              color: #333;
+              line-height: 32px;
+            }
+          }
+        }
+        .info{
+          font-size: 30px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #999999;
+          line-height: 42px;
+          margin-bottom: 20px;
+          .label{
+            display: inline-block;
+            width: 150px;
+            color: #999;
+            vertical-align: top;
+          }
+          .value{
+            display: inline-block;
+            width: calc(100% - 150px);
+            color: #343D65;
+          }
+        }
+        .status-img{
+          width: 112px;
+          height: 112px;
+          position: absolute;
+          top: 0;
+          right: 0;
+        }
+      }
+    }
+  }
 }
 </style>

src/sass/AppHome/my.vue

@@ -1,6 +1,74 @@
 <template>
   <div class="my">
-    
+    <!-- 个人信息 -->
+    <div class="card">
+      <div class="userInfoCard">
+        <div class="user">
+          <div>
+          <img src="./components/img/tx@2x.png" alt="" class="avtar">
+          <!-- <img src="" alt="" class="avtar"> -->
+        </div>
+        <div class="user-info">
+          <div class="user-name">李文盛</div>
+          <div class="user-job">长岗路街道办事处花园社区网格员</div>
+        </div>
+        </div>
+        <div class="myGrid">
+          <div class="my-grid">我的网格<span class="num">9</span></div>
+          <div class="all-grid">
+            <div class="gridBox">
+              <div class="grid-name"><span>长港路网格一</span></div>
+              <div class="grid-name"><span>长港路网格二</span></div>
+              <div class="grid-name"><span>长港路网格三</span></div>
+            </div>
+            <div class="arrow-right" @click="more"><u-icon name="arrow-right"></u-icon></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 选项 -->
+    <div class="option">
+      <div class="option-item">
+        <div>
+          <img src="./components/img/txsc@2x.png" alt="" class="option-img">
+        </div>
+        <div class="option-info">
+          <div class="option-text">头像上传</div>
+          <div class="option-icon" @click="upload">
+            <u-icon name="arrow-right" size="28"></u-icon>
+          </div>
+        </div>
+      </div>
+      <div class="option-item">
+        <div>
+          <img src="./components/img/yjfk@2x.png" alt="" class="option-img">
+        </div>
+        <div class="option-info">
+          <div class="option-text">意见反馈</div>
+          <div class="option-icon" @click="feedback">
+            <u-icon name="arrow-right" size="28"></u-icon>
+          </div>
+        </div>
+      </div>
+      <div class="option-item">
+        <div>
+          <img src="./components/img/lxwm@2x.png" alt="" class="option-img">
+        </div>
+        <div class="option-info">
+          <div class="option-text">联系我们</div>
+          <div class="option-icon" @click="contactUs">
+            <u-icon name="arrow-right" size="28"></u-icon>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 头像上传遮罩层 -->
+    <u-popup v-model="show" mode="bottom" border-radius="0">
+			<div class="btn-pat">拍照</div>
+			<div class="btn-album">从相册选择</div>
+      <div class="space"></div>
+      <div class="btn-cancel">取消</div>
+		</u-popup>
   </div>
 </template>
 
@@ -10,22 +78,171 @@ export default {
 
   data() {
     return {
-      
+      show: false,
     }
   },
 
   methods: {
-    
+    upload() {
+      this.show = true
+    },
+
+    feedback() {
+      uni.navigateTo({url: './feedback'})
+    },
+
+    contactUs() {}
   },
   onShow() {
     document.title = '个人中心'
-    
   },
 }
 </script>
 
 <style lang="scss" scoped>
 .my {
+  background-color: #fff;
   
+  .card {
+    position: relative;
+    height: 458px;
+    background: url(./components/img/bg.png) no-repeat;
+    background-size: 100%;
+    
+    .userInfoCard {
+      position: absolute;
+      top: 180px;
+      left: 32px;
+      width: 686px;
+      height: 320px;
+      background-color: #FFFFFF;
+      border-radius: 12px;
+      padding-left: 32px;
+      box-sizing: border-box;
+      box-shadow: 0px 2px 4px 2px rgba(0, 0, 0, 0.12);
+
+      .user {
+        display: flex;
+        justify-content: flex-start;
+        padding-top: 44px;
+        margin-bottom: 15px;
+
+        .avtar {
+          width: 90px;
+          height: 90px;
+          margin-right: 24px;
+        }
+
+        .user-name {
+          font-size: 44px;
+          color: #333333;
+          font-weight: 800;
+        }
+
+        .user-job {
+          font-size: 28px;
+          color: #999999;
+        }
+      }
+
+      .myGrid {
+        padding: 5px 15px;
+
+        .my-grid {
+          font-size: 28px;
+          font-weight: 800;
+          color: #333333;
+
+          .num {
+            font-weight: normal;
+            margin-left: 15px;
+            font-size: 26px;
+            color: #3476B9;
+          }
+        }
+        .all-grid {
+          display: flex;
+          justify-content: space-between;
+          margin-top: 16px;
+
+          .gridBox {
+            display: flex;
+            justify-content: flex-start;
+
+            .grid-name {
+            margin-right: 10px;
+            height: 46px;
+            line-height: 46px;
+            background-color: #F4F9FF;
+            color: #3476B9;
+            font-size: 24px;
+            padding: 6px 16px;
+            }
+          }
+
+          .arrow-right {
+            width: 40px;
+            padding-top: 10px;
+          }
+        }
+      }
+    }
+  }
+
+  .option {
+    margin-top: 64px;
+background-color: #fff;
+
+    .option-item {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      width: 100%;
+      height: 104px;
+      box-sizing: border-box;
+      padding: 0 30px;
+
+      .option-img {
+          width: 50px;
+       }
+
+      .option-info {
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+
+        .option-text {
+          font-size: 20px;
+        }
+
+        .option-icon {
+          padding-left: 100px;
+        }
+      }
+      
+    }
+  }
+
+  .btn-pat,
+  .btn-album,
+  .btn-cancel {
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+  }
+
+  .btn-pat {
+    border-bottom: 1px solid #DDDDDD;
+  }
+
+  .space {
+    width: 100%;
+    height: 16px;
+    background-color: #F5F5F5;
+  }
+
+
+
 }
 </style>

src/sass/AppHome/statistics.vue

@@ -1,6 +1,71 @@
 <template>
   <div class="statistics">
-    
+    <div class="tab-select">
+      <div class="item">
+        本周<img src="./components/img/down-icon-666.png" alt="">
+      </div>
+      <div class="item">
+        所有网格<img src="./components/img/down-icon-666.png" alt="">
+      </div>
+    </div>
+    <p class="time-title">2021-12-18 至 2022-1-14</p>
+    <div class="num-content">
+      <div class="item">
+        <p>新增居民群</p>
+        <h2>341</h2>
+        <img src="./components/img/down-icon-666.png" alt="">
+        <span class="right-line"></span>
+      </div>
+      <div class="item">
+        <p>新增居民群</p>
+        <h2>341</h2>
+        <img src="./components/img/down-icon-666.png" alt="">
+        <span class="right-line"></span>
+      </div>
+      <div class="item">
+        <p>新增居民群</p>
+        <h2>341</h2>
+        <img src="./components/img/down-icon-666.png" alt="">
+        <span class="right-line"></span>
+      </div>
+      <div class="item">
+        <p>新增居民群</p>
+        <h2>341</h2>
+        <img src="./components/img/down-icon-666.png" alt="">
+        <span class="right-line"></span>
+      </div>
+    </div>
+    <div class="list-content">
+      <div class="title">
+        <div class="text">网格入群数排行</div>
+        <div class="more">更多<img src="./components/img/right-icon-999.png" alt=""></div>
+      </div>
+      <div class="content">
+        <div class="item">
+          <div class="name">
+            <span>1</span>
+            <p>千岩街网格一千岩街</p>
+          </div>
+          <div class="num">6702</div>
+        </div>
+      </div>
+    </div>
+    <div class="list-content">
+      <div class="title">
+        <div class="text">网格事件处理排行</div>
+        <div class="more">更多<img src="./components/img/right-icon-999.png" alt=""></div>
+      </div>
+      <div class="content">
+        <div class="item">
+          <div class="name">
+            <span>1</span>
+            <p>千岩街网格一千岩街</p>
+          </div>
+          <div class="num">6702</div>
+        </div>
+      </div>
+    </div>
+    <img src="./components/img/user-static.png" alt="" class="back-img">
   </div>
 </template>
 
@@ -19,13 +84,167 @@ export default {
   },
   onShow() {
     document.title = '统计'
-    
   },
 }
 </script>
 
 <style lang="scss" scoped>
 .statistics {
-  
+  height: calc(100% - 98px);
+  background-color: #F6F8F8;
+  .tab-select{
+    display: flex;
+    background-color: #fff;
+    .item{
+      flex: 1;
+      text-align: center;
+      line-height: 88px;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #666;
+      img{
+        width: 32px;
+        height: 32px;
+        margin-left: 8px;
+        vertical-align: middle;
+      }
+    }
+  }
+  .time-title{
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #666;
+    line-height: 28px;
+    padding-left: 54px;
+    margin: 28px 0 38px 0;
+  }
+  .num-content{
+    width: calc(100% - 32px);
+    margin: 0 16px 32px 16px;
+    padding: 0 20px 0 4px;
+    box-sizing: border-box;
+    background-color: #fff;
+    overflow: hidden;
+    .item{
+      display: inline-block;
+      width: 50%;
+      float: left;
+      position: relative;
+      margin-top: 36px;
+      padding: 0 44px 36px 48px;
+      box-sizing: border-box;
+      border-bottom: 1px solid #F5F6F9;
+      p{
+        font-size: 26px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #71777E;
+        line-height: 36px;
+        margin-top: -18px;
+      }
+      h2{
+        font-size: 40px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 56px;
+      }
+      img{
+        width: 72px;
+        height: 72px;
+        position: absolute;
+        right: 44px;
+        top: 0;
+      }
+      .right-line{
+        position: absolute;
+        top: 0;
+        right: 0;
+        height: 72px;
+        border-right: 1px solid #F6F6F6;
+      }
+    }
+    .item:nth-of-type(2n) {
+      .right-line{
+        display: none;
+      }
+    }
+    .border-b{
+      border-bottom: 1px solid #F6F6F6;
+    }
+  }
+  .list-content{
+    width: calc(100% - 60px);
+    margin: 0 30px 32px;
+    border-radius: 16px;
+    .title{
+      display: flex;
+      justify-content: space-between;
+      background-color: #fff;
+      padding: 28px 6px 0 50px;
+      .text{
+        font-size: 28px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #000;
+        line-height: 48px;
+      }
+      .more{
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #666;
+        line-height: 40px;
+        img{
+          width: 40px;
+          height: 40px;
+          vertical-align: middle;
+        }
+      }
+    }
+    .content{
+      padding: 0 50px 32px 50px;
+      background-color: #fff;
+    }
+    .item{
+      display: flex;
+      justify-content: space-between;
+      padding: 28px 0;
+      border-bottom: 1px solid #E1E1E1;
+      .name{
+        width: calc(100% - 100px);
+        span{
+          display: inline-block;
+          padding: 0 10px;
+          height: 30px;
+          background: #3399FF;
+          font-size: 20px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #FFF;
+          line-height: 30px;
+          border-radius: 50%;
+          margin-right: 34px;
+          vertical-align: top;
+          margin-top: 6px;
+        }
+        p{
+          display: inline-block;
+          width: calc(100% - 70px);
+          word-break: break-all;
+        }
+      }
+      .num{
+        display: inline-block;
+        width: 100px;
+        text-align: right;
+      }
+    }
+  }
+  .back-img{
+    position: fixed;
+    bottom: 466px;
+    right: 0;
+    width: 132px;
+    height: 132px;
+  }
 }
 </style>