diff --git a/src/apps/AppEpidemicSituation/BackUserList.vue b/src/apps/AppEpidemicSituation/BackUserList.vue
index 6dff6fee..cd16bfbf 100644
--- a/src/apps/AppEpidemicSituation/BackUserList.vue
+++ b/src/apps/AppEpidemicSituation/BackUserList.vue
@@ -74,6 +74,7 @@ export default {
   methods: {
     areaSelect() {
       this.getListInit()
+      this.getTotal()
     },
     tabClick(index) {
       this.tabIndex = index
diff --git a/src/apps/AppGridManagement/AppGridManagement.vue b/src/apps/AppGridManagement/AppGridManagement.vue
index 811c6b2c..34347dd5 100644
--- a/src/apps/AppGridManagement/AppGridManagement.vue
+++ b/src/apps/AppGridManagement/AppGridManagement.vue
@@ -27,20 +27,20 @@ export default {
       tabIndex: 0,
       tabs: [
         {
-          img: require('./components/img/handle-icon.png'),
-          activeImg: require('./components/img/handle-icon-active.png'),
+          img: require('./components/img/statistics-icon.png'),
+          activeImg: require('./components/img/statistics-icon-active.png'),
           text: '统计',
           component: 'Statistics',
         },
         {
-          img: require('./components/img/statistics-icon.png'),
-          activeImg: require('./components/img/statistics-icon-active.png'),
+          img: require('./components/img/org-icon.png'),
+          activeImg: require('./components/img/org-icon-active.png'),
           text: '组织',
           component: 'Organization',
         },
         {
-          img: require('./components/img/set-icon.png'),
-          activeImg: require('./components/img/set-icon-active.png'),
+          img: require('./components/img/map-icon.png'),
+          activeImg: require('./components/img/map-icon-active.png'),
           text: '地图',
           component: 'Map'
         }
diff --git a/src/apps/AppGridManagement/Organization.vue b/src/apps/AppGridManagement/Organization.vue
index 0e4eba5b..3d9197df 100644
--- a/src/apps/AppGridManagement/Organization.vue
+++ b/src/apps/AppGridManagement/Organization.vue
@@ -9,22 +9,22 @@
       <span @click="linkTo('./SetGird')">网格配置</span>
     </div>
     <div class="title">网格人员</div>
-    <div class="user-content">
-      <img src="./components/img/user-img.png" alt="">
+    <div class="user-content" v-for="(item, index) in dataInfo.parentGirdMembers" :key="index">
+      <img src="./components/img/big-user.png" alt="">
       <div class="right">
-        <div class="name">侯敬兰</div>
-        <div class="gird">一级网格长</div>
-        <p>南湖街道一级网格</p>
+        <div class="name">{{item.name}}</div>
+        <div class="gird">{{item.checkType == 2 ? '网格长' : '网格员'}}</div>
+        <p>{{item.girdName}}</p>
       </div>
     </div>
-    <div class="user-content user-item">
+    <div class="user-content user-item" v-for="(item, index) in dataInfo.girdMembers" :key="index">
       <img src="./components/img/user-img.png" alt="">
       <div class="right">
-        <div class="name">侯敬兰 
-          <span class="gird">一级网格长</span>
+        <div class="name">{{item.name}} 
+          <span class="gird">{{item.checkType == 2 ? '网格长' : '网格员'}}</span>
           <span class="family-btn" @click="linkTo('./FamilyList')">责任家庭 ></span>
         </div>
-        <p>南湖街道一级网格</p>
+        <p>{{item.girdName}} </p>
       </div>
     </div>
   </div>
@@ -34,7 +34,8 @@
 export default {
   data() {
     return {
-      userGird: {}
+      userGird: {},
+      dataInfo: {}
     }
   },
   onShow() {
@@ -49,12 +50,20 @@ export default {
         if (res.code == 0) {
           if (res.data.checkType) {
             this.userGird = res.data.appGirdInfo
+            this.getGirdUserList()
           } else {
             this.$u.toast('当前人员不是网格员或网格管理员')
           }
         }
       })
     },
+    getGirdUserList() {
+      this.$http.post(`/app/appgirdmemberinfo/listGirdMemberByGirdId?girdId=${this.userGird.id}`).then((res) => {
+        if (res.code == 0) {
+          this.dataInfo = res.data
+        }
+      })
+    },
     linkTo(url) {
       uni.navigateTo({url})
     }
diff --git a/src/apps/AppGridManagement/components/img/big-user.png b/src/apps/AppGridManagement/components/img/big-user.png
new file mode 100644
index 00000000..f4ade6f6
Binary files /dev/null and b/src/apps/AppGridManagement/components/img/big-user.png differ
diff --git a/src/apps/AppGridManagement/components/img/handle-icon-active.png b/src/apps/AppGridManagement/components/img/handle-icon-active.png
deleted file mode 100644
index 1cb07503..00000000
Binary files a/src/apps/AppGridManagement/components/img/handle-icon-active.png and /dev/null differ
diff --git a/src/apps/AppGridManagement/components/img/handle-icon.png b/src/apps/AppGridManagement/components/img/handle-icon.png
deleted file mode 100644
index ab2d20c2..00000000
Binary files a/src/apps/AppGridManagement/components/img/handle-icon.png and /dev/null differ
diff --git a/src/apps/AppGridManagement/components/img/map-icon-active.png b/src/apps/AppGridManagement/components/img/map-icon-active.png
new file mode 100644
index 00000000..9052710d
Binary files /dev/null and b/src/apps/AppGridManagement/components/img/map-icon-active.png differ
diff --git a/src/apps/AppGridManagement/components/img/map-icon.png b/src/apps/AppGridManagement/components/img/map-icon.png
new file mode 100644
index 00000000..05435184
Binary files /dev/null and b/src/apps/AppGridManagement/components/img/map-icon.png differ
diff --git a/src/apps/AppGridManagement/components/img/org-icon-active.png b/src/apps/AppGridManagement/components/img/org-icon-active.png
new file mode 100644
index 00000000..78e4e64c
Binary files /dev/null and b/src/apps/AppGridManagement/components/img/org-icon-active.png differ
diff --git a/src/apps/AppGridManagement/components/img/org-icon.png b/src/apps/AppGridManagement/components/img/org-icon.png
new file mode 100644
index 00000000..b5f9e506
Binary files /dev/null and b/src/apps/AppGridManagement/components/img/org-icon.png differ
diff --git a/src/apps/AppGridManagement/components/img/set-icon-active.png b/src/apps/AppGridManagement/components/img/set-icon-active.png
deleted file mode 100644
index c025cb79..00000000
Binary files a/src/apps/AppGridManagement/components/img/set-icon-active.png and /dev/null differ
diff --git a/src/apps/AppGridManagement/components/img/set-icon.png b/src/apps/AppGridManagement/components/img/set-icon.png
deleted file mode 100644
index 58651b64..00000000
Binary files a/src/apps/AppGridManagement/components/img/set-icon.png and /dev/null differ