diff --git a/src/apps/AppEpidemicSituation/BackUserList.vue b/src/apps/AppEpidemicSituation/BackUserList.vue
index 669397d0..6dff6fee 100644
--- a/src/apps/AppEpidemicSituation/BackUserList.vue
+++ b/src/apps/AppEpidemicSituation/BackUserList.vue
@@ -100,7 +100,7 @@ export default {
       })
     },
     getTotal() {
-      this.$http.post(`/app/appepidemicbackhomerecord/statistic`).then((res) => {
+      this.$http.post(`/app/appepidemicbackhomerecord/statistic?areaId=${this.areaId}`).then((res) => {
         if (res.code == 0) {
           this.totalInfo = res.data
         }
diff --git a/src/apps/AppEpidemicSituation/ErrorDetail.vue b/src/apps/AppEpidemicSituation/ErrorDetail.vue
index 95f7810e..31120e71 100644
--- a/src/apps/AppEpidemicSituation/ErrorDetail.vue
+++ b/src/apps/AppEpidemicSituation/ErrorDetail.vue
@@ -108,6 +108,8 @@ export default {
       userList: [],
       data: [],
       datas: [],
+      size: 10,
+      current: 1,
     }
   },
   computed: {
@@ -152,7 +154,7 @@ export default {
         .post(`/app/appepidemichealthreport/list?memberId=${this.id}`)
         .then((res) => {
           if (res.code == 0) {
-            this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+            this.datas = res.data.records
             this.$hideLoading()
           } else {
             this.$hideLoading()
@@ -167,7 +169,13 @@ export default {
     getRecord() {
       this.$loading()
       this.$http
-        .post(`/app/appepidemicunusuallog/list?recordId=${this.id}`)
+        .post(`/app/appepidemicunusuallog/list`, null, {
+          params: {
+            recordId: this.id,
+            size: this.size,
+            current: this.current,
+          },
+        })
         .then((res) => {
           if (res.code == 0) {
             this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
@@ -222,6 +230,10 @@ export default {
       uni.makePhoneCall({ phoneNumber: phone })
     },
   },
+  onReachBottom() {
+    this.current++
+    this.getRecord()
+  },
 }
 </script>
 
diff --git a/src/apps/AppEpidemicSituation/HealthDetail.vue b/src/apps/AppEpidemicSituation/HealthDetail.vue
index 81b326f8..64bbc2f1 100644
--- a/src/apps/AppEpidemicSituation/HealthDetail.vue
+++ b/src/apps/AppEpidemicSituation/HealthDetail.vue
@@ -68,6 +68,8 @@ export default {
       userList: [],
       diffNum: '',
       today: '',
+      size: 10,
+      current: 1,
     }
   },
   computed: {
@@ -104,11 +106,19 @@ export default {
     },
 
     getRecord() {
-      this.$http.post(`/app/appepidemichealthreport/list?memberId=${this.id}`).then((res) => {
-        if (res.code == 0) {
-          this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
-        }
-      })
+      this.$http
+        .post(`/app/appepidemichealthreport/list`, null, {
+          params: {
+            memberId: this.id,
+            size: this.size,
+            current: this.current,
+          },
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records
+          }
+        })
     },
 
     callPhone(phone) {
@@ -127,13 +137,17 @@ export default {
       })
     },
   },
+  onReachBottom() {
+    this.current++
+    this.getRecord()
+  },
 }
 </script>
 
 <style scoped lang="scss">
 .HealthDetail {
   height: 100%;
-  padding-bottom: 120px;
+  // padding-bottom: 120px;
   background: #f3f6f9;
   .top {
     .templates {
diff --git a/src/apps/AppEpidemicSituation/UserDetail.vue b/src/apps/AppEpidemicSituation/UserDetail.vue
index c75ed550..a9e6e8ef 100644
--- a/src/apps/AppEpidemicSituation/UserDetail.vue
+++ b/src/apps/AppEpidemicSituation/UserDetail.vue
@@ -179,7 +179,7 @@ export default {
         .post(`/app/appepidemicunusuallog/list?recordId=${this.userList.memberId}`)
         .then((res) => {
           if (res.code == 0) {
-            this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+            this.datas = res.data.records
             this.$hideLoading()
           } else {
             this.$hideLoading()
diff --git a/src/apps/AppGridManagement/Organization.vue b/src/apps/AppGridManagement/Organization.vue
index ad0348d7..0e4eba5b 100644
--- a/src/apps/AppGridManagement/Organization.vue
+++ b/src/apps/AppGridManagement/Organization.vue
@@ -2,11 +2,11 @@
   <div class="Organization">
     <div class="select-gird">
       <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
-      <div>
-        南湖街道网格一
+      <div @click="linkTo('./SelectGird')">
+        {{userGird.girdName}}
         <img src="./components/img/down-icon.png" alt="" class="down-icon"> 
       </div>
-      <span @click="linkTo('./SelectGird')">网格配置</span>
+      <span @click="linkTo('./SetGird')">网格配置</span>
     </div>
     <div class="title">网格人员</div>
     <div class="user-content">
@@ -34,13 +34,27 @@
 export default {
   data() {
     return {
-      
+      userGird: {}
     }
   },
   onShow() {
     document.title = '网格管理'
   },
+  mounted() {
+    this.isGirdUser()
+  },
   methods: {
+    isGirdUser() {
+      this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
+        if (res.code == 0) {
+          if (res.data.checkType) {
+            this.userGird = res.data.appGirdInfo
+          } else {
+            this.$u.toast('当前人员不是网格员或网格管理员')
+          }
+        }
+      })
+    },
     linkTo(url) {
       uni.navigateTo({url})
     }
diff --git a/src/apps/AppGridManagement/SelectGird.vue b/src/apps/AppGridManagement/SelectGird.vue
index db7b4b7b..fb02872e 100644
--- a/src/apps/AppGridManagement/SelectGird.vue
+++ b/src/apps/AppGridManagement/SelectGird.vue
@@ -4,12 +4,11 @@
       <div class="hint">
         <span v-for="(item, index) in slectList" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span style="color:#3F8DF5" @click="girdNameClick(item, index)">{{item.girdName}}</span></span>
       </div>
-
       <div class="showTypes" v-if="!userList.length">
         <div v-if="treeList.length > 0">
           <div class="cards" v-for="(item, index) in treeList" :key="index" @click="itemClick(item)">
             <div class="imges">
-              <span v-if="item.girdLevel == 2">
+              <span>
                 <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked" @click.stop="girdClick(item, index)" />
                 <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click.stop="girdClick(item, index)" />
               </span>
@@ -24,59 +23,11 @@
 
         <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
       </div>
-
-      <div class="showUsers" v-else>
-        <div v-if="userList.length > 0">
-          <div class="cards" v-for="(e, index) in userList" :key="index">
-            <div class="imges">
-              <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="e.isChecked" @click="userClick(e, index)" />
-              <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click="userClick(e, index)" />
-
-              <img src="./components/img/tx@2x.png" alt="" class="avatras" />
-            </div>
-
-            <div class="rights">
-              <div class="applicationNames">{{ e.name }}</div>
-              <div class="idNumbers">{{ e.phone }}</div>
-            </div>
-          </div>
-        </div>
-
-        <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
-      </div>
     </div>
-
     <div class="subBtn" @click="submit">
       <div>确定选择</div>
     </div>
 
-     <u-popup v-model="show" mode="bottom" border-radius="14">
-      <div class="popup">
-        <div class="bg"></div>
-        <div class="title">{{ form.girdName }}</div>
-        <div class="info-flex">
-          <span class="label">网格类型</span>
-          <span class="value">{{ }}</span>
-        </div>
-        <div class="info-flex">
-          <span class="label">网格层级</span>
-          <span class="value">{{  }}</span>
-        </div>
-        <div class="info-flex">
-          <span class="label">网格负责人</span>
-          <span class="value">{{  }}</span>
-        </div>
-        <div class="info-flex border-b0">
-          <span class="label">网格员</span>
-          <span class="value">{{  }}<img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone('110')" class="phone-icon"></span>
-        </div>
-        <div class="btn">
-          <span class="del">删除网格</span>
-          <span class="edit">编辑网格</span>
-        </div>
-      </div>
-    </u-popup>
-
   </div>
 </template>
 
@@ -90,9 +41,6 @@ export default {
       treeList: [],
       slectList: [],
       userList: [],
-
-      show: true,
-      form: {}
     }
   },
   onLoad() {
@@ -363,82 +311,5 @@ export default {
     }
   }
 
-  .popup {
-    padding: 0 32px 16px;
-
-    .bg {
-      width: 64px;
-      height: 10px;
-      background: #CCC;
-      border-radius: 6px;
-      margin: 32px 0 32px 344px;
-    }
-
-    .title {
-      font-size: 36px;
-      font-family: PingFang-SC-Heavy, PingFang-SC;
-      font-weight: 800;
-      color: #333;
-      line-height: 50px;
-      margin-bottom: 24px;
-    }
-
-    .info-flex {
-      padding: 26px 0 30px 0;
-      width: 100%;
-      border-bottom: 1px solid #D8DDE6;
-      line-height: 40px;
-      font-size: 28px;
-
-      .label {
-        display: inline-block;
-        width: 160px;
-        font-weight: 800;
-        color: #333;
-      }
-
-      .value {
-        color: #666;
-        font-size: 26px;
-
-        .phone-icon {
-          width: 40px;
-          height: 40px;
-          vertical-align: sub;
-          margin-left: 16px;
-        }
-      }
-    }
-    .border-b0{
-      border-bottom: 0;
-    }
-    .btn{
-      padding: 32px 0;
-      background-color: #fff;
-      display: flex;
-      span{
-        display: inline-block;
-        height: 92px;
-        line-height: 90px;
-        border-radius: 8px;
-        font-size: 34px;
-        font-family: PingFangSC-Medium, PingFang SC;
-        font-weight: 500;
-        box-sizing: border-box;
-        text-align: center;
-      }
-      .del{
-        color: #f46;
-        border: 1px solid #f46;
-        flex: 1;
-        margin-right: 32px;
-      }
-      .edit{
-        background-color: #3671EE;
-        color: #fff;
-        flex: 2;
-      }
-    }
-  }
 }
 </style>
diff --git a/src/apps/AppGridManagement/SetGird.vue b/src/apps/AppGridManagement/SetGird.vue
new file mode 100644
index 00000000..7b86930e
--- /dev/null
+++ b/src/apps/AppGridManagement/SetGird.vue
@@ -0,0 +1,448 @@
+<template>
+  <div class="setGird">
+    <div class="header-middle">
+      <div class="hint">
+        <span v-for="(item, index) in slectList" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span style="color:#3F8DF5" @click="girdNameClick(item, index)">{{item.girdName}}</span></span>
+      </div>
+
+      <div class="showTypes" v-if="!userList.length">
+        <div v-if="treeList.length > 0">
+          <div class="cards" v-for="(item, index) in treeList" :key="index" @click="itemClick(item)">
+            <div class="imges">
+              <span v-if="item.girdLevel == 2">
+                <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked" @click.stop="girdClick(item, index)" />
+                <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click.stop="girdClick(item, index)" />
+              </span>
+              <img src="./components/img/gird--select-icon.png" alt="" class="avatras" />
+            </div>
+            <div class="rightes">
+              <div class="applicationNames">{{ item.girdName }}</div>
+              <img src="./components/img/right-icon.png" alt="" class="imgs" />
+            </div>
+          </div>
+        </div>
+
+        <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+      </div>
+
+      <div class="showUsers" v-else>
+        <div v-if="userList.length > 0">
+          <div class="cards" v-for="(e, index) in userList" :key="index">
+            <div class="imges">
+              <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="e.isChecked" @click="userClick(e, index)" />
+              <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click="userClick(e, index)" />
+
+              <img src="./components/img/tx@2x.png" alt="" class="avatras" />
+            </div>
+
+            <div class="rights">
+              <div class="applicationNames">{{ e.name }}</div>
+              <div class="idNumbers">{{ e.phone }}</div>
+            </div>
+          </div>
+        </div>
+
+        <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+      </div>
+    </div>
+
+    <div class="subBtn" @click="toAddGird">
+      <div>添加网格</div>
+    </div>
+
+     <u-popup v-model="show" mode="bottom" border-radius="14">
+      <div class="popup">
+        <div class="bg"></div>
+        <div class="title">{{ form.girdName }}</div>
+        <div class="info-flex">
+          <span class="label">网格类型</span>
+          <span class="value">{{ }}</span>
+        </div>
+        <div class="info-flex">
+          <span class="label">网格层级</span>
+          <span class="value">{{  }}</span>
+        </div>
+        <div class="info-flex">
+          <span class="label">网格负责人</span>
+          <span class="value">{{  }}</span>
+        </div>
+        <div class="info-flex border-b0">
+          <span class="label">网格员</span>
+          <span class="value">{{  }}<img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone('110')" class="phone-icon"></span>
+        </div>
+        <div class="btn">
+          <span class="del">删除网格</span>
+          <span class="edit">编辑网格</span>
+        </div>
+      </div>
+    </u-popup>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'setGird',
+  data() {
+    return {
+      setGird: {},
+      allData: null,
+      treeList: [],
+      slectList: [],
+      userList: [],
+
+      show: true,
+      form: {}
+    }
+  },
+  onLoad() {
+    this.getTree()
+  },
+  methods: {
+    getTree() {
+      this.slectList = []
+      this.$http.post('/app/appgirdinfo/listAllByTop').then((res) => {
+        if (res?.data) {
+          this.allData = res.data
+          this.treeInit()
+        }
+      })
+    },
+
+    treeInit() {
+      if(this.allData[0].isLastLevel == 1) {
+        this.userList = this.allData[0].girdMemberList
+        this.userList.map((item) => {
+          item.isChecked = false
+        })
+      }else {
+        this.treeList = this.allData[0].girdList
+      }
+      var obj = {
+        girdName: this.allData[0].girdName,
+        id: this.allData[0].id,
+        girdLevel: this.allData[0].girdLevel
+      }
+      this.slectList.push(obj)
+    },
+
+    itemClick(row) {
+      console.log(row)
+      var obj = {
+        girdName: row.girdName,
+        id: row.id,
+        girdLevel: row.girdLevel
+      }
+      this.slectList.push(obj)
+      this.searckGird(row)
+    },
+
+    searckGird(row) {
+      if(row.girdLevel != 2) { //查网格
+        this.$http.post(`/app/appgirdinfo/list?parentGirdId=${row.id}&size=999`).then((res) => {
+          if (res?.data) {
+            this.treeList = res.data.records
+          }
+        })
+      }else { //查网格员
+        this.$http.post(`/app/appgirdmemberinfo/listByGirdIdByThree?girdId=${row.id}`).then((res) => {
+          if (res?.data) {
+            this.userList = res.data
+            this.userList.map((item) => {
+              item.isChecked = false
+            })
+          }
+        })
+      }
+    },
+
+    girdNameClick(row, index) {
+      this.userList = []
+      if(!index) { //第一级别
+        this.slectList = []
+        this.treeInit()
+      }else {
+        var list = []
+        this.slectList.map((item, i) => {
+          if(i <= index) {
+            list.push(item)
+          }
+        })
+        this.slectList = list
+        this.searckGird(row)
+      }
+    },
+    
+
+    girdClick(row, index) {
+      if (this.treeList[index].isChecked) {//取消
+        this.treeList[index].isChecked = false
+        this.setGird = {}
+      } else {
+        this.treeList.map((item) => {
+          item.isChecked = false
+        })
+        this.treeList[index].isChecked = true
+        this.setGird = row
+      }
+      this.$forceUpdate()
+    },
+
+    userClick(row, index) {
+      if (this.userList[index].isChecked) {//取消
+        this.userList[index].isChecked = false
+        this.setGird = {}
+      } else {
+        this.userList.map((item) => {
+          item.isChecked = false
+        })
+        this.userList[index].isChecked = true
+        this.setGird = row
+      }
+      this.$forceUpdate()
+    },
+
+    submit() {
+      if (this.setGird.id != null) {
+        uni.$emit('goback', this.setGird)
+        uni.navigateBack()
+      } else {
+        return this.$u.toast('请选择网格或网格员')
+      }
+    },
+
+    callPhone(phone) {
+      uni.makePhoneCall({phoneNumber: phone})
+    },
+
+    toAddGird() {
+      uni.navigateTo({url: './AddGird'})
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.setGird {
+  height: 100%;
+  background: #fff;
+  .header-top {
+    background: #fff;
+    padding: 20px 32px;
+  }
+
+  .header-middle {
+    padding-bottom: 140px;
+    .hint {
+      padding: 28px 20px 28px 32px;
+      line-height: 56px;
+      box-shadow: 0px 1px 0px 0px #e4e5e6;
+      font-size: 30px;
+      font-weight: 500;
+      word-break: break-all;
+    }
+
+    .showTypes {
+      .empty-div {
+        height: 16px;
+        background: #f5f5f5;
+      }
+
+      .cards {
+        display: flex;
+        align-items: center;
+        height: 120px;
+        line-height: 120px;
+        // background: pink;
+        padding: 0 0 0 32px;
+
+        .imges {
+          display: flex;
+          align-items: center;
+          // width: 200px;
+          .imgselect {
+            width: 48px;
+            height: 48px;
+            vertical-align: middle;
+          }
+
+          .avatras {
+            width: 74px;
+            height: 74px;
+            border-radius: 8px;
+            margin-left: 36px;
+          }
+        }
+        img {
+          width: 74px;
+          height: 74px;
+          border-radius: 8px;
+        }
+        .rightes {
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-left: 32px;
+          border-bottom: 1px solid #e4e5e6;
+          .applicationNames {
+            font-size: 36px;
+            font-weight: 500;
+            color: #333333;
+          }
+          .imgs {
+            width: 40px;
+            height: 40px;
+            margin-right: 20px;
+          }
+        }
+      }
+    }
+
+    .showUsers {
+      .cards {
+        display: flex;
+        align-items: center;
+        height: 120px;
+        line-height: 120px;
+        // background: pink;
+        padding: 0 0 0 32px;
+
+        .imges {
+          display: flex;
+          align-items: center;
+          width: 200px;
+          .imgselect {
+            width: 48px;
+            height: 48px;
+          }
+
+          .avatras {
+            width: 74px;
+            height: 74px;
+            border-radius: 8px;
+            margin-left: 36px;
+          }
+        }
+
+        .rights {
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-left: 32px;
+          border-bottom: 1px solid #e4e5e6;
+          padding-right: 40px;
+          .applicationNames {
+            font-size: 36px;
+            font-weight: 500;
+            color: #333333;
+          }
+          .idNumbers {
+            color: #666;
+          }
+        }
+      }
+    }
+  }
+
+  .subBtn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 118px;
+    background: #f4f8fb;
+    div {
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 4px;
+      font-size: 32px;
+      color: #fff;
+      margin: 20px 34px 0 0;
+      float: right;
+    }
+  }
+
+  .popup {
+    padding: 0 32px 16px;
+
+    .bg {
+      width: 64px;
+      height: 10px;
+      background: #CCC;
+      border-radius: 6px;
+      margin: 32px 0 32px 344px;
+    }
+
+    .title {
+      font-size: 36px;
+      font-family: PingFang-SC-Heavy, PingFang-SC;
+      font-weight: 800;
+      color: #333;
+      line-height: 50px;
+      margin-bottom: 24px;
+    }
+
+    .info-flex {
+      padding: 26px 0 30px 0;
+      width: 100%;
+      border-bottom: 1px solid #D8DDE6;
+      line-height: 40px;
+      font-size: 28px;
+
+      .label {
+        display: inline-block;
+        width: 160px;
+        font-weight: 800;
+        color: #333;
+      }
+
+      .value {
+        color: #666;
+        font-size: 26px;
+
+        .phone-icon {
+          width: 40px;
+          height: 40px;
+          vertical-align: sub;
+          margin-left: 16px;
+        }
+      }
+    }
+    .border-b0{
+      border-bottom: 0;
+    }
+    .btn{
+      padding: 32px 0;
+      background-color: #fff;
+      display: flex;
+      span{
+        display: inline-block;
+        height: 92px;
+        line-height: 90px;
+        border-radius: 8px;
+        font-size: 34px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        box-sizing: border-box;
+        text-align: center;
+      }
+      .del{
+        color: #f46;
+        border: 1px solid #f46;
+        flex: 1;
+        margin-right: 32px;
+      }
+      .edit{
+        background-color: #3671EE;
+        color: #fff;
+        flex: 2;
+      }
+    }
+  }
+}
+</style>