diff --git a/src/apps/AppPageHome.vue/AppPageHome.vue b/src/apps/AppPageHome.vue/AppPageHome.vue
index 764f48fc..a4904f24 100644
--- a/src/apps/AppPageHome.vue/AppPageHome.vue
+++ b/src/apps/AppPageHome.vue/AppPageHome.vue
@@ -14,7 +14,6 @@
     </div>  
   </section>
 </template>
-
 <script>
 
 export default {
@@ -28,7 +27,7 @@ export default {
   },
   onLoad(options) {
     this.id = options.id
-    // this.id = '7a4701d5641543cca4419488db368d3e'
+    this.id = '7a4701d5641543cca4419488db368d3e'
     this.getAppInfo()
   },
   methods: {
diff --git a/src/project/huizhili/AppHome/AppHome.vue b/src/project/huizhili/AppHome/AppHome.vue
new file mode 100644
index 00000000..faf97c6a
--- /dev/null
+++ b/src/project/huizhili/AppHome/AppHome.vue
@@ -0,0 +1,96 @@
+<template>
+  <div class="AppHome">
+    <component :is="tabList[tabIndex].component"/>
+    <div class="tab-list">
+      <div class="tab-item" v-for="(item, index) in tabList" :key="index" @click="tabClick(index)">
+        <img :src="tabIndex == index ? item.activeImg : item.img " alt="">
+        <p :style="tabIndex == index ? 'color: #267EF0;' : ''">{{ item.text }}</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Home from './components/Home'
+import Grid from './components/Grid'
+import App from './components/App'
+import My from './components/My'
+export default {
+  name: "AppHome",
+  appName: "首页",
+  data() {
+    return {
+      tabList: [
+        {
+          text: '首页',
+          img: require('./img/tab/home-icon.png'),
+          activeImg: require('./img/tab/home-icon-active.png'),
+          component: Home
+        },
+        {
+          text: '网格',
+          img: require('./img/tab/grid-icon.png'),
+          activeImg: require('./img/tab/grid-icon-active.png'),
+          component: Grid
+        },
+        {
+          text: '应用',
+          img: require('./img/tab/app-icon.png'),
+          activeImg: require('./img/tab/app-icon-active.png'),
+          component: App
+        },
+        {
+          text: '我的',
+          img: require('./img/tab/my-icon.png'),
+          activeImg: require('./img/tab/my-icon-active.png'),
+          component: My
+        }
+      ],
+      tabIndex: 0,
+    }
+  },
+  components: {Home, Grid, App, My},
+  methods: {
+    tabClick(index) {
+      this.tabIndex = index
+    },
+  },
+  onShow() {
+    document.title = "慧政务"
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppHome {
+  width: 100%;
+  height: 100%;
+  background-color: #F5F6F7;
+  padding-bottom: 112px;
+  .tab-list {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    display: flex;
+    padding: 16px 36px 8px;
+    box-sizing: border-box;
+    background-color: #fff;
+    z-index: 9999999;
+    .tab-item {
+      flex: 1;
+      text-align: center;
+      img {
+        width: 56px;
+        height: 56px;
+      }
+      p {
+        font-size: 20px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #000;
+        line-height: 28px;
+      }
+    } 
+  }
+}
+</style>
diff --git a/src/project/huizhili/AppHome/FeedBack.vue b/src/project/huizhili/AppHome/FeedBack.vue
new file mode 100644
index 00000000..369d9b55
--- /dev/null
+++ b/src/project/huizhili/AppHome/FeedBack.vue
@@ -0,0 +1,149 @@
+<template>
+  <div class="feedback">
+    <div class="suggest">
+      <div flex class="title"><em v-text="'*'"/>请输入您的宝贵意见</div>
+      <AiTextarea v-model="content" placeholder="请输入（200字以内）" :maxlength="200"/>
+    </div>
+    <div class="name">
+      <div flex><em v-text="'*'"/>联系人</div>
+      <input type="text" placeholder="请输入您的姓名" style="text-align: right;" v-model="name" class="inp">
+    </div>
+    <div class="phone">
+      <div flex><em v-text="'*'"/>联系方式</div>
+      <input type="number" placeholder="请输入您的联系方式" style="text-align: right;" v-model="phone" class="inp" maxlength="11">
+    </div>
+    <div class="photo">
+      <div class="photo-title">图片 <span>（最多9张）</span></div>
+      <div class="pad-120">
+        <AiUploader :limit="9" multiple :def.sync="picture" placeholder="上传图片" action="/admin/file/add2"/>
+      </div>
+    </div>
+    <div style="height: 56px;"></div>
+    <div class="btn" @click="submit">保存</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'feedback',
+
+  data() {
+    return {
+      content: '',
+      picture: [],
+      name: '',
+      phone: ''
+    }
+  },
+
+  methods: {
+    submit() {
+      let {phone, content, picture, name} = this
+      if (!content) {
+        return this.$u.toast("请输入您的宝贵意见")
+      }
+      if (!name) {
+        return this.$u.toast("请输入您的姓名")
+      }
+      if (!phone) {
+        return this.$u.toast("请输入联系方式")
+      }
+      if (!/^\d{11}$/g.test(phone)) {
+        return this.$u.toast("联系方式格式有误!")
+      }
+      this.$http.post("/oms/api/appfeedback/addOrUpdate", {
+        phone,
+        opinion: content,
+        pictureUrl: picture?.map(e=>e.url).toString(),
+        contacts: name,
+        sourceHost: location.host
+      }, {
+        withoutToken: true
+      }).then(res => {
+        if (res?.code == 0) {
+          this.$u.toast("保存成功!")
+          setTimeout(() => {
+            uni.navigateBack({})
+          }, 1500)
+        }
+      })
+    }
+  },
+  onShow() {
+    document.title = '意见反馈'
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.feedback {
+  padding-bottom: 100px;
+
+  em {
+    display: block;
+    color: red;
+    font-style: normal;
+    height: initial;
+  }
+
+  .suggest {
+    padding: 15px 30px;
+    box-sizing: border-box;
+    background-color: #FFFFFF;
+    margin-bottom: 8px;
+
+    .title {
+      width: 100%;
+      height: 100px;
+      line-height: 100px;
+      font-size: 32px;
+      color: #333333;
+    }
+  }
+
+  .name,
+  .phone {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background-color: #FFFFFF;
+    margin-bottom: 8px;
+    padding: 0 30px;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    font-size: 32px;
+    box-sizing: border-box;
+  }
+
+  .photo {
+    background-color: #FFFFFF;
+    padding: 20px 30px;
+
+    .photo-title {
+      width: 100%;
+      height: 100px;
+      line-height: 80px;
+      color: #333333;
+
+      & > span {
+        color: #999999;
+      }
+    }
+
+  }
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background-color: #1365DD;
+    color: #FFFFFF;
+  }
+
+}
+</style>
diff --git a/src/project/huizhili/AppHome/GridMemberPoints.vue b/src/project/huizhili/AppHome/GridMemberPoints.vue
new file mode 100644
index 00000000..02527490
--- /dev/null
+++ b/src/project/huizhili/AppHome/GridMemberPoints.vue
@@ -0,0 +1,19 @@
+<template>
+  <div class="gridMemberPoints">
+    <img src="./img/my/grid-point.png" alt="" class="right-icon">
+  </div>
+</template>
+
+<script>
+export default {
+  name: "gridMemberPoints",
+}
+</script>
+
+<style lang="scss" scoped>
+.gridMemberPoints {
+  img {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/project/huizhili/AppHome/HelpDocs.vue b/src/project/huizhili/AppHome/HelpDocs.vue
new file mode 100644
index 00000000..6d881ea9
--- /dev/null
+++ b/src/project/huizhili/AppHome/HelpDocs.vue
@@ -0,0 +1,88 @@
+<template>
+  <div class="HelpDocs">
+    <div class="bg-fff title">
+      <p>系统初始化</p>
+      <p>一、进入应用-网格管理模块添加网格信息。</p>
+      <p>二、进入应用-网格管理模块添加网格员相关信息。</p>
+      <p>三、进入首页-居民档案，添加居民档案。</p>
+      <p>四、进入应用-网格管理-选中网格员添加责任家庭。</p>
+    </div>
+    <div class="bg-fff">
+      <div class="flex">
+        <span>如有相关问题，请联系客服</span>
+        <div @click="callPhone('18186229224')">18186229224<img src="./img/my/phone-icon.png" /></div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "HelpDocs",
+  data() {
+    return {
+    }
+  },
+  methods: {
+    copy() {
+      uni.setClipboardData({
+        data: 'https://saasweb.icunwei.com/login', // e是你要保存的内容
+        success: () => {
+          uni.showToast({
+            title:'复制成功',
+            icon:'none'
+          })
+        }
+      })
+    },
+    callPhone(phoneNumber) {
+      uni.makePhoneCall({phoneNumber})
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.HelpDocs {
+  width: 100%;
+  height: 100%;
+  background-color: #F5F6F7;
+  .bg-fff {
+    background-color: #fff;
+  }
+  .title {
+    padding: 30px;
+    margin-bottom: 20px;
+    p {
+      width: 100%;
+      font-size: 28px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      line-height: 40px;
+    }
+  }
+  .flex {
+    display: flex;
+    // justify-content: space-between;
+    padding: 0 30px;
+    line-height: 100px;
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #030303;
+    div {
+      color: #3975C6;
+      margin-left: 32px;
+    }
+    .copy {
+      margin-left: 24px;
+    }
+    img {
+      width: 48px;
+      height: 48px;
+      margin-left: 16px;
+      vertical-align: middle;
+    }
+  }
+}
+</style>
diff --git a/src/project/huizhili/AppHome/UploadPhoto.vue b/src/project/huizhili/AppHome/UploadPhoto.vue
new file mode 100644
index 00000000..aa06459f
--- /dev/null
+++ b/src/project/huizhili/AppHome/UploadPhoto.vue
@@ -0,0 +1,73 @@
+<template>
+  <div class="uploadPhoto">
+    <div class="photo">
+      <div class="photo-title">图片 <span>（最多1张）</span></div>
+      <div class="pad-120">
+        <AiUploader :limit="1" multiple placeholder="上传图片" :def.sync="picture" action="/admin/file/add-portrait"/>
+      </div>
+    </div>
+    <div style="height: 56px;"></div>
+    <div class="btn" @click="back">返回</div>
+  </div>
+</template>
+
+<script>
+import {mapActions} from "vuex";
+
+export default {
+  name: 'uploadPhoto',
+  data() {
+    return {
+      picture: []
+    }
+  },
+  methods: {
+    ...mapActions(['getAccount']),
+    back() {
+      uni.navigateBack({
+        success: () => {
+          this.getAccount()
+        }
+      })
+    }
+  },
+  onShow() {
+    document.title = '头像上传'
+  },
+
+}
+</script>
+
+<style lang="scss" scoped>
+.uploadPhoto {
+
+  .photo {
+    background-color: #FFFFFF;
+    padding: 20px 30px;
+
+    .photo-title {
+      width: 100%;
+      height: 100px;
+      line-height: 80px;
+      color: #333333;
+
+      & > span {
+        color: #999999;
+      }
+    }
+
+  }
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background-color: #1365DD;
+    color: #FFFFFF;
+  }
+}
+</style>
diff --git a/src/project/huizhili/AppHome/components/App.vue b/src/project/huizhili/AppHome/components/App.vue
new file mode 100644
index 00000000..6f837990
--- /dev/null
+++ b/src/project/huizhili/AppHome/components/App.vue
@@ -0,0 +1,137 @@
+<template>
+  <div class="App">
+    <div class="content">
+      <div class="app-list">
+        <div class="title">网格管理</div>
+        <div class="item" v-for="(item, index) in gridAppList" :key="index" @click="linkTo(item.linkUrl)">
+          <img :src="item.img" alt="">
+          <p>{{ item.title }}</p>
+        </div>
+      </div>
+      <div class="app-list">
+        <div class="title">日常办公</div>
+        <div class="item" v-for="(item, index) in officeAppList" :key="index" @click="linkTo(item.linkUrl)">
+          <img :src="item.img" alt="">
+          <p>{{ item.title }}</p>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "App",
+  data() {
+    return {
+      gridAppList: [
+        {
+          img: require('../img/app/app-jmda-icon.png'),
+          title: '居民档案',
+          linkUrl: '/apps/AppResidentDocument/AppResidentDocument'
+        },
+        {
+          img: require('../img/app/app-wggl-icon.png'),
+          title: '网格管理',
+          linkUrl: '/apps/AppGridManagement/AppGridManagement'
+        },
+        {
+          img: require('../img/app/app-tsrq-icon.png'),
+          title: '特殊人群',
+          linkUrl: '/apps/AppSpecialGroups/AppSpecialGroups'
+        },
+        {
+          img: require('../img/app/app-rfdt-icon.png'),
+          title: '人房地图',
+          linkUrl: '/apps/AppBuilding/AppBuilding'
+        }
+      ],
+      officeAppList: [
+        {
+          img: require('../img/app/app-mdtj-icon.png'),
+          title: '矛盾调解',
+          linkUrl: '/apps/AppConflictMediation/AppConflictMediation'
+        },
+        {
+          img: require('../img/app/app-zfww-icon.png'),
+          title: '走访慰问',
+          linkUrl: '/apps/AppWalkask/AppWalkask'
+        },
+        {
+          img: require('../img/app/app-swjl-icon.png'),
+          title: '事务记录',
+          linkUrl: '/apps/AppInterview/AppInterview'
+        },
+        {
+          img: require('../img/home/home-xtxf-icon.png'),
+          title: '协同宣发',
+          linkUrl: '/apps/AppCooperationPropaganda/AppCooperationPropaganda'
+        },
+        {
+          img: require('../img/app/app-xftj-icon.png'),
+          title: '宣发统计',
+          linkUrl: '/apps/AppPropagandaStatistics/AppPropagandaStatistics'
+        },
+        {
+          img: require('../img/app/app-tzgg-icon.png'),
+          title: '通知公告',
+          linkUrl: '/apps/AppNotification/AppNotification'
+        },
+        {
+          img: require('../img/app/app-wgyjf-icon.png'),
+          title: '网格员积分',
+          linkUrl: './GridMemberPoints'
+        },
+      ]
+    }
+  },
+  methods: {
+    linkTo(url) {
+      uni.navigateTo({ url })
+    }
+  },
+  created() {
+    
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.App {
+  .content {
+    padding: 32px 32px 0;
+    .app-list {
+      width: 100%;
+      background: #FFF;
+      box-shadow: 0 0 8px 0 rgba(0,0,0,0.0200);
+      border-radius: 8px;
+      margin-bottom: 32px;
+      .title {
+        font-size: 32px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 44px;
+        padding: 24px 0 8px 32px;
+      }
+      .item {
+        display: inline-block;
+        width: 25%;
+        text-align: center;
+        padding: 24px 0;
+        img {
+          width: 72px;
+          height: 72px;
+          margin-bottom: 8px;
+        }
+        p {
+          font-size: 26px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #333;
+          line-height: 36px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/huizhili/AppHome/components/Grid.vue b/src/project/huizhili/AppHome/components/Grid.vue
new file mode 100644
index 00000000..1051d47c
--- /dev/null
+++ b/src/project/huizhili/AppHome/components/Grid.vue
@@ -0,0 +1,105 @@
+<template>
+  <div class="Grid">
+    <div class="banner-img">
+      <img src="../img/grid/grid-banner.png" alt="">
+    </div>
+    <div class="content">
+      <div class="item" v-for="(item, index) in appList" :key="index" @click="linkTo(item.linkUrl)">
+        <div class="title">{{ item.title }}</div>
+        <div class="text">{{ item.text }}</div>
+        <img :src="item.img" alt="">
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Grid",
+  data() {
+    return {
+      appList: [
+        {
+          img: require('../img/grid/grid-jmda.png'),
+          title: '居民档案',
+          text: '辖区居民信息全览',
+          linkUrl: '/apps/AppResidentDocument/AppResidentDocument'
+        },
+        {
+          img: require('../img/grid/grid-tsrq.png'),
+          title: '特殊人群',
+          text: '特殊居民标签化管理',
+          linkUrl: '/apps/AppSpecialGroups/AppSpecialGroups'
+        },
+        {
+          img: require('../img/grid/grid-wggl.png'),
+          title: '网格管理',
+          text: '基层网格化精细治理',
+          linkUrl: '/apps/AppGridManagement/AppGridManagement'
+        },
+        {
+          img: require('../img/grid/grid-rfdt.png'),
+          title: '人房地图',
+          text: '图属结合更直观',
+          linkUrl: '/apps/AppBuilding/AppBuilding'
+        }
+      ]
+    }
+  },
+  methods: {
+    linkTo(url) {
+      uni.navigateTo({ url })
+    }
+  },
+  created() {
+    
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.Grid {
+  .banner-img {
+    padding: 32px 32px 16px;
+    img {
+      width: 100%;
+      // height: 240px;
+    }
+  }
+  .content {
+    padding-left: 32px;
+    .item {
+      display: inline-block;
+      width: calc(50% - 32px);
+      margin: 0 32px 32px 0;
+      padding: 40px 0 0 40px;
+      position: relative;
+      height: 384px;
+      background-color: #fff;
+      box-sizing: border-box;
+      border-radius: 8px;
+      .title {
+        font-size: 36px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 50px;
+      }
+      .text {
+        font-size: 26px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #ABB5C4;
+        line-height: 36px;
+      }
+      img {
+        width: 208px;
+        height: 208px;
+        position: absolute;
+        bottom: 0;
+        right: 0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/huizhili/AppHome/components/Home.vue b/src/project/huizhili/AppHome/components/Home.vue
new file mode 100644
index 00000000..ca236d50
--- /dev/null
+++ b/src/project/huizhili/AppHome/components/Home.vue
@@ -0,0 +1,343 @@
+<template>
+  <div class="Home">
+    <div @click="linkTo('./HelpDocs')">
+      <u-notice-bar mode="horizontal" :list="list"></u-notice-bar>
+    </div>
+    <!-- <div class="tips">
+      <img src="../img/home/tips-icon.png" alt="">慧政务改版上线了，点此查看帮助文档！
+    </div> -->
+    <div class="content">
+      <div class="user-info">
+        <div class="left">
+          <img :src="user.avatar" alt="" v-if="user.avatar">
+          <img src="../img/user-icon.png" alt="" v-else>
+        </div>
+        <div class="right">
+          <p class="name">你好，<AiOpenData v-if="user.wxUserId" type="userName" :openid="user.wxUserId"></AiOpenData></p>
+          <p class="time">您已加入慧政务 <span>{{ girdInfo['加入天数'] }}</span>天</p>
+        </div>
+      </div>
+      <div class="app-list">
+        <div class="item" v-for="(item, index) in appList" :key="index" @click="linkTo(item.linkUrl)">
+          <img :src="item.img" alt="">
+          <p>{{ item.title }}</p>
+        </div>
+      </div>
+      <div class="title">数据统计</div>
+      <div class="tab-content">
+        <div class="item" v-for="(item, index) in tabStatistics" :key="index">
+          <p><span></span>{{ item.label }}</p>
+          <div>{{ item.value || 0}}</div>
+        </div>
+      </div>
+      <div class="title">消息发送情况</div>
+      <div class="chart-content" id="statistic"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import echarts from 'echarts'
+export default {
+  name: "Home",
+  data() {
+    return {
+      appList: [
+        {
+          img: require('../img/home/home-jmgl-icon.png'),
+          title: '居民档案',
+          linkUrl: '/apps/AppResidentDocument/AppResidentDocument'
+        },
+        {
+          img: require('../img/home/home-zfww-icon.png'),
+          title: '走访慰问',
+          linkUrl: '/apps/AppWalkask/AppWalkask'
+        },
+        {
+          img: require('../img/home/home-mdtj-icon.png'),
+          title: '矛盾调解',
+          linkUrl: '/apps/AppConflictMediation/AppConflictMediation'
+        },
+        {
+          img: require('../img/home/home-xtxf-icon.png'),
+          title: '协同宣发',
+          linkUrl: '/apps/AppCooperationPropaganda/AppCooperationPropaganda'
+        }
+      ],
+      tabStatistics: [],
+      echartData: null,
+      list: ['慧政务改版上线了，点此查看帮助文档！'],
+      girdInfo: {}
+    }
+  },
+  computed: { ...mapState(['user']) },
+  methods: {
+    chartInit() {
+      this.echartData = echarts.init(document.getElementById('statistic'))
+      var option = {
+        grid: {
+          left: '5%',
+          right: '5%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          axisLine: {
+            lineStyle: {
+              color: '#E1E5EF', //x轴的颜色
+              width: 1, //轴线的宽度
+            },
+          },
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#666',
+            },
+          },
+          data: ['4月', '5月', '6月', '7月', '8月',]
+        },
+        yAxis: {
+          axisLine:{       //y轴
+            show: false
+          },
+          axisTick: {
+            show: false
+          },
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#666',
+            },
+          },
+          type: 'value',
+          minInterval: 50,
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        series: [
+          {
+            data: [155, 130, 120, 160, 120, 130, 110],
+            type: 'line',
+            areaStyle: {//覆盖区域的渐变色
+            	normal: {
+            		color: {
+                  type: 'linear',x: 0,y: 0,x2: 0,y2: 1,
+                  colorStops: [
+                    {
+                      offset: 0, color: 'rgba(58,132,255, 0.8)' // 0% 处的颜色
+                    },
+                    {
+                      offset: 1, color: 'rgba(58,132,255, 0)' // 100% 处的颜色
+                    }
+                  ],
+                  global: false // 缺省为 false
+		       		  },
+            	}
+            },
+            lineStyle: {
+              normal: {
+                color: '#2891FF'
+              }
+            },
+            itemStyle : {
+              normal : {
+                color:'#2891FF',
+              }
+            }
+          }
+        ]
+      };
+      this.echartData.setOption(option)
+    },
+    linkTo(url) {
+      console.log(url)
+      uni.navigateTo({ url })
+    },
+    getGirdInfo() {
+      this.$http.post(`/app/appgirdmemberinfo/girdMemberOrNotStatistic`).then(res => {
+        if (res.code == 0) {
+          this.girdInfo = res.data
+          for(var i in res.data) {
+            if(i != '加入天数' && i != '网格员类型') {
+              this.tabStatistics.push({label: i, value: res.data[i]})
+            }
+          }
+        }
+      })
+    }
+  },
+  created() {
+    this.getGirdInfo()
+    this.$nextTick(() => {
+      this.chartInit()
+    })
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.Home {
+  .tips {
+    padding: 24px 32px;
+    background-color: #3975C6;
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #FFF;
+    line-height: 40px;
+    img {
+      width: 32px;
+      height: 32px;
+      margin-right: 16px;
+      vertical-align: middle;
+    }
+  }
+  .content {
+    padding: 0 32px;
+    .user-info {
+      display: flex;
+      padding: 48px 0 32px 0;
+      .left {
+        width: 96px;
+        height: 96px;
+        margin-right: 32px;
+        img {
+          width: 96px;
+          height: 96px;
+          border-radius: 50%;
+          border: 4px solid #FFFFFF;
+          box-sizing: border-box;
+        }
+      }
+      .right {
+        width: calc(100% - 128px);
+        margin-top: 6px;
+        .name {
+          font-size: 32px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #333;
+          line-height: 44px;
+        }
+        .time {
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #999;
+          line-height: 40px;
+          span {
+            color: #3975C6;
+          }
+        }
+      }
+    }
+    .app-list {
+      width: 100%;
+      background: #FFF;
+      box-shadow: 0 0 8px 0 rgba(0,0,0,0.0200);
+      border-radius: 8px;
+      display: flex;
+      .item {
+        flex: 1;
+        text-align: center;
+        padding: 24px 0;
+        img {
+          width: 64px;
+          height: 64px;
+          margin-bottom: 8px;
+        }
+        p {
+          font-size: 26px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #333;
+          line-height: 36px;
+        }
+      }
+    }
+    .title {
+      padding: 48px 0 24px 0;
+      font-size: 32px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+      line-height: 44px;
+    }
+    .tab-content {
+      .item {
+        display: inline-block;
+        width: calc(50% - 8px);
+        height: 160px;
+        background: #FFF;
+        box-shadow: 0 0 8px 0 rgba(0,0,0,0.0200);
+        border-radius: 16px;
+        padding: 24px;
+        box-sizing: border-box;
+        margin-bottom: 16px;
+        p {
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #666;
+          line-height: 40px;
+          margin-bottom: 8px;
+          span {
+            display: inline-block;
+            width: 16px;
+            height: 16px;
+            border-radius: 50%;
+            border: 4px solid #3975C6;
+            margin-right: 8px;
+            box-sizing: border-box;
+          }
+        }
+        div{
+          font-size: 48px;
+          font-family: PingFangSC-Semibold, PingFang SC;
+          font-weight: 600;
+          color: #333;
+          line-height: 64px;
+          padding-left: 24px;
+        }
+        
+      }
+      .item:nth-of-type(2n-1) {
+        margin-right: 14px;
+      }
+      .item:nth-last-of-type(1) {
+        p {
+          span {
+            border-color: #3ACEB3;
+          }
+        }
+      }
+    }
+    .chart-content{
+      width: 100%;
+      height: 514px;
+      background: #FFF;
+      box-shadow: 0 0 8px 0 rgba(0,0,0,0.0200);
+      border-radius: 8px;
+      margin-bottom: 82px;
+    }
+  }
+  ::v-deep .u-type-warning-light-bg {
+    padding: 20px 32px!important;
+    background-color: #3975C6!important;
+  }
+  ::v-deep .u-icon__icon--warning {
+    color: #D7E3F3;
+    width: 32px;
+    height: 32px;
+    font-size: 0px!important;
+    background-image: url('../img/home/tips-icon.png');
+    background-size: 100%;
+  }
+  ::v-deep .u-type-warning {
+    color: #fff;
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    line-height: 40px;
+  }
+}
+</style>
diff --git a/src/project/huizhili/AppHome/components/My.vue b/src/project/huizhili/AppHome/components/My.vue
new file mode 100644
index 00000000..a3f54bb2
--- /dev/null
+++ b/src/project/huizhili/AppHome/components/My.vue
@@ -0,0 +1,151 @@
+<template>
+  <div class="My">
+    <div class="content">
+      <div class="user-info">
+        <img src="../img/my/my-bg-user.png" alt="" class="bg-img">
+        <div class="top">
+          <div>
+            <AiOpenData v-if="user.wxUserId" type="userName" :openid="user.wxUserId"></AiOpenData>
+          </div>
+          <img :src="user.avatar" alt="" v-if="user.avatar">
+          <img src="../img/user-icon.png" alt="" v-else>
+        </div>
+        <div class="bottom">{{ user.corpName }}</div>
+      </div>
+      <div class="link" v-for="(item, index) in linkList" :key="index" @click="linkTo(item.linkUrl)">
+        <div class="left">
+          <img :src="item.img" alt="">{{ item.title }}
+        </div>
+        <img src="../img/right-icon-999.png" alt="" class="right-icon">
+      </div>
+    </div>
+    
+  </div>
+</template>
+
+<script>
+import { mapActions, mapState } from 'vuex'
+export default {
+  name: "My",
+  data() {
+    return {
+      linkList: [
+        {
+          title: '头像上传',
+          img: require('../img/my/my-txsc.png'),
+          linkUrl: './UploadPhoto'
+        },
+        {
+          title: '意见反馈',
+          img: require('../img/my/my-yjfk.png'),
+          linkUrl: './FeedBack'
+        },
+        {
+          title: '联系我们',
+          img: require('../img/my/my-lxwm.png'),
+          linkUrl: 'contact'
+        },
+        {
+          title: '帮助文档',
+          img: require('../img/my/my-bzwd.png'),
+          linkUrl: './HelpDocs'
+        }
+      ]
+    }
+  },
+  computed: { ...mapState(['user']) },
+  methods: {
+    ...mapActions(['wxInvoke', 'injectJWeixin']),
+    linkTo(url) {
+      if(url == 'contact') { //联系我们
+        this.wxInvoke(["openThirdAppServiceChat", {}, res => {
+          if (res.err_msg == "openThirdAppServiceChat:fail") {
+            window.open("https://work.weixin.qq.com/kfid/kfcc23927b18d1ad4f4")
+          }
+        }])
+      }else {
+        console.log(url)
+        uni.navigateTo({ url })
+      }
+      
+    }
+  },
+  created() {
+    this.injectJWeixin('openThirdAppServiceChat')
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.My {
+  .content {
+    padding: 32px 32px 0;
+    .user-info{
+      width: 100%;
+      height: 248px;
+      border-radius: 8px;
+      background-color: #fff;
+      position: relative;
+      margin-bottom: 32px;
+      .bg-img {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+      }
+      .top {
+        display: flex;
+        justify-content: space-between;
+        padding: 28px 32px 36px;
+        border-bottom: 1px solid #eee;
+        div {
+          font-size: 40px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+          line-height: 96px;
+        }
+        img {
+          width: 96px;
+          height: 96px;
+          border-radius: 50%;
+          border: 1px solid #DDD;
+        }
+      }
+      .bottom {
+        padding: 24px 32px;
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #999;
+        line-height: 40px;
+      }
+    }
+    .link {
+      display: flex;
+      justify-content: space-between;
+      padding: 32px;
+      background-color: #fff;
+      border-radius: 8px;
+      margin-bottom: 24px;
+      .left {
+        font-size: 30px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #333;
+        line-height: 42px;
+        img {
+          width: 48px;
+          height: 48px;
+          margin-right: 16px;
+          vertical-align: middle;
+        }
+      }
+      .right-icon {
+        width: 40px;
+        height: 40px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/huizhili/AppHome/img/app/app-jmda-icon.png b/src/project/huizhili/AppHome/img/app/app-jmda-icon.png
new file mode 100644
index 00000000..13d0c9f4
Binary files /dev/null and b/src/project/huizhili/AppHome/img/app/app-jmda-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/app/app-mdtj-icon.png b/src/project/huizhili/AppHome/img/app/app-mdtj-icon.png
new file mode 100644
index 00000000..1fb8debc
Binary files /dev/null and b/src/project/huizhili/AppHome/img/app/app-mdtj-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/app/app-rfdt-icon.png b/src/project/huizhili/AppHome/img/app/app-rfdt-icon.png
new file mode 100644
index 00000000..9280da9c
Binary files /dev/null and b/src/project/huizhili/AppHome/img/app/app-rfdt-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/app/app-swjl-icon.png b/src/project/huizhili/AppHome/img/app/app-swjl-icon.png
new file mode 100644
index 00000000..dc5ed453
Binary files /dev/null and b/src/project/huizhili/AppHome/img/app/app-swjl-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/app/app-tsrq-icon.png b/src/project/huizhili/AppHome/img/app/app-tsrq-icon.png
new file mode 100644
index 00000000..18fd9dc1
Binary files /dev/null and b/src/project/huizhili/AppHome/img/app/app-tsrq-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/app/app-tzgg-icon.png b/src/project/huizhili/AppHome/img/app/app-tzgg-icon.png
new file mode 100644
index 00000000..802eb65c
Binary files /dev/null and b/src/project/huizhili/AppHome/img/app/app-tzgg-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/app/app-wggl-icon.png b/src/project/huizhili/AppHome/img/app/app-wggl-icon.png
new file mode 100644
index 00000000..4b2e98c3
Binary files /dev/null and b/src/project/huizhili/AppHome/img/app/app-wggl-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/app/app-wgyjf-icon.png b/src/project/huizhili/AppHome/img/app/app-wgyjf-icon.png
new file mode 100644
index 00000000..be573d51
Binary files /dev/null and b/src/project/huizhili/AppHome/img/app/app-wgyjf-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/app/app-xftj-icon.png b/src/project/huizhili/AppHome/img/app/app-xftj-icon.png
new file mode 100644
index 00000000..8d51aea6
Binary files /dev/null and b/src/project/huizhili/AppHome/img/app/app-xftj-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/app/app-zfww-icon.png b/src/project/huizhili/AppHome/img/app/app-zfww-icon.png
new file mode 100644
index 00000000..4c3c3005
Binary files /dev/null and b/src/project/huizhili/AppHome/img/app/app-zfww-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/grid/grid-banner.png b/src/project/huizhili/AppHome/img/grid/grid-banner.png
new file mode 100644
index 00000000..f021f1c6
Binary files /dev/null and b/src/project/huizhili/AppHome/img/grid/grid-banner.png differ
diff --git a/src/project/huizhili/AppHome/img/grid/grid-jmda.png b/src/project/huizhili/AppHome/img/grid/grid-jmda.png
new file mode 100644
index 00000000..890dc176
Binary files /dev/null and b/src/project/huizhili/AppHome/img/grid/grid-jmda.png differ
diff --git a/src/project/huizhili/AppHome/img/grid/grid-rfdt.png b/src/project/huizhili/AppHome/img/grid/grid-rfdt.png
new file mode 100644
index 00000000..cbf6bd38
Binary files /dev/null and b/src/project/huizhili/AppHome/img/grid/grid-rfdt.png differ
diff --git a/src/project/huizhili/AppHome/img/grid/grid-tsrq.png b/src/project/huizhili/AppHome/img/grid/grid-tsrq.png
new file mode 100644
index 00000000..7db822b0
Binary files /dev/null and b/src/project/huizhili/AppHome/img/grid/grid-tsrq.png differ
diff --git a/src/project/huizhili/AppHome/img/grid/grid-wggl.png b/src/project/huizhili/AppHome/img/grid/grid-wggl.png
new file mode 100644
index 00000000..4199c014
Binary files /dev/null and b/src/project/huizhili/AppHome/img/grid/grid-wggl.png differ
diff --git a/src/project/huizhili/AppHome/img/home/home-jmgl-icon.png b/src/project/huizhili/AppHome/img/home/home-jmgl-icon.png
new file mode 100644
index 00000000..b5d55916
Binary files /dev/null and b/src/project/huizhili/AppHome/img/home/home-jmgl-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/home/home-mdtj-icon.png b/src/project/huizhili/AppHome/img/home/home-mdtj-icon.png
new file mode 100644
index 00000000..8e72eff0
Binary files /dev/null and b/src/project/huizhili/AppHome/img/home/home-mdtj-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/home/home-xtxf-icon.png b/src/project/huizhili/AppHome/img/home/home-xtxf-icon.png
new file mode 100644
index 00000000..14321df2
Binary files /dev/null and b/src/project/huizhili/AppHome/img/home/home-xtxf-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/home/home-zfww-icon.png b/src/project/huizhili/AppHome/img/home/home-zfww-icon.png
new file mode 100644
index 00000000..07a50aca
Binary files /dev/null and b/src/project/huizhili/AppHome/img/home/home-zfww-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/home/tips-icon.png b/src/project/huizhili/AppHome/img/home/tips-icon.png
new file mode 100644
index 00000000..8df7c972
Binary files /dev/null and b/src/project/huizhili/AppHome/img/home/tips-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/my/grid-point.png b/src/project/huizhili/AppHome/img/my/grid-point.png
new file mode 100644
index 00000000..bdfe7f31
Binary files /dev/null and b/src/project/huizhili/AppHome/img/my/grid-point.png differ
diff --git a/src/project/huizhili/AppHome/img/my/my-bg-user.png b/src/project/huizhili/AppHome/img/my/my-bg-user.png
new file mode 100644
index 00000000..bfc8535d
Binary files /dev/null and b/src/project/huizhili/AppHome/img/my/my-bg-user.png differ
diff --git a/src/project/huizhili/AppHome/img/my/my-bzwd.png b/src/project/huizhili/AppHome/img/my/my-bzwd.png
new file mode 100644
index 00000000..2693899e
Binary files /dev/null and b/src/project/huizhili/AppHome/img/my/my-bzwd.png differ
diff --git a/src/project/huizhili/AppHome/img/my/my-lxwm.png b/src/project/huizhili/AppHome/img/my/my-lxwm.png
new file mode 100644
index 00000000..d7a323ad
Binary files /dev/null and b/src/project/huizhili/AppHome/img/my/my-lxwm.png differ
diff --git a/src/project/huizhili/AppHome/img/my/my-txsc.png b/src/project/huizhili/AppHome/img/my/my-txsc.png
new file mode 100644
index 00000000..cf86d6d3
Binary files /dev/null and b/src/project/huizhili/AppHome/img/my/my-txsc.png differ
diff --git a/src/project/huizhili/AppHome/img/my/my-yjfk.png b/src/project/huizhili/AppHome/img/my/my-yjfk.png
new file mode 100644
index 00000000..a96c1f1c
Binary files /dev/null and b/src/project/huizhili/AppHome/img/my/my-yjfk.png differ
diff --git a/src/project/huizhili/AppHome/img/my/phone-icon.png b/src/project/huizhili/AppHome/img/my/phone-icon.png
new file mode 100644
index 00000000..784af11c
Binary files /dev/null and b/src/project/huizhili/AppHome/img/my/phone-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/right-icon-999.png b/src/project/huizhili/AppHome/img/right-icon-999.png
new file mode 100644
index 00000000..c5b30a17
Binary files /dev/null and b/src/project/huizhili/AppHome/img/right-icon-999.png differ
diff --git a/src/project/huizhili/AppHome/img/tab/app-icon-active.png b/src/project/huizhili/AppHome/img/tab/app-icon-active.png
new file mode 100644
index 00000000..3748ec56
Binary files /dev/null and b/src/project/huizhili/AppHome/img/tab/app-icon-active.png differ
diff --git a/src/project/huizhili/AppHome/img/tab/app-icon.png b/src/project/huizhili/AppHome/img/tab/app-icon.png
new file mode 100644
index 00000000..28b5b97b
Binary files /dev/null and b/src/project/huizhili/AppHome/img/tab/app-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/tab/grid-icon-active.png b/src/project/huizhili/AppHome/img/tab/grid-icon-active.png
new file mode 100644
index 00000000..5d3501a4
Binary files /dev/null and b/src/project/huizhili/AppHome/img/tab/grid-icon-active.png differ
diff --git a/src/project/huizhili/AppHome/img/tab/grid-icon.png b/src/project/huizhili/AppHome/img/tab/grid-icon.png
new file mode 100644
index 00000000..dde3d6db
Binary files /dev/null and b/src/project/huizhili/AppHome/img/tab/grid-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/tab/home-icon-active.png b/src/project/huizhili/AppHome/img/tab/home-icon-active.png
new file mode 100644
index 00000000..9792e4c5
Binary files /dev/null and b/src/project/huizhili/AppHome/img/tab/home-icon-active.png differ
diff --git a/src/project/huizhili/AppHome/img/tab/home-icon.png b/src/project/huizhili/AppHome/img/tab/home-icon.png
new file mode 100644
index 00000000..41b2182c
Binary files /dev/null and b/src/project/huizhili/AppHome/img/tab/home-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/tab/my-icon-active.png b/src/project/huizhili/AppHome/img/tab/my-icon-active.png
new file mode 100644
index 00000000..3c512096
Binary files /dev/null and b/src/project/huizhili/AppHome/img/tab/my-icon-active.png differ
diff --git a/src/project/huizhili/AppHome/img/tab/my-icon.png b/src/project/huizhili/AppHome/img/tab/my-icon.png
new file mode 100644
index 00000000..446a4fc6
Binary files /dev/null and b/src/project/huizhili/AppHome/img/tab/my-icon.png differ
diff --git a/src/project/huizhili/AppHome/img/user-icon.png b/src/project/huizhili/AppHome/img/user-icon.png
new file mode 100644
index 00000000..960f147c
Binary files /dev/null and b/src/project/huizhili/AppHome/img/user-icon.png differ
diff --git a/src/project/saas/AppCooperationPropaganda/tagsList.vue b/src/project/saas/AppCooperationPropaganda/tagsList.vue
index bf5b72eb..deb0e999 100644
--- a/src/project/saas/AppCooperationPropaganda/tagsList.vue
+++ b/src/project/saas/AppCooperationPropaganda/tagsList.vue
@@ -3,11 +3,12 @@
     <div class="tags-group">
       <div class="tags-list" v-for="items in subTags" :key="items.id">
         <div class="tag_title">{{ items.name }}</div>
+        <!--   -->
         <div class="item"
-             v-for="(item, index) in items.tagList"
-             :class="[checked.includes(item.id) ? 'active' : '']"
-             :key="index"
-             @click="onClick(item.id)">
+          v-for="(item, index) in items.tagList"
+          :class="[checked.includes(item.id) ? 'active' : '']"
+          :key="index"
+          @click="onClick(item.id)">
           {{ item.name }}
         </div>
       </div>
@@ -23,7 +24,54 @@ export default {
   name: "tagsList",
   data() {
     return {
-      subTags: []
+      subTags: [
+        {
+          id: "1",
+          name: "第一组",
+          tagList: [
+            {
+              id: "1.1",
+              name: "介绍的",
+            },
+            {
+              id: "1.2",
+              name: "介绍的啊塑胶地板",
+            },
+            {
+              id: "1.3",
+              name: "介绍的",
+            },
+            {
+              id: "1.4",
+              name: "介绍的啊啊啊啊啊啊啊啊",
+            },
+            {
+              id: "1.5",
+              name: "介绍的啊啊啊",
+            },
+            {
+              id: "1.6",
+              name: "介绍的红红火火恍恍惚惚或或或或或或或或或或或或红红火火恍恍惚惚或或或或或或或",
+            },
+            {
+              id: "1.7",
+              name: "介绍的红红火火恍恍惚惚或或或或或或或或或或或或红红火火恍恍惚惚或或或或或或或",
+            },
+          ]
+			  },
+        {
+          id: "2",
+          name: "第二组",
+          tagList: [
+            {
+              id: "2.2",
+              name: "的范德萨发",
+            }
+          ]
+			  }
+      ],
+      checked: [],
+      list: []
     }
   },
   methods: {
@@ -40,6 +88,28 @@ export default {
         }
       })
     },
+    onClick(id) {
+      const index = this.checked.indexOf(id)
+
+      if (index === -1) {
+        this.checked.push(id)
+      } else {
+        this.checked.splice(index, 1)
+      }
+    },
+    submit() {
+      if (!this.checked.length) {
+        return this.$u.toast('请选择标签')
+      }
+
+      const list = this.list.filter(v => {
+        return this.checked.includes(v.id)
+      })
+
+      uni.$emit('onChecked', list)
+
+      uni.navigateBack()
+    }
   },
   onShow() {
     this.getTags()
@@ -52,22 +122,27 @@ export default {
 
 <style lang="scss" scoped>
 .tagsList {
+  padding-bottom: 120px;
+  box-sizing: border-box;
+
   .tags-group {
     margin-bottom: 16px;
-    padding: 0 32px 16px;
-    background: #fff;
-
-    & > h2 {
-      height: 108px;
-      line-height: 108px;
-      color: #333333;
-      font-size: 32px;
-    }
-
     .tags-list {
       display: flex;
       flex-wrap: wrap;
       line-height: 1;
+      padding: 0 32px;
+      box-sizing: border-box;
+      background: #FFF;
+      margin-bottom: 16px;
+
+      .tag_title {
+        width: 100%;
+        height: 108px;
+        line-height: 108px;
+        color: #333333;
+        font-size: 32px;
+      }
 
       .item {
         height: 64px;
@@ -77,7 +152,7 @@ export default {
         color: #333333;
         font-size: 28px;
         background: #F3F4F7;
-        border-radius: 4px;
+        border-radius: 8px;
         max-width: 100%;
         text-overflow: ellipsis;
         overflow: hidden;
@@ -89,23 +164,27 @@ export default {
         }
       }
     }
-    .btn {
-      position: fixed;
-      bottom: 0;
-      left: 0;
-      z-index: 999;
-      width: 100%;
-      height: 112px;
-      line-height: 112px;
-      background: #3975C6;
-      font-size: 32px;
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      color: #FFF;
+  }
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    background: #FFF;
+    display: flex;
+    width: 100%;
+    height: 128px;
+    padding: 24px 32px;
+    box-sizing: border-box;
 
-      div {
-        text-align: center;
-      }
+    div {
+      flex: 1;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      border-radius: 8px;
+      border: 2px solid #CCCCCC;
+      background: #1365DD;
+      color: #FFF;
     }
   }
 }