diff --git a/src/main.js b/src/main.js
index e6914f4a..9a5bf0ba 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,7 +30,7 @@ Object.keys(utils).map((e) => (Vue.prototype['$' + e] = utils[e]));
 utils.dict.init({instance: axios})
 utils.action.init(axios)
 App.mpType = 'app';
-process.env.NODE_ENV == 'development' && new VConsole();
+// process.env.NODE_ENV == 'development' && new VConsole();
 const app = new Vue({
   store,
   ...App
diff --git a/src/project/beta/AppBroadcast1/AppBroadcast1.vue b/src/project/beta/AppBroadcast1/AppBroadcast1.vue
index 6560bf95..5a066512 100644
--- a/src/project/beta/AppBroadcast1/AppBroadcast1.vue
+++ b/src/project/beta/AppBroadcast1/AppBroadcast1.vue
@@ -3,9 +3,9 @@
     <div class="header">
       <img src="./img/bigHorn-bg.png" alt="">
       <div class="content">
-        <div class="item" @click="linkTo('./onlineList')">
+        <div class="item" @click="linkTo('../AppEquipment/AppEquipment')">
           <img src="./img/bigHorn-icon1@2x.png" alt="">
-          <div>在线设备</div>
+          <div>广播设备</div>
           <!-- <h2>1</h2> -->
         </div>
         <div class="item" @click="linkTo('./playList')">
diff --git a/src/project/beta/AppBroadcast1/LiveBroadcast.vue b/src/project/beta/AppBroadcast1/LiveBroadcast.vue
index b9705548..032c529f 100644
--- a/src/project/beta/AppBroadcast1/LiveBroadcast.vue
+++ b/src/project/beta/AppBroadcast1/LiveBroadcast.vue
@@ -10,7 +10,7 @@
         <p>请先选择设备再按住下方按钮开始喊话~</p>
       </div>
     </div>
-    <div class="bottom" @longtap="onLongtap">
+    <div class="bottom" @touchstart="onLongtap">
       <image src="./img/microphone.png" />
       <p>按住说话</p>
     </div>
@@ -78,6 +78,7 @@
 
     methods: {
       onLongtap () {
+        this.isImpact = false
         this.startTime = new Date().getTime()
         this.isShow = true
       },
@@ -122,6 +123,7 @@
   .LiveBroadcast {
     height: 100vh;
     overflow: hidden;
+    user-select: none;
     background: #F6F8FC;
 
     .voice {
@@ -140,7 +142,7 @@
       transition: all ease 0.5s;
 
       &.active {
-        z-index: 1;
+        z-index: 1111111111111;
         opacity: 1;
       }
 
@@ -279,6 +281,7 @@
         width: 128px;
         height: 128px;
         margin-bottom: 16px;
+        pointer-events: none;
       }
 
       p {
diff --git a/src/project/beta/AppBroadcast1/selectEquipment.vue b/src/project/beta/AppBroadcast1/selectEquipment.vue
index 1de5ca48..3e4c82ac 100644
--- a/src/project/beta/AppBroadcast1/selectEquipment.vue
+++ b/src/project/beta/AppBroadcast1/selectEquipment.vue
@@ -9,7 +9,7 @@
             <u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px" />
           </AiAreaPicker>
         </div>
-        <u-search v-model="keyword" :clearabled="true" placeholder="请输入素材名称/创建人员" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入设备名称" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
       </div>
     </AiTopFixed>
     <div class="record">
diff --git a/src/project/beta/AppBroadcast1/selectMedia.vue b/src/project/beta/AppBroadcast1/selectMedia.vue
index 46da0f0f..12a7b374 100644
--- a/src/project/beta/AppBroadcast1/selectMedia.vue
+++ b/src/project/beta/AppBroadcast1/selectMedia.vue
@@ -7,10 +7,10 @@
         </div>
         <u-search v-model="keyword" :clearabled="true" placeholder="请输入素材名称/创建人员" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
       </div>
+      <div class="tab">
+        <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>
+      </div>
     </AiTopFixed>
-    <div class="tab">
-      <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>
-    </div>
     <div class="record" v-if="currIndex == 0">
       <div class="item" v-for="(item, index) in list" :key="index" @click="choose(item)">
         <img src="./img/select-blue.png" alt="" @click.stop="check(index)" v-if="item.isCheck">
diff --git a/src/project/beta/AppEquipment/AppEquipment.vue b/src/project/beta/AppEquipment/AppEquipment.vue
new file mode 100644
index 00000000..bfabe0fb
--- /dev/null
+++ b/src/project/beta/AppEquipment/AppEquipment.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="AppEquipment">
+    <AiTopFixed>
+      <div class="currentLeft-top">
+        <div class="left">
+          <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" selectRoot>
+            <span class="label" v-if="areaName">{{ areaName }}</span>
+            <span v-else>请选择</span>
+            <u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px" />
+          </AiAreaPicker>
+        </div>
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入设备名称" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
+      </div>
+    </AiTopFixed>
+    <div class="record">
+      <div class="item" @click="toDetail">
+        <img src="./img/lb@2x.png" alt="" class="voice-img">
+        <div class="info">
+          <div class="text">
+            <p>村头大喇叭</p>
+            <span>刘家河居委会</span>
+          </div>
+          <div class="status">在线</div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./img/lb@2x.png" alt="" class="voice-img">
+        <div class="info">
+          <div class="text">
+            <p>村头大喇叭</p>
+            <span>刘家河居委会</span>
+          </div>
+          <div class="status">在线</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: "AppEquipment",
+  data() {
+    return {
+      areaId: '',
+      areaName: '',
+      keyword: ''
+    }
+  },
+  computed: { ...mapState(['user']) },
+  onLoad(option) {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+  },
+  methods: {
+    areaSelect(e) {
+      this.areaId = e
+      // this.getList()
+    },
+    toDetail(item) {
+      uni.navigateTo({url: `./detail`})
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.AppEquipment {
+
+  .currentLeft-top {
+    display: flex;
+    align-items: center;
+
+    .left {
+      width: 200px;
+      display: flex;
+      align-items: center;
+
+      img {
+        width: 48px;
+        height: 48px;
+      }
+    }
+  }
+  .record {
+    margin-top: 8px;
+    padding-left: 32px;
+    background-color: #fff;
+
+    .item {
+      width: 100%;
+      display: flex;
+      border-bottom: 1px solid #ddd;
+
+      .check-img {
+        width: 44px;
+        height: 44px;
+        margin: 32px 32px 0 0;
+      }
+
+      .voice-img {
+        width: 48px;
+        height: 48px;
+        margin: 28px 16px 0 0;
+      }
+
+      .info {
+        width: calc(100% - 160px);
+        padding: 18px 0;
+        line-height: 44px;
+        font-size: 34px;
+        display: flex;
+        justify-content: space-between;
+
+        .text {
+          p {
+            font-family: PingFang-SC-Medium, PingFang-SC;
+            font-weight: 500;
+            color: #333;
+            margin-bottom: 8px;
+          }
+
+          span {
+            font-size: 26px;
+            font-family: PingFang-SC-Medium, PingFang-SC;
+            font-weight: 500;
+            color: #999;
+            line-height: 36px;
+          }
+        }
+
+        .status {
+          font-size: 34px;
+          font-family: PingFang-SC-Medium, PingFang-SC;
+          font-weight: 500;
+          color: #4E8EEE;
+          line-height: 48px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/beta/AppEquipment/detail.vue b/src/project/beta/AppEquipment/detail.vue
new file mode 100644
index 00000000..db845462
--- /dev/null
+++ b/src/project/beta/AppEquipment/detail.vue
@@ -0,0 +1,212 @@
+<template>
+  <div class="detail">
+    <AiTopFixed>
+      <div class="tab">
+        <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>
+      </div>
+    </AiTopFixed>
+    <div class="content">
+      <div class="info-content" v-if="currIndex != 1">
+        <p>村头大喇叭</p>
+        <div class="info">
+          <span>设备编号</span>
+          <span class="color-333">121312312312</span>
+        </div>
+        <div class="info">
+          <span>设备状态</span>
+          <span style="color: #4E8EEE">在线</span>
+        </div>
+        <div class="info">
+          <span>信号强度</span>
+          <span class="color-333">一般</span>
+        </div>
+        <div class="info">
+          <span>音量</span>
+          <span class="color-333"></span>
+        </div>
+        <div class="info">
+          <span>所属区划</span>
+          <span class="color-333"></span>
+        </div>
+      </div>
+      <div class="list-content" v-else>
+        <div class="list">
+          <div class="item" @click="toTaskDetail">
+            <div class="left">
+              <p>韩红-我的祖国.mp3</p>
+              <div>李毅 2022-06-09 09:43:05</div>
+              <div>日常 立即播发</div>
+            </div>
+            <div class="right">
+              <div class="status">已下发</div>
+              <div class="cancel-btn">撤销</div>
+            </div>
+          </div>
+        </div>
+        <!-- <AiEmpty v-if="!list.length"></AiEmpty> -->
+      </div>
+    </div>
+    
+    <div class="btn">设置音量</div>
+    <u-popup v-model="isShow" mode="bottom">
+      
+    </u-popup>
+  </div>
+</template>
+<script>
+
+export default {
+  name: "detail",
+  data() {
+    return {
+      barStyle: {width: '98px', bottom: '-3px', left: '-38px'},
+      tab: [{name: '基本信息'}, {name: '播发任务'}],
+      list: [],
+      currIndex: 1,
+      current: 1,
+      isShow: false,
+    }
+  },
+  onLoad(query) {
+    
+  },
+
+  onShow() {
+    document.title = '设备详情'
+  },
+
+  methods: {
+    change(index) {
+      this.currIndex = index
+      this.getListInit()
+    },
+    toTaskDetail(item) {
+      uni.navigateTo({url: `./taskDetail`})
+    }
+  },
+
+  onReachBottom() {
+    if(this.currIndex == 1) {
+      this.current ++
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail {
+  padding-bottom: 128px;
+  ::v-deep .AiTopFixed{
+    .content{
+      padding: 0;
+    }
+  }
+  .tab {
+    border-bottom: 1px solid #ddd;
+    margin-bottom: 4px;
+  }
+  .content{
+    margin-top: 8px;
+    .info-content{
+      padding-left: 32px;
+      background-color: #fff;
+      p{
+        padding: 32px 32px 32px 0;
+        font-size: 38px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        color: #333;
+        line-height: 56px;
+        word-break: break-all;
+      }
+      .info{
+        display: flex;
+        justify-content: space-between;
+        font-size: 32px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #999;
+        line-height: 44px;
+        padding: 34px 32px 32px 0;
+        border-bottom: 1px solid #ddd;
+        .color-333{
+          color: #333;
+        }
+      }
+    }
+    .list-content{
+      .list{
+        padding-left: 32px;
+        background-color: #fff;
+        .item{
+          display: flex;
+          padding: 16px 40px 16px 0;
+          box-sizing: border-box;
+          border-bottom: 1px solid #ddd;
+          .left{
+            width: calc(100% - 176px);
+            p{
+              font-size: 34px;
+              font-family: PingFang-SC-Medium, PingFang-SC;
+              font-weight: 500;
+              color: #333;
+              line-height: 48px;
+              word-break: break-all;
+              margin-bottom: 8px;
+            }
+            div{
+              font-size: 26px;
+              font-family: PingFang-SC-Medium, PingFang-SC;
+              font-weight: 500;
+              color: #999;
+              line-height: 36px;
+              margin-bottom: 8px;
+            }
+          }
+          .right{
+            width: 160px;
+            text-align: center;
+            .status{
+              font-size: 34px;
+              font-family: PingFang-SC-Medium, PingFang-SC;
+              font-weight: 500;
+              color: #4E8EEE;
+              line-height: 48px;
+              margin-bottom: 28px;
+            }
+            .cancel-btn{
+              width: 154px;
+              height: 60px;
+              line-height: 60px;
+              text-align: center;
+              background: #3975C6;
+              border-radius: 8px;
+              font-size: 30px;
+              font-family: PingFang-SC-Medium, PingFang-SC;
+              font-weight: 500;
+              color: #FFF;
+            }
+            .bg-AFD0FC{
+              background: #AFD0FC;
+            }
+          }
+        }
+      }
+    }
+
+  }
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background: #3975C6;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #FFFFFF;
+  }
+}
+</style>
diff --git a/src/project/beta/AppEquipment/img/bigHorn-bg.png b/src/project/beta/AppEquipment/img/bigHorn-bg.png
new file mode 100644
index 00000000..0296c598
Binary files /dev/null and b/src/project/beta/AppEquipment/img/bigHorn-bg.png differ
diff --git a/src/project/beta/AppEquipment/img/bigHorn-icon11@2x.png b/src/project/beta/AppEquipment/img/bigHorn-icon11@2x.png
new file mode 100644
index 00000000..9c4b5f38
Binary files /dev/null and b/src/project/beta/AppEquipment/img/bigHorn-icon11@2x.png differ
diff --git a/src/project/beta/AppEquipment/img/bigHorn-icon1@2x.png b/src/project/beta/AppEquipment/img/bigHorn-icon1@2x.png
new file mode 100644
index 00000000..899af3f4
Binary files /dev/null and b/src/project/beta/AppEquipment/img/bigHorn-icon1@2x.png differ
diff --git a/src/project/beta/AppEquipment/img/bigHorn-icon22@2x.png b/src/project/beta/AppEquipment/img/bigHorn-icon22@2x.png
new file mode 100644
index 00000000..013cb318
Binary files /dev/null and b/src/project/beta/AppEquipment/img/bigHorn-icon22@2x.png differ
diff --git a/src/project/beta/AppEquipment/img/bigHorn-icon2@2x.png b/src/project/beta/AppEquipment/img/bigHorn-icon2@2x.png
new file mode 100644
index 00000000..ed69247d
Binary files /dev/null and b/src/project/beta/AppEquipment/img/bigHorn-icon2@2x.png differ
diff --git a/src/project/beta/AppEquipment/img/bigHorn-icon33@2x.png b/src/project/beta/AppEquipment/img/bigHorn-icon33@2x.png
new file mode 100644
index 00000000..070082b3
Binary files /dev/null and b/src/project/beta/AppEquipment/img/bigHorn-icon33@2x.png differ
diff --git a/src/project/beta/AppEquipment/img/bigHorn-icon3@2x.png b/src/project/beta/AppEquipment/img/bigHorn-icon3@2x.png
new file mode 100644
index 00000000..c2776f99
Binary files /dev/null and b/src/project/beta/AppEquipment/img/bigHorn-icon3@2x.png differ
diff --git a/src/project/beta/AppEquipment/img/bigHorn-icon44@2x.png b/src/project/beta/AppEquipment/img/bigHorn-icon44@2x.png
new file mode 100644
index 00000000..b3250e7b
Binary files /dev/null and b/src/project/beta/AppEquipment/img/bigHorn-icon44@2x.png differ
diff --git a/src/project/beta/AppEquipment/img/bigHorn-lb@2x.png b/src/project/beta/AppEquipment/img/bigHorn-lb@2x.png
new file mode 100644
index 00000000..995242a3
Binary files /dev/null and b/src/project/beta/AppEquipment/img/bigHorn-lb@2x.png differ
diff --git a/src/project/beta/AppEquipment/img/bigHorn-xz.png b/src/project/beta/AppEquipment/img/bigHorn-xz.png
new file mode 100644
index 00000000..344ef478
Binary files /dev/null and b/src/project/beta/AppEquipment/img/bigHorn-xz.png differ
diff --git a/src/project/beta/AppEquipment/img/body.png b/src/project/beta/AppEquipment/img/body.png
new file mode 100644
index 00000000..74fe462c
Binary files /dev/null and b/src/project/beta/AppEquipment/img/body.png differ
diff --git a/src/project/beta/AppEquipment/img/cir.png b/src/project/beta/AppEquipment/img/cir.png
new file mode 100644
index 00000000..10e11a09
Binary files /dev/null and b/src/project/beta/AppEquipment/img/cir.png differ
diff --git a/src/project/beta/AppEquipment/img/lb@2x.png b/src/project/beta/AppEquipment/img/lb@2x.png
new file mode 100644
index 00000000..995242a3
Binary files /dev/null and b/src/project/beta/AppEquipment/img/lb@2x.png differ
diff --git a/src/project/beta/AppEquipment/img/microphone.png b/src/project/beta/AppEquipment/img/microphone.png
new file mode 100644
index 00000000..e994cc32
Binary files /dev/null and b/src/project/beta/AppEquipment/img/microphone.png differ
diff --git a/src/project/beta/AppEquipment/img/right-icon.png b/src/project/beta/AppEquipment/img/right-icon.png
new file mode 100644
index 00000000..786ceb14
Binary files /dev/null and b/src/project/beta/AppEquipment/img/right-icon.png differ
diff --git a/src/project/beta/AppEquipment/img/right.png b/src/project/beta/AppEquipment/img/right.png
new file mode 100644
index 00000000..d455d523
Binary files /dev/null and b/src/project/beta/AppEquipment/img/right.png differ
diff --git a/src/project/beta/AppEquipment/img/search-icon.png b/src/project/beta/AppEquipment/img/search-icon.png
new file mode 100644
index 00000000..e3cb75af
Binary files /dev/null and b/src/project/beta/AppEquipment/img/search-icon.png differ
diff --git a/src/project/beta/AppEquipment/img/select-blue.png b/src/project/beta/AppEquipment/img/select-blue.png
new file mode 100644
index 00000000..889f9e67
Binary files /dev/null and b/src/project/beta/AppEquipment/img/select-blue.png differ
diff --git a/src/project/beta/AppEquipment/taskDetail.vue b/src/project/beta/AppEquipment/taskDetail.vue
new file mode 100644
index 00000000..596a057b
--- /dev/null
+++ b/src/project/beta/AppEquipment/taskDetail.vue
@@ -0,0 +1,206 @@
+<template>
+  <div class="taskDetail">
+    <div class="info-content">
+      <div class="info border-none">
+        <h2>播发任务</h2>
+        <h3>已下发</h3>
+      </div>
+      <div class="info">
+        <span>播发级别</span>
+        <span class="color-333">121312312312</span>
+      </div>
+      <div class="info">
+        <span>播放方式</span>
+        <span style="color: #4E8EEE">在线</span>
+      </div>
+      <div>
+        <div class="info">
+          <span>播放天数</span>
+          <span class="color-333">每周一、每周二、每周三</span>
+        </div>
+        <div class="info">
+        <span>开始日期</span>
+        <span class="color-333">2022-06-10</span>
+        </div>
+        <div class="info">
+          <span>开始时间</span>
+          <span class="color-333">18:00:00</span>
+        </div>
+        <div class="info">
+          <span>结束时间</span>
+          <span class="color-333">19:00:00</span>
+        </div>
+      </div>
+      <div class="info">
+        <span>创建人</span>
+        <span class="color-333">一般</span>
+      </div>
+      <div class="info">
+        <span>创建时间</span>
+        <span class="color-333"></span>
+      </div>
+    </div>
+    <div class="media-content">
+      <h2>播发素材</h2>
+      <div class="media-item">
+        <img :src="`${$cdn}video/play-icon.png`" alt="" @click="choose()">
+        <div class="info">
+          <p>五一活动唱红歌.mp3</p>
+          <div>李毅 2022-06-09 09:43:05</div>
+        </div>
+      </div>
+    </div>
+    <div class="btn">撤销任务</div>
+    <u-popup v-model="isShow" mode="bottom">
+      <div class="audio">
+        <AiVideo :src="url" autoplay></AiVideo>
+        <!-- <audio :src="url" ref="audio" :controls="true" :name="autioName" style="display: block;"></audio> -->
+      </div>
+    </u-popup>
+  </div>
+</template>
+<script>
+
+export default {
+  name: "taskDetail",
+  data() {
+    return {
+      isShow: false
+    }
+  },
+  onLoad(query) {
+    
+  },
+
+  onShow() {
+    document.title = '任务详情'
+  },
+
+  methods: {
+    choose(item) {
+      console.log(item.url)
+      this.url = item.url
+      this.isShow = tru
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.taskDetail {
+  .info-content{
+    padding-left: 32px;
+    background-color: #fff;
+    p{
+      padding: 32px 32px 32px 0;
+      font-size: 38px;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+      line-height: 56px;
+      word-break: break-all;
+    }
+    .info{
+      display: flex;
+      justify-content: space-between;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 44px;
+      padding: 34px 32px 32px 0;
+      border-bottom: 1px solid #ddd;
+      .color-333{
+        color: #333;
+      }
+      h2{
+        font-size: 38px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        color: #333;
+        line-height: 52px;
+      }
+      h3{
+        font-size: 34px;
+        font-family: PingFang-SC-Medium, PingFang-SC;
+        font-weight: 500;
+        color: #4E8EEE;
+        line-height: 52px;
+      }
+    }
+    .border-none{
+      border-bottom: 0;
+    }
+  }
+  .audio {
+    width: 100%;
+    height: 400px;
+    box-sizing: border-box;
+    padding: 104px 0 46px;
+  }
+  .media-content{
+    margin-top: 16px;
+    background-color: #fff;
+    h2{
+      padding: 32px;
+      font-size: 38px;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+      line-height: 52px;
+    }
+    .media-item {
+      width: 100%;
+      display: flex;
+      border-bottom: 1px solid #ddd;
+      padding: 32px 30px;
+      box-sizing: border-box;
+
+      img {
+        width: 56px;
+        height: 56px;
+        margin-right: 14px;
+      }
+
+      .info {
+        width: calc(100% - 70px);
+        line-height: 44px;
+        font-size: 34px;
+        font-family: PingFang-SC-Medium, PingFang-SC;
+        font-weight: 500;
+        color: #333;
+
+        p {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          word-break: break-all;
+        }
+        div{
+          font-size: 26px;
+          font-family: PingFang-SC-Medium, PingFang-SC;
+          font-weight: 500;
+          color: #999;
+          line-height: 36px;
+          margin-top: 8px;
+        }
+      }
+    }
+  }
+  
+  
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background: #fff;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #F46;
+    border-top: 1px solid #ddd;
+  }
+}
+</style>
diff --git a/src/project/beta/AppResourcesManage/AppResourcesManage.vue b/src/project/beta/AppResourcesManage/AppResourcesManage.vue
index 8c0404d0..fe484022 100644
--- a/src/project/beta/AppResourcesManage/AppResourcesManage.vue
+++ b/src/project/beta/AppResourcesManage/AppResourcesManage.vue
@@ -7,10 +7,10 @@
         </div>
         <u-search v-model="keyword" :clearabled="true" placeholder="请输入素材名称/创建人员" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
       </div>
+      <div class="tab">
+        <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>
+      </div>
     </AiTopFixed>
-    <div class="tab">
-      <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>
-    </div>
     <div class="record" v-if="currIndex == 0">
       <div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
         <img :src="`${$cdn}video/play-icon.png`" alt="" @click="choose(item)">
@@ -39,7 +39,6 @@
 
 export default {
   name: "AppResourcesManage",
-  appName: "媒资管理",
   data() {
     return {
       tab: [{name: '音频素材'}, {name: '文本素材'}],
diff --git a/src/project/police/AppMessageNotification/AppMessageNotification.vue b/src/project/police/AppMessageNotification/AppMessageNotification.vue
index f57255de..d14d0741 100644
--- a/src/project/police/AppMessageNotification/AppMessageNotification.vue
+++ b/src/project/police/AppMessageNotification/AppMessageNotification.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="AppMessageNotification">
     <div class="header">
-      <p class="fw500">注意</p>
+      <p>注意</p>
       <p>每个用户每天可以接受10条群发消息，不限企业发布的群发还是个人发布的群发。</p>
       <p>个人群发每天可以给用户发送10条群发消息。</p>
     </div>
@@ -36,8 +36,8 @@
       </div>
       <div class="mini-title color-666"><span class="tips">*</span>文本内容</div>
       <div class="textarea">
-        <u-input v-model="form.content" type="textarea" :height="400" auto-height maxlength="600" placeholder="请输入文本内容" />
-        <div class="hint">{{ form.content.length }}/500</div>
+        <u-input v-model="form.content" type="textarea" :height="400" auto-height maxlength="1000" placeholder="请输入文本内容" />
+        <div class="hint">{{ form.content.length }}/1000</div>
       </div>
       <div class="type">
         <p class="color-666">其它类型</p>
@@ -187,9 +187,9 @@ export default {
       }
     },
     confirm() {
-      if(!this.areaIdList.length) {
-        return this.$u.toast('请选择用户')
-      }
+      // if(!this.areaIdList.length) {
+      //   return this.$u.toast('请选择用户')
+      // }
       if(this.form.sendType == 1 && !this.form.sendTime) {
         return this.$u.toast('请选择群发时间')
       }
@@ -249,8 +249,8 @@ export default {
     margin-bottom: 32px;
   }
   .header{
-    background-color: #fff;
-    padding: 32px;
+    // background-color: #fff;
+    padding: 32px 32px 20px 32px;
     box-sizing: border-box;
     margin-bottom: 16px;
     p{
@@ -258,6 +258,7 @@ export default {
       margin-bottom: 8px;
       word-break: break-all;
       font-size: 28px;
+      color: #666;
     }
   }
   .select-user{
diff --git a/src/project/police/AppPeopleList/Add.vue b/src/project/police/AppPeopleList/Add.vue
new file mode 100644
index 00000000..6fe65da3
--- /dev/null
+++ b/src/project/police/AppPeopleList/Add.vue
@@ -0,0 +1,405 @@
+<template>
+  <div class="add">
+    <div class="item">
+      <span class="tips">*</span>
+      <div class="border">
+        <span class="label">居民类型</span>
+        <span class="value" @click="clickSelect('residentType', 'residentType')">
+          <span v-if="form.residentType === ''" class="color-999">请选择</span>
+          <span v-else>{{$dict.getLabel('residentType', form.residentType)}}</span>
+          <img src="./components/img/right-icon.png" alt="">
+        </span>
+      </div>
+    </div>
+    <div class="item">
+      <span class="tips">*</span>
+      <div class="border">
+        <span class="label">是否户主</span>
+        <span class="value" @click="clickSelect('yesOrNo', 'householdName')">
+          <span v-if="form.householdName === ''" class="color-999">请选择</span>
+          <span v-else>{{$dict.getLabel('yesOrNo', form.householdName)}}</span>
+          <img src="./components/img/right-icon.png" alt="">
+        </span>
+      </div>
+    </div>
+    <div class="item" v-if="form.householdName != 1">
+      <span class="tips">*</span>
+      <div class="border">
+        <span class="label">户主身份证</span>
+        <span class="value">
+          <input type="idcard" placeholder="请输入" v-model="form.householdIdNumber" maxlength="18">
+        </span>
+      </div>
+    </div>
+    <div class="item" v-if="form.householdName != 1">
+      <span class="tips">*</span>
+      <div class="border">
+        <span class="label">与户主关系</span>
+        <span class="value" @click="clickSelect('householdRelation', 'householdRelation')">
+          <span v-if="form.householdRelation === ''" class="color-999">请选择</span>
+          <span v-else>{{$dict.getLabel('householdRelation', form.householdRelation)}}</span>
+          <img src="./components/img/right-icon.png" alt="">
+        </span>
+      </div>
+    </div>
+    <div class="item">
+      <span class="tips">*</span>
+      <div class="border">
+        <span class="label">姓名</span>
+        <span class="value">
+          <input type="text" placeholder="请输入" v-model="form.name" maxlength="10" :disabled="this.form.id ? true : false">
+        </span>
+      </div>
+    </div>
+    <div class="item">
+      <span class="tips">*</span>
+      <div class="border">
+        <span class="label">身份证号</span>
+        <span class="value">
+          <input type="idcard" placeholder="请输入" v-model="form.idNumber" maxlength="18" @input="changeIdNumber" :disabled="this.form.id ? true : false">
+        </span>
+      </div>
+    </div>
+    <div class="item">
+      <span class="tips">*</span>
+      <div class="border">
+        <span class="label">性别</span>
+        <span class="value">
+          <span v-if="form.sex === ''" class="color-999">请选择</span>
+          <span v-else>{{$dict.getLabel('sex', form.sex)}}</span>
+          <img src="./components/img/right-icon.png" alt="">
+        </span>
+      </div>
+    </div>
+    <div class="item">
+      <span class="tips">*</span>
+      <div class="border">
+        <span class="label">出生日期</span>
+        <span class="value">
+          <span :class="form.birthDate == '' ? 'color-999' : ''">{{form.birthDate || '请选择'}}</span>
+          <img src="./components/img/right-icon.png" alt="">
+        </span>
+      </div>
+    </div>
+    <div class="item">
+      <span class="tips"></span>
+      <div class="border">
+        <span class="label">联系电话</span>
+        <span class="value">
+          <input type="text" placeholder="请输入" @input="changePhone" v-model="form.phone" maxlength="11">
+        </span>
+      </div>
+    </div>
+    <div class="item">
+      <span class="tips">*</span>
+      <div class="border">
+        <span class="label">现住址</span>
+        <span class="value">
+          <AiAreaPicker ref="address" class="aiArea" :areaId="user.areaId" :fullName.sync="form.currentAreaName" :value="form.currentAreaId" mode="custom" @select="onCurrentAreaChange">
+            <div class="aiArea">
+              <span class="label" v-if="form.currentAreaName">{{ form.currentAreaName }}</span>
+              <span v-else class="color-999">请选择</span>
+              <img src="./components/img/right-icon.png" alt="">
+            </div>
+          </AiAreaPicker>
+        </span>
+      </div>
+    </div>
+    <div class="item">
+      <span class="tips">*</span>
+      <div class="border">
+        <span class="label">组</span>
+        <span class="value">
+          <input type="text" placeholder="请输入" v-model="form.currentAddressGroup" maxlength="11">
+        </span>
+      </div>
+    </div>
+    <div class="item">
+      <span class="tips">*</span>
+      <div class="border">
+        <span class="label">户</span>
+        <span class="value">
+          <input type="text" placeholder="请输入" v-model="form.currentAddressNo" maxlength="11">
+        </span>
+      </div>
+    </div>
+    <!-- <div class="item mar-b0">
+      <span class="tips"></span>
+      <div class="border not-border">
+        <span class="label">详细地址</span>
+      </div>
+    </div>
+    <div class="text-area">
+      <textarea placeholder="请输入" maxlength="30" v-model="form.currentAddress"></textarea>
+    </div> -->
+    <div class="item">
+      <span class="tips"></span>
+      <div class="border">
+        <span class="label">户籍地址</span>
+        <span class="value">
+          <AiAreaPicker ref="address" class="aiArea" :areaId="user.areaId" :fullName.sync="form.householdAreaName" all :value="form.householdAreaId" mode="custom" @select="onHouseAreaChange">
+            <div class="aiArea">
+              <span class="label" v-if="form.householdAreaName">{{ form.householdAreaName }}</span>
+              <span v-else class="color-999">请选择</span>
+              <img src="./components/img/right-icon.png" alt="">
+            </div>
+          </AiAreaPicker>
+        </span>
+      </div>
+    </div>
+    <div class="item mar-b0">
+      <span class="tips"></span>
+      <div class="border not-border">
+        <span class="label">详细地址</span>
+      </div>
+    </div>
+    <div class="text-area">
+      <textarea placeholder="请输入" maxlength="30" v-model="form.householdAddress"></textarea>
+    </div>
+    <div class="pad-b152"></div>
+    <div class="add-btn" @click="submit">
+      <div>保存</div>
+    </div>
+    <u-select v-model="showSelect" :list="selectList" label-name="dictName" value-name="dictValue"  @confirm="confirmSelect"/>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: 'add',
+  data() {
+    return {
+      form: {
+        id: '',
+        householdName: '',
+        householdIdNumber: '',
+        householdRelation: '',
+        name: '',
+        idNumber: '',
+        sex: '',
+        birthDate: '',
+        phone: '',
+        currentAreaId: '',
+        currentAreaName: '',
+        currentAddress: '',
+        householdAreaId: '',
+        householdAreaName: '',
+        householdAddress: '',
+        residentType: '',
+        age: '',
+        currentAddressGroup: '',
+        currentAddressNo: ''
+      },
+      showSelect: false,
+      formName: '',
+      selectList: []
+    }
+  },
+  onLoad(options) {
+    this.$dict.load('yesOrNo', 'sex', 'householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'residentType').then(() => {
+      if(options.id) {
+        document.title = '编辑居民'
+        this.form.id = options.id
+        this.getDetail()
+      }else {
+        document.title = '新增居民'
+        this.form.residentType = options.type || ''
+      }
+    })
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  methods: {
+    submit() {
+      if(this.form.residentType === '') {
+        return this.$u.toast('请选择居民类型')
+      }
+      if(this.form.householdName === '') {
+        return this.$u.toast('请选择是否户主')
+      }
+      if(this.form.householdName != 1 && !this.form.householdIdNumber) {
+        return this.$u.toast('请输入户主身份证')
+      }
+      if(this.form.householdName != 1 && this.form.householdRelation === '') {
+        return this.$u.toast('请选择与户主关系')
+      }
+      if(!this.form.name) {
+        return this.$u.toast('请输入姓名')
+      }
+      if(!this.form.idNumber) {
+        return this.$u.toast('请输入身份证号')
+      }
+      if(!this.form.sex) {
+        return this.$u.toast('请选择性别')
+      }
+      if(!this.form.birthDate) {
+        return this.$u.toast('请选择出生日期')
+      }
+      if(!this.form.currentAreaId) {
+        return this.$u.toast('请选择现住址')
+      }
+      if(!/[^0]0{0,2}$/.test(this.form.currentAreaId)) {
+        return this.$u.toast('现住址必须选到村级')
+      }
+      if(!this.form.currentAddressGroup) {
+        return this.$u.toast('请输入组')
+      }
+      if(!this.form.currentAddressNo) {
+        return this.$u.toast('请输入户')
+      }
+      if(this.form.householdAreaId && !/[^0]0{0,2}$/.test(this.form.householdAreaId)) {
+        return this.$u.toast('户籍地必须选到村级')
+      }
+      this.form.age =  this.$calcAge(this.form.idNumber)
+      this.$http.post('/app/appresident/addOrUpdate', this.form).then(res => {
+        if (res.code === 0) {
+          this.$u.toast('新增成功')
+          uni.$emit('reload')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+      }).catch((err) => {
+        this.$u.toast(err)
+      })
+
+    },
+    confirmSelect(e) {
+      this.form[this.formName] = e[0].value
+    },
+    clickSelect(dictName, formName) {
+      this.selectList = this.$dict.getDict(dictName)
+      this.formName = formName
+      this.showSelect = true
+    },
+    changeIdNumber() {
+      let reg = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+      if (this.form.idNumber.length == 18 && !reg.test(this.form.idNumber)) {
+        return this.$u.toast('请输入正确的身份证号码')
+      }
+      var info = this.$idCardNoUtil.getIdCardInfo(this.form.idNumber)
+      this.form.birthDate = info.birthday
+      this.form.sex = info.gender
+      console.log(this.form)
+      this.$forceUpdate()
+    },
+
+    changePhone() {
+      let regTel = /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/
+      if (this.form.phone.length == 11 && !regTel.test(this.form.phone)) {
+        return this.$u.toast('请输入正确的手机号')
+      }
+    },
+
+    onCurrentAreaChange(e) {
+      this.form.currentAreaId = e
+    },
+
+    onHouseAreaChange(e) {
+      this.form.householdAreaId = e
+    },
+
+    getDetail() {
+      this.$http.post(`/app/appresident/detail?id=${this.form.id}`).then(res => {
+        if (res.code === 0) {
+          this.form = {...res.data.resident}
+          var info = this.$idCardNoUtil.getIdCardInfo(this.form.idNumber)
+          this.form.birthDate = info.birthday
+          this.form.sex = info.gender
+        }
+      })
+    }
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.add {
+  .item{
+    width: 100%;
+    padding-left: 14px;
+    background: #FFF;
+    box-sizing: border-box;
+    display: flex;
+    margin-bottom: 16px;
+    .tips{
+      width: 18px;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #FF4466;
+      line-height: 44px;
+      padding: 34px 0 34px 0;
+    }
+    .border{
+      width: calc(100% - 18px);
+      padding: 34px 32px 34px 0;
+      line-height: 44px;
+      border-bottom: 1px solid #D8DDE6;
+      line-height: 44px;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #333;
+      display: flex;
+      box-sizing: border-box;
+      .label{
+        width: 170px;
+      }
+      .value{
+        width: calc(100% - 170px);
+        text-align: right;
+        img{
+          width: 32px;
+          height: 32px;
+          margin-left: 8px;
+          vertical-align: middle;
+        }
+      }
+      .color-999{
+        color: #999;
+      }
+    }
+    .not-border{
+      border-bottom: 0;
+    }
+  }
+  .mar-b0{
+    margin-bottom: 0;
+  }
+  .text-area{
+    width: 100%;
+    background-color: #fff;
+    padding: 0 32px;
+    margin-bottom: 16px;
+    box-sizing: border-box;
+    textarea{
+      width: 100%;
+      height: 88px;
+      padding-bottom: 32px;
+    }
+  }
+  .pad-b152{
+    width: 100%;
+    padding-bottom: 152px;
+    background-color: #f5f5f5;
+  }
+  .add-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;
+    div{
+      text-align: center;
+    }
+  }
+}
+</style>
diff --git a/src/project/police/AppPeopleList/AppPeopleList.vue b/src/project/police/AppPeopleList/AppPeopleList.vue
new file mode 100644
index 00000000..c9dfa5c8
--- /dev/null
+++ b/src/project/police/AppPeopleList/AppPeopleList.vue
@@ -0,0 +1,318 @@
+<template>
+  <div class="AppPeopleList">
+    <AiTopFixed>
+      <div class="areatop">
+        <!-- <div>区域选择</div>
+        <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
+        <u-icon name="photo"></u-icon> -->
+        <!-- @select="areaSelect" -->
+        <u-form label-width="auto">
+          <u-form-item label="区域选择" right-icon="arrow-right" class="areaIds">
+            <AiAreaPicker v-model="areaId" :areaId="user.areaId" @input="seachObj" :name.sync="areaName" selectRoot/>
+          </u-form-item>
+        </u-form>
+      </div>
+
+      <div class="line"></div>
+
+      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" @change="change"></u-tabs>
+
+      <div class="seachObjs">
+        <u-search v-model="keyword" :clearabled="true" placeholder="姓名/联系方式/身份证后6位" :show-action="false"
+                  bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch"
+                  @clear="handerClear"></u-search>
+      </div>
+    </AiTopFixed>
+    <div class="dataes" v-if="datas.length > 0">
+      <div class="datass" v-for="(item, iindex) in datas" :key="iindex" @click="toDetailCard(item)">
+        <div class="left">
+          <img :src="item.photo" alt="" v-if="item.photo"/>
+          <img src="./components/img/4.png" alt="" v-else/>
+        </div>
+
+        <div class="right">
+          <div class="rightTop">
+            <span class="name">{{ item.name }}</span>
+            <span class="btn" v-if="user.id == item.createUserId">
+              <img src="./components/img/edit-icon.png" alt="" @click.stop="edit(item.id)">
+              <img src="./components/img/del-icon.png" alt="" @click.stop="del(item.id)">
+            </span>
+          </div>
+          <div class="rightBottom">
+            <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
+
+            <span>{{ item.phone }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="empty" v-else>
+      <img src="https://cdn.cunwuyun.cn/dvcp/h5/no-data.png" alt="">
+      <p>暂无居民信息<br/>点击<span @click="edit('')">新增按钮</span>新增居民信息,也可在管理系统批量导入</p>
+    </div>
+    <!-- <AiEmpty class="emptyWrap" v-else></AiEmpty> -->
+    <div style="height: 60px"></div>
+    <div class="addBtn" @click="edit('')">新增居民</div>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: 'AppPeopleList',
+  appName: '居民档案',
+  props: {},
+  data() {
+    return {
+      keyword: '',
+      datas: [],
+      current: 1,
+      size: 10,
+      tabList: [
+        {
+          name: '全部居民',
+        },
+        {
+          name: '本地居民',
+        },
+        {
+          name: '流动人员',
+        },
+      ],
+      currentTabs: 0,
+      areaId: '',
+      areaName: '',
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  watch: {},
+  onLoad() {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+    uni.$on('reload', () => {
+      this.current = 1
+      this.getList()
+    })
+    this.getList()
+  },
+  methods: {
+    getList() {
+      var residentType = ['', 0, 1][this.currentTabs]
+      this.$http
+      .post('/app/appresident/list', null, {
+        params: {
+          size: 20,
+          current: this.current,
+          con: this.keyword,
+          areaId: this.areaId,
+          residentType: residentType,
+          auditStatus: 1
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+
+          this.pages = res.data.pages
+        }
+      })
+    },
+
+    change(index) {
+      this.currentTabs = index
+      this.current = 1
+      this.datas = []
+      this.getList()
+    },
+
+    toDetailCard(item) {
+      uni.navigateTo({url: `./DetailCard?id=${item.id}`})
+    },
+
+    seachObj(e) {
+      this.areaId = e
+      this.current = 1
+      this.getList()
+    },
+
+    handerSearch(e) {
+      this.keyword = e
+      this.current = 1
+      this.getList()
+    },
+
+    handerClear() {
+      this.keyword = ''
+      this.current = 1
+      this.getList()
+    },
+    edit(id) {
+      var residentType = ['', 0, 1][this.currentTabs]
+      uni.navigateTo({url: `./Add?id=${id}&type=${residentType}`})
+    },
+    del(id) {
+      this.$confirm('确定删除该数据?').then(() => {
+        uni.showLoading()
+        this.$http.post(`/app/appresident/delete?ids=${id}`).then((res) => {
+          if (res.code == 0) {
+            this.$u.toast('删除成功！')
+            this.current = 1
+            this.getList()
+          }
+          uni.hideLoading()
+        })
+      }).catch(() => {
+      })
+    }
+  },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getList()
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.AppPeopleList {
+  height: 100%;
+
+  .areatop {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .line {
+    height: 16px;
+    background: #f5f5f5;
+  }
+
+  .seachObjs {
+    border-bottom: 2px solid #f5f5f5;
+    border-top: 2px solid #f5f5f5;
+    padding: 20px 32px;
+    background: #fff;
+  }
+
+  ::v-deep .u-form {
+    width: 100%;
+
+    .areaIds {
+      .u-form-item__body {
+        .u-form-item--right {
+          .u-form-item--right__content {
+            display: flex;
+            align-items: center;
+
+            .u-form-item--right__content__slot {
+              .AiAreaPicker {
+                width: 100%;
+                display: flex;
+                justify-content: flex-end;
+
+                .areaSelector {
+                  .location {
+                    opacity: 0;
+                  }
+                }
+              }
+            }
+
+            .u-form-item--right__content__icon {
+              margin-bottom: 8px;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .dataes {
+    background: #fff;
+
+    .datass {
+      display: flex;
+      padding: 24px 32px;
+
+      .left {
+        img {
+          width: 80px;
+          height: 80px;
+          border-radius: 50%;
+        }
+      }
+
+      .right {
+        display: flex;
+        flex-direction: column;
+        margin-left: 32px;
+        width: 100%;
+
+        .rightTop {
+          font-size: 32px;
+          font-weight: 500;
+          color: #333333;
+          display: flex;
+          justify-content: space-between;
+
+          .btn {
+            img {
+              width: 48px;
+              height: 48px;
+              margin-left: 40px;
+            }
+          }
+        }
+
+        .rightBottom {
+          display: flex;
+          justify-content: space-between;
+          margin-top: 8px;
+        }
+      }
+    }
+  }
+
+  .emptyWrap {
+    background: #f5f5f5;
+    margin: 0;
+  }
+
+  .addBtn {
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #1365DD;
+    text-align: center;
+    color: #FFF;
+    font-size: 32px;
+    position: fixed;
+    bottom: 0;
+  }
+
+  .empty {
+    height: 100%;
+
+    img {
+      width: 282px;
+      height: 306px;
+      margin: 168px 0 0 234px;
+    }
+
+    p {
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 44px;
+
+      span {
+        color: #467DFE;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/police/AppPeopleList/Content.vue b/src/project/police/AppPeopleList/Content.vue
new file mode 100644
index 00000000..c7ab8256
--- /dev/null
+++ b/src/project/police/AppPeopleList/Content.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="Content">
+    <div class="text-area">
+      <div class="title"><span class="tips">*</span>不通过理由</div>
+      <textarea placeholder="请输入" maxlength="200" v-model="opinion"></textarea>
+      <div class="num">{{opinion.length}}/200</div>
+      <!-- <u-input v-model="opinion" type="textarea" placeholder="请输入"  maxlength="500" /> -->
+    </div>
+    <div class="footer" @click="examine(0)">
+      <div class="btn">保存</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Content",
+  data() {
+    return {
+      opinion: '',
+      id: '',
+    };
+  },
+  onShow() {
+    document.title = '居民档案审核'
+  },
+  onLoad(option) {
+    this.id = option.id
+  },
+  methods: {
+    examine(pass) {
+      if(!this.opinion) {
+        return this.$u.toast('请输入不通过理由')
+      }
+      this.$http.post(`/app/appresident/examine?id=${this.id}&pass=${pass}&opinion=${this.opinion}`).then((res) => {
+        if (res.code == 0) {
+          this.$u.toast('审核成功')
+          uni.$emit('updatePeople')
+          setTimeout(() => {
+            uni.navigateBack({delta: 2})
+          }, 600)
+        }
+      })
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.Content {
+  .text-area{
+    padding: 34px 32px;
+    background-color: #fff;
+    .title{
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #333;
+      line-height: 44px;
+      margin-bottom: 32px;
+      .tips{
+        font-size: 32px;
+        margin-right: 8px;
+        color: #f46;
+      }
+    }
+    textarea{
+      width: 100%;
+      height: 500px;
+      word-break: break-all;
+    }
+  }
+  .num{
+    text-align: right;
+    color: #999;
+  }
+  .footer {
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+  }
+  .btn {
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background: #3975C6;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #FFF;
+  }
+  .line-bg {
+    width: 100%;
+    height: 16px;
+    background: #F5F5F5;
+  }
+}
+</style>
diff --git a/src/project/police/AppPeopleList/DetailCard.vue b/src/project/police/AppPeopleList/DetailCard.vue
new file mode 100644
index 00000000..8ba8735a
--- /dev/null
+++ b/src/project/police/AppPeopleList/DetailCard.vue
@@ -0,0 +1,222 @@
+<template>
+  <div class="DetailCard">
+    <div class="top"></div>
+
+    <div class="middle">
+      <div class="hint">家庭地址</div>
+
+      <div class="areaHint">
+        <u-icon name="map-fill" color="#73ABFF"></u-icon>
+        <span>{{resident.currentAreaName}}{{resident.currentAddress || ''}}</span>
+      </div>
+    </div>
+
+    <div class="bottom">
+      <div class="hints">家庭成员 {{ data.family && data.family.length }}人</div>
+
+      <div v-if="data.family && data.family.length > 0">
+        <div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)">
+          <div class="photos">
+            <img :src="item.photo" alt="" v-if="item.photo" />
+            <img src="./components/img/44.png" alt="" v-else />
+          </div>
+
+          <div class="right">
+            <div class="rightTop">
+              <div class="rightTop-lefts">
+                <span class="names">{{ item.name }}</span>
+                <span class="fileStatuss" v-if="item.fileStatus == 1"> 已注销</span>
+                <span class="householdNames" v-if="item.householdName == 1">户主</span>
+                <span class="householdNames" v-else>
+                  {{ $dict.getLabel('householdRelation', item.householdRelation) }}
+                </span>
+              </div>
+
+              <div class="rightTop-rights">
+                <u-section :show-line="false" sub-title="详情"></u-section>
+              </div>
+            </div>
+
+            <div class="rightBottom">
+              <span>身份证号：</span>
+              <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
+            </div>
+            <!-- <div class="spacial" v-if="item.idNumber == data.resident.idNumber">
+              <span v-for="(e,index) in spacialList" :key="index">{{e.applicationName}}</span>
+            </div> -->
+          </div>
+        </div>
+      </div>
+
+      <AiEmpty v-else></AiEmpty>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DetailCard',
+  components: {},
+  props: {},
+  data() {
+    return {
+      id: '',
+      data: [],
+      resident: {},
+      // spacialList: [],
+    }
+  },
+  computed: {},
+  watch: {},
+  onLoad(o) {
+    this.id = o.id
+    this.$dict.load('householdRelation', 'fileStatus').then(() => {
+      this.getDetail()
+    })
+  },
+  onShow() {
+    document.title = '居民档案'
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.data = res.data
+          this.$forceUpdate()
+          this.$nextTick(() => {
+            this.resident = res.data.resident
+            // this.spacialList = res.data.resident.tsrqInfos
+            this.$forceUpdate()
+          })
+        }
+      })
+    },
+
+    toDetailPeople(item) {
+      uni.navigateTo({ url: `./DetailPeople?id=${item.id}&type=0` })
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.DetailCard {
+  height: 100%;
+  .top {
+    height: 112px;
+    background: #3975c6;
+  }
+
+  .middle {
+    margin: -80px 32px 0 32px;
+    padding: 38px 30px 78px 28px;
+    background: #ffffff;
+    box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
+    border-radius: 16px;
+    z-index: 999;
+    .hint {
+      font-size: 32px;
+      font-weight: 500;
+      color: #333333;
+    }
+    .areaHint {
+      margin-top: 38px;
+      span {
+        margin-left: 14px;
+      }
+    }
+  }
+
+  .bottom {
+    margin: 32px 30px 48px 30px;
+    background: #fff;
+    padding: 38px 30px 30px 30px;
+    .hints {
+      margin-bottom: 38px;
+    }
+    .card {
+      display: flex;
+      box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.08);
+      border-radius: 16px;
+      padding: 48px 32px;
+      margin-bottom: 32px;
+      .photos {
+        img {
+          width: 96px;
+          height: 96px;
+          border-radius: 50%;
+        }
+      }
+
+      .right {
+        display: flex;
+        flex-direction: column;
+        margin-left: 40px;
+        width: 100%;
+        .rightTop {
+          display: flex;
+          justify-content: space-between;
+          .rightTop-lefts {
+            .names {
+              font-size: 32px;
+              font-weight: 600;
+            }
+            .householdNames {
+              margin-left: 30px;
+              font-size: 26px;
+              font-weight: 500;
+              color: #5aad6a;
+            }
+            .fileStatuss {
+              display: inline-block;
+              margin-left: 30px;
+              color: #ff4466;
+              background: #ffecef;
+              border-radius: 8px;
+              width: 88px;
+              height: 40px;
+              line-height: 40px;
+              text-align: center;
+            }
+          }
+          .rightTop-rights {
+            ::v-deep .u-section {
+              .u-section__right-info {
+                color: #3975c6 !important;
+                .u-section__right-info__icon-arrow {
+                  .u-icon {
+                    .u-icon__icon {
+                      color: #3975c6 !important;
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+        .rightBottom {
+          margin-top: 20px;
+        }
+        // .spacial {
+        //   margin-top: 10px;
+        //   white-space: wrap;
+        //   span {
+        //     margin-right: 10px;
+        //     color: #ff4466;
+        //   }
+        // }
+      }
+    }
+    .card:nth-child(2n-1) {
+      // background: royalblue;
+      background: url(http://respub.sinoecare.net/20211222/装饰-20211222162743.png) no-repeat;
+      background-size: 100% 100%;
+    }
+    .card:nth-child(2n) {
+      // background: pink;
+      background: url(http://respub.sinoecare.net/20211222/装饰2-20211222162934.png) no-repeat;
+      background-size: 100% 100%;
+    }
+  }
+}
+</style>
diff --git a/src/project/police/AppPeopleList/DetailPeople.vue b/src/project/police/AppPeopleList/DetailPeople.vue
new file mode 100644
index 00000000..50cb2582
--- /dev/null
+++ b/src/project/police/AppPeopleList/DetailPeople.vue
@@ -0,0 +1,404 @@
+<template>
+  <div class="DetailPeople" v-if="data.resident">
+
+    <div class="top">
+      <div class="photos">
+        <img :src="data.resident.photo" alt="" v-if="data.resident && data.resident.photo" />
+        <img src="./components/img/44.png" alt="" v-else />
+      </div>
+
+      <div class="right">
+        <div class="rightTop">
+          <span class="names">{{ data.resident && data.resident.name }}<span v-if="data.resident.fileStatus == 1" class="fileStatuss"> 已注销 </span></span>
+          <span class="householdNames" v-if="data.resident && data.resident.householdName == 1">户主</span>
+          <span class="householdNames" v-else>
+            {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
+          </span>
+        </div>
+
+        <div class="rightBottom" v-if="data.resident && data.resident.phone">{{ data.resident.phone }}</div>
+      </div>
+    </div>
+
+    <div class="line"></div>
+
+    <div class="tab-list">
+      <div v-for="(item, index) in tabList" :key="index" :class="tabIndex == index ? 'tab-item active' : 'tab-item' " @click="tabIndex=index">
+        <div v-if="index == 0">
+          <img :src="item.activeIcon" alt="" v-if="tabIndex==0">
+          <img :src=" item.icon" alt="" v-if="tabIndex!=0">
+        </div>
+        <div v-if="index != 0">
+          <img src="./components/img/tsrq备份@2x.png" alt="" v-if="tabIndex==index && index != 0">
+          <img src="./components/img/tsrq@2x.png" alt="" v-if="tabIndex!=index && index != 0">
+        </div>
+        
+        <p v-if="index==0">{{item.name}}</p>
+        <p v-else class="type">{{item.applicationName}}</p>
+      </div>
+    </div>
+    <!-- 基本信息 -->
+    <div v-if="tabIndex == 0">
+      <div class="middle">
+      <div class="hint">个人基本信息</div>
+
+      <div class="contents">
+        <div class="item">
+          <span>籍贯</span>
+          <span>{{ data.resident && data.resident.birthplaceAreaName }}</span>
+        </div>
+
+        <div class="item">
+          <span>身份证号</span>
+          <span>{{ data.resident && data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
+        </div>
+
+        <div class="item">
+          <span>民族</span>
+          <span v-if="data.resident && data.resident.nation"> {{ $dict.getLabel('nation', data.resident.nation) }}</span>
+        </div>
+
+        <div class="item">
+          <span>文化程度</span>
+          <span v-if="data.resident && data.resident.education">{{ $dict.getLabel('education', data.resident.education) }}</span>
+        </div>
+
+        <div class="item">
+          <span>婚姻状况</span>
+          <span v-if="data.resident && data.resident.maritalStatus">{{ $dict.getLabel('maritalStatus', data.resident.maritalStatus) }}</span>
+        </div>
+
+        <div class="item">
+          <span>政治面貌</span>
+          <span v-if="data.resident && data.resident.politicsStatus">{{ $dict.getLabel('politicsStatus', data.resident.politicsStatus) }}</span>
+        </div>
+
+        <div class="item">
+          <span>兵役状况</span>
+          <span v-if="data.resident && data.resident.militaryStatus">{{ $dict.getLabel('militaryStatus', data.resident.militaryStatus) }}</span>
+        </div>
+
+        <div class="item">
+          <span>宗教信仰</span>
+          <span v-if="data.resident && data.resident.faithType">{{ $dict.getLabel('faithType', data.resident.faithType) }}</span>
+        </div>
+
+        <div class="item">
+          <span>职业</span>
+          <span v-if="data.resident && data.resident.job">{{ $dict.getLabel('job', data.resident.job) }}</span>
+        </div>
+      </div>
+    </div>
+
+    <div class="lines"></div>
+
+    <div class="bottom">
+      <div class="hint">联络信息</div>
+
+      <div class="contents">
+        <div class="item">
+          <span>联系方式</span>
+          <span class="phones" v-if="data.resident && data.resident.phone" @click="callPhone(data.resident.phone)">{{ data.resident.phone }}</span>
+        </div>
+
+        <div class="item">
+          <span class="label">现住址</span>
+          <span class="value" v-if="data.resident && data.resident.currentAreaName">{{ data.resident.currentAreaName }}</span>
+        </div>
+
+        <div class="item">
+          <span class="label">现住详细地址</span>
+          <span class="value" v-if="data.resident && data.resident.currentAddress">{{ data.resident.currentAddress }}</span>
+        </div>
+
+        <div class="item">
+          <span class="label">户籍地址</span>
+          <span class="value" v-if="data.resident && data.resident.householdAreaName">{{ data.resident.householdAreaName }}</span>
+        </div>
+
+        <div class="item">
+          <span class="label">户籍详细地址</span>
+          <span class="value" v-if="data.resident && data.resident.householdAddress">{{ data.resident.householdAddress }}</span>
+        </div>
+
+        <div class="item" v-if="type == 1 && data.resident.auditStatus != 0">
+          <span class="label">处理结果</span>
+          <span class="value">{{ data.resident.auditStatus == 1 ? '通过' : '不通过' }}</span>
+        </div>
+
+        <div class="item"  v-if="type == 1 && data.resident.auditStatus != 0">
+          <span class="label">原因</span>
+        </div>
+        <div class="item">{{data.resident.auditOpinion || ''}}</div>
+      </div>
+    </div>
+    </div>
+    <!-- 特殊人群 -->
+    <div v-if="tabIndex != 0 &&  tabList &&  tabList.length">
+      <div class="spacial" v-for="(item,index) in tabList" :key="index" v-if="tabIndex == index">
+        <div class="specialList" v-for="(t,indexs) in item.tableInfos" :key="indexs" v-if="item.tableInfos && item.tableInfos.length">
+          <div class="spacial-row">
+            <div>{{ t.fieldName }}</div>
+            <div>{{ t.fieldValue }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="pad-b112" v-if="data.resident.auditStatus == 0 && type == 1"></div>
+    <div class="footer" v-if="data.resident.auditStatus == 0 && type == 1">
+      <div @click="toContent">不通过</div>
+      <div class="pass" @click="examine(1)">通过</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DetailPeople',
+  components: {},
+  props: {},
+  data() {
+    return {
+      id: '',
+      data: [],
+      type: 0, //0查看详情  1审核详情
+      tabList:[],
+      tabIndex: 0,
+    }
+  },
+  computed: {},
+  watch: {},
+  onLoad(o) {
+    this.id = o.id
+    this.type = o.type
+    this.$dict.load('householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'job', 'fileStatus').then(() => {
+      this.getDetail()
+    })
+    uni.$on('updatePeople', res => {
+      this.getDetail()
+    })
+  },
+  onShow() {
+    document.title = '家庭成员信息'
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.data = res.data
+          if (res.data.resident.tsrqInfos) {
+          this.tabList = res.data.resident.tsrqInfos
+          let info = {
+            icon: require('./components/img/icon1n@2x.png'),
+            activeIcon:  require('./components/img/icon1h@2x.png'),
+            name: '基本信息',
+          }
+          this.tabList.unshift(info)
+          } else {
+            this.tabList =[{
+              icon: require('./components/img/icon1n@2x.png'),
+              activeIcon:  require('./components/img/icon1h@2x.png'),
+              name: '基本信息',
+            }]
+          }
+        }
+      })
+    },
+    callPhone(phone) {
+      uni.makePhoneCall({ phoneNumber: phone })
+    },
+    examine(pass) {
+      this.$confirm('确认通过该审核？').then(() => {
+        this.$http.post(`/app/appresident/examine?id=${this.id}&pass=${pass}`).then((res) => {
+          if (res.code == 0) {
+            uni.$emit('updatePeople')
+            this.$u.toast('审核成功')
+            setTimeout(() => {
+              uni.navigateBack()
+            }, 600)
+          }
+        })
+      })
+      
+    },
+    toContent() {
+      uni.navigateTo({url: `./Content?id=${this.id}`})
+    }
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.DetailPeople {
+  height: 100%;
+  background: #fff;
+  .top {
+    display: flex;
+    padding: 48px 32px 32px 32px;
+    .photos {
+      img {
+        width: 112px;
+        height: 112px;
+        border-radius: 50%;
+      }
+    }
+    .right {
+      display: flex;
+      flex-direction: column;
+      width: 100%;
+      margin-left: 24px;
+      .rightTop {
+        display: flex;
+        justify-content: space-between;
+        .fileStatuss {
+          display: inline-block;
+          margin-left: 30px;
+          color: #ff4466;
+          background: #ffecef;
+          border-radius: 8px;
+          width: 120px;
+          height: 40px;
+          line-height: 40px;
+          text-align: center;
+          font-weight: 400;
+          font-size: 28px;
+        }
+        .names {
+          font-size: 32px;
+          font-weight: 600;
+        }
+        .householdNames {
+          margin-left: 30px;
+          font-size: 26px;
+          font-weight: 500;
+          color: #5aad6a;
+        }
+      }
+      .rightBottom {
+        margin-top: 16px;
+      }
+    }
+  }
+
+  .tab-list{
+  padding-top: 32px;
+  display: flex;
+  word-wrap: nowrap;
+  overflow-x: scroll;
+  -webkit-overflow-scrolling: touch;
+  .tab-item{
+    display: inline-block;
+    width: 148px;
+    height: 136px;
+    background-color: #F8F9FB;
+    border-radius: 8px;
+    text-align: center;
+    margin-left: 32px;
+    img{
+      width: 40px;
+      height: 40px;
+      margin-top: 30px;
+    }
+    p{
+      font-size: 22px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #C5C9CD;
+      line-height: 32px;
+      margin-top: 8px;
+    }
+  }
+  .type {
+    padding: 0 10px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space:nowrap;
+  }
+  .active{
+    background-color: #357CE3;
+    p{
+      color: #fff;
+    }
+  }
+}
+
+  .line {
+    height: 8px;
+    background: #f5f5f5;
+  }
+
+  .middle,
+  .bottom {
+    padding: 0 32px;
+
+    .hint {
+      font-weight: 600;
+      padding: 32px 0;
+    }
+
+    .contents {
+      .item {
+        display: flex;
+        justify-content: space-between;
+        padding: 14px 0;
+        .phones {
+          color: #3d94fb;
+        }
+        .label{
+          width: 200px;
+        }
+        .value{
+          width: calc(100% - 200px);
+          text-align: right;
+          word-break: break-all;
+        }
+      }
+    }
+  }
+
+  .lines {
+    height: 4px;
+    background: #f5f5f5;
+  }
+
+  .spacial {
+    margin-top: 30px;
+    .specialList {
+      padding: 14px 32px;
+      .spacial-row {
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+  }
+
+  .pad-b112{
+    padding-bottom: 112px;
+    background-color: #f5f5f5;
+  }
+  .footer {
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 99999;
+    display: flex;
+    font-size: 32px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    div{
+      flex: 1;
+      background: #fff;
+      color: #FF4466;
+    }
+
+    .pass {
+      background: #1365DD;
+      color: #FFF;
+    }
+  }
+}
+</style>
diff --git a/src/project/police/AppPeopleList/ExamineList.vue b/src/project/police/AppPeopleList/ExamineList.vue
new file mode 100644
index 00000000..1266b12c
--- /dev/null
+++ b/src/project/police/AppPeopleList/ExamineList.vue
@@ -0,0 +1,276 @@
+<template>
+  <div class="ExamineList">
+    <AiTopFixed>
+      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#CDDCF0" bar-width="48" active-color="#fff " @change="change"></u-tabs>
+      <div class="middle">
+        <div class="left">
+          <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #666">
+            <u-icon name="map-fill" color="#3192F4" size="20px" style="vertical-align: text-bottom"></u-icon>
+            <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
+            <span v-else>请选择</span>
+            <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
+          </AiAreaPicker>
+        </div>
+        <u-search v-model="keyword" :clearabled="true" placeholder="姓名/联系方式/身份证后6位" :show-action="false" bg-color="#F5F5F5" search-icon-color="#999" color="#999" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+      </div>
+    </AiTopFixed>
+    <div v-if="datas && datas.length > 0" class="list-content">
+      <div class="card" v-for="(item, i) in datas" :key="i" @click="toDetailPeople(item)">
+        <div class="photos">
+          <img :src="item.photo" alt="" v-if="item.photo" />
+          <img src="./components/img/44.png" alt="" v-else />
+        </div>
+        <div class="right">
+          <div class="rightTop">
+            <div class="rightTop-lefts">
+              <span class="names">{{ item.name }}</span>
+              <span class="fileStatuss" v-if="item.fileStatus == 1"> {{ $dict.getLabel('fileStatus', item.fileStatus) }}</span>
+              <span class="householdNames" v-if="item.householdName == 1">户主</span>
+              <span class="householdNames" v-else>非户主</span>
+              <span class="audit-status" :class="'status'+item.auditStatus">{{ $dict.getLabel('auditStatus', item.auditStatus) }}</span>
+            </div>
+
+            <div class="rightTop-rights">
+              <u-section :show-line="false" sub-title="详情"></u-section>
+            </div>
+          </div>
+
+          <div class="rightBottom">
+            <span>身份证号：</span>
+            <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <AiEmpty v-else></AiEmpty>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: 'ExamineList',
+  components: {},
+  props: {},
+  data() {
+    return {
+      id: '',
+      datas: [],
+      resident: {},
+      areaId: '',
+      areaName: '',
+      tabList: [
+        {
+          name: '待处理',
+        },
+        {
+          name: '已处理',
+        },
+      ],
+      currentTabs: 0,
+      keyword: ''
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad() {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+    this.$dict.load('householdRelation', 'auditStatus').then(() => {
+      this.getList()
+    })
+    uni.$on('updatePeople', () => {
+      this.getListInit()
+    })
+  },
+  onShow() {
+    document.title = '居民档案审核'
+  },
+  methods: {
+    getListInit() {
+      this.current = 1
+      this.datas = []
+      this.getList()
+    },
+    getList() {
+      var auditType = 0 // 0待处理; 2已处理
+      if(this.currentTabs == 1) {
+        auditType = 2
+      }
+      this.$http.post('/app/appresident/list', null, {
+        params: {
+          size: 10,
+          current: this.current,
+          con: this.keyword,
+          areaId: this.areaId,
+          auditType,
+          source: 1
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+
+          this.pages = res.data.pages
+        }
+      })
+    },
+
+    change(index) {
+      this.currentTabs = index
+      this.getListInit()
+    },
+
+    toDetailPeople(item) {
+      uni.navigateTo({ url: `./DetailPeople?id=${item.id}&type=1` })
+    },
+
+    areaSelect(e) {
+      this.areaId = e
+      this.getListInit()
+    },
+
+    handerSearch(e) {
+      this.keyword = e
+      this.getListInit()
+    },
+
+    handerClear() {
+      this.keyword = ''
+      this.getListInit()
+    },
+  },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getList()
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.ExamineList {
+  height: 100%;
+  .list-content{
+    padding: 0 60px;
+    background-color: #fff;
+  }
+  .card {
+    display: flex;
+    box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.08);
+    border-radius: 16px;
+    padding: 48px 32px;
+    margin-bottom: 32px;
+    background: url(http://respub.sinoecare.net/20211222/装饰2-20211222162934.png) no-repeat;
+    background-size: 100% 100%;
+    .photos {
+      img {
+        width: 96px;
+        height: 96px;
+        border-radius: 50%;
+      }
+    }
+
+    .right {
+      display: flex;
+      flex-direction: column;
+      margin-left: 40px;
+      width: 100%;
+      .rightTop {
+        display: flex;
+        justify-content: space-between;
+        .rightTop-lefts {
+          width: calc(100% - 100px);
+          .names {
+            font-size: 32px;
+            font-weight: 600;
+            word-break: break-all;
+          }
+          .householdNames {
+            margin-left: 30px;
+            font-size: 26px;
+            font-weight: 500;
+            color: #5aad6a;
+            display: inline-block;
+            width: 100px;
+          }
+          .fileStatuss {
+            display: inline-block;
+            margin-left: 30px;
+            color: #ff4466;
+            background: #ffecef;
+            border-radius: 8px;
+            width: 88px;
+            height: 40px;
+            line-height: 40px;
+            text-align: center;
+          }
+        }
+        .rightTop-rights {
+          width: 100px;
+          ::v-deep .u-section {
+            .u-section__right-info {
+              color: #3975c6 !important;
+              .u-section__right-info__icon-arrow {
+                .u-icon {
+                  .u-icon__icon {
+                    color: #3975c6 !important;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      .rightBottom {
+        margin-top: 20px;
+      }
+    }
+  }
+  .middle {
+    display: flex;
+    padding: 24px 32px;
+    .left {
+      width: 220px;
+      display: flex;
+      align-items: center;
+
+      img {
+        width: 48px;
+        height: 48px;
+      }
+    }
+    .u-search {
+      margin-bottom: 0 !important;
+    }
+  }
+
+  ::v-deep .content{
+    padding: 0;
+  }
+
+  .audit-status{
+    display: inline-block;
+    padding: 0 8px;
+    line-height: 40px;
+    background: #EAF0FE;
+    border-radius: 8px;
+    font-size: 24px;
+    font-family: PingFangSC-Regular, PingFang SC;
+  }
+  .status1{
+    color: #3E95FF;
+    background-color: #EAF0FE;
+  }
+  .status0{
+    color: #5AAD6A;
+    background-color: #E9FFED;
+  }
+  .status2{
+    color: #f46;
+    background-color: #FFECEF;
+  }
+
+}
+</style>
diff --git a/src/project/police/AppPeopleList/PeopleList.vue b/src/project/police/AppPeopleList/PeopleList.vue
new file mode 100644
index 00000000..147bcfb8
--- /dev/null
+++ b/src/project/police/AppPeopleList/PeopleList.vue
@@ -0,0 +1,320 @@
+<template>
+  <div class="PeopleList">
+    <AiTopFixed>
+      <div class="areatop">
+        <!-- <div>区域选择</div>
+        <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
+        <u-icon name="photo"></u-icon> -->
+        <!-- @select="areaSelect" -->
+        <u-form label-width="auto">
+          <u-form-item label="区域选择" right-icon="arrow-right" class="areaIds">
+            <AiAreaPicker v-model="areaId" :areaId="user.areaId" @input="seachObj" :name.sync="areaName" selectRoot/>
+          </u-form-item>
+        </u-form>
+      </div>
+
+      <div class="line"></div>
+
+      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" @change="change"></u-tabs>
+
+      <div class="seachObjs">
+        <u-search v-model="keyword" :clearabled="true" placeholder="姓名/联系方式/身份证后6位" :show-action="false"
+                  bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch"
+                  @clear="handerClear"></u-search>
+      </div>
+    </AiTopFixed>
+    <div class="dataes" v-if="datas.length > 0">
+      <div class="datass" v-for="(item, iindex) in datas" :key="iindex" @click="toDetailCard(item)">
+        <div class="left">
+          <img :src="item.photo" alt="" v-if="item.photo"/>
+          <img src="./components/img/4.png" alt="" v-else/>
+        </div>
+
+        <div class="right">
+          <div class="rightTop">
+            <span class="name">{{ item.name }}</span>
+            <span class="btn" v-if="user.id == item.createUserId">
+              <img src="./components/img/edit-icon.png" alt="" @click.stop="edit(item.id)">
+              <img src="./components/img/del-icon.png" alt="" @click.stop="del(item.id)">
+            </span>
+          </div>
+          <div class="rightBottom">
+            <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</span>
+
+            <span>{{ item.phone }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="empty" v-else>
+      <img src="https://cdn.cunwuyun.cn/dvcp/h5/no-data.png" alt="">
+      <p>暂无居民信息<br/>点击<span @click="edit('')">新增按钮</span>新增居民信息,也可在管理系统批量导入</p>
+    </div>
+    <!-- <AiEmpty class="emptyWrap" v-else></AiEmpty> -->
+    <div style="height: 60px"></div>
+    <div class="addBtn" @click="edit('')">新增居民</div>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: 'PeopleList',
+  props: {},
+  data() {
+    return {
+      keyword: '',
+      datas: [],
+      current: 1,
+      size: 10,
+      tabList: [
+        {
+          name: '全部居民',
+        },
+        {
+          name: '本地居民',
+        },
+        {
+          name: '流动人员',
+        },
+      ],
+      currentTabs: 0,
+      areaId: '',
+      areaName: '',
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  watch: {},
+  onLoad() {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+    uni.$on('reload', () => {
+      this.current = 1
+      this.getList()
+    })
+    this.getList()
+  },
+  onShow() {
+    document.title = '查看居民档案'
+  },
+  methods: {
+    getList() {
+      var residentType = ['', 0, 1][this.currentTabs]
+      this.$http
+      .post('/app/appresident/list', null, {
+        params: {
+          size: 20,
+          current: this.current,
+          con: this.keyword,
+          areaId: this.areaId,
+          residentType: residentType,
+          auditStatus: 1
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+
+          this.pages = res.data.pages
+        }
+      })
+    },
+
+    change(index) {
+      this.currentTabs = index
+      this.current = 1
+      this.datas = []
+      this.getList()
+    },
+
+    toDetailCard(item) {
+      uni.navigateTo({url: `./DetailCard?id=${item.id}`})
+    },
+
+    seachObj(e) {
+      this.areaId = e
+      this.current = 1
+      this.getList()
+    },
+
+    handerSearch(e) {
+      this.keyword = e
+      this.current = 1
+      this.getList()
+    },
+
+    handerClear() {
+      this.keyword = ''
+      this.current = 1
+      this.getList()
+    },
+    edit(id) {
+      var residentType = ['', 0, 1][this.currentTabs]
+      uni.navigateTo({url: `./Add?id=${id}&type=${residentType}`})
+    },
+    del(id) {
+      this.$confirm('确定删除该数据?').then(() => {
+        uni.showLoading()
+        this.$http.post(`/app/appresident/delete?ids=${id}`).then((res) => {
+          if (res.code == 0) {
+            this.$u.toast('删除成功！')
+            this.current = 1
+            this.getList()
+          }
+          uni.hideLoading()
+        })
+      }).catch(() => {
+      })
+    }
+  },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getList()
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.PeopleList {
+  height: 100%;
+
+  .areatop {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .line {
+    height: 16px;
+    background: #f5f5f5;
+  }
+
+  .seachObjs {
+    border-bottom: 2px solid #f5f5f5;
+    border-top: 2px solid #f5f5f5;
+    padding: 20px 32px;
+    background: #fff;
+  }
+
+  ::v-deep .u-form {
+    width: 100%;
+
+    .areaIds {
+      .u-form-item__body {
+        .u-form-item--right {
+          .u-form-item--right__content {
+            display: flex;
+            align-items: center;
+
+            .u-form-item--right__content__slot {
+              .AiAreaPicker {
+                width: 100%;
+                display: flex;
+                justify-content: flex-end;
+
+                .areaSelector {
+                  .location {
+                    opacity: 0;
+                  }
+                }
+              }
+            }
+
+            .u-form-item--right__content__icon {
+              margin-bottom: 8px;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .dataes {
+    background: #fff;
+
+    .datass {
+      display: flex;
+      padding: 24px 32px;
+
+      .left {
+        img {
+          width: 80px;
+          height: 80px;
+          border-radius: 50%;
+        }
+      }
+
+      .right {
+        display: flex;
+        flex-direction: column;
+        margin-left: 32px;
+        width: 100%;
+
+        .rightTop {
+          font-size: 32px;
+          font-weight: 500;
+          color: #333333;
+          display: flex;
+          justify-content: space-between;
+
+          .btn {
+            img {
+              width: 48px;
+              height: 48px;
+              margin-left: 40px;
+            }
+          }
+        }
+
+        .rightBottom {
+          display: flex;
+          justify-content: space-between;
+          margin-top: 8px;
+        }
+      }
+    }
+  }
+
+  .emptyWrap {
+    background: #f5f5f5;
+    margin: 0;
+  }
+
+  .addBtn {
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #1365DD;
+    text-align: center;
+    color: #FFF;
+    font-size: 32px;
+    position: fixed;
+    bottom: 0;
+  }
+
+  .empty {
+    height: 100%;
+
+    img {
+      width: 282px;
+      height: 306px;
+      margin: 168px 0 0 234px;
+    }
+
+    p {
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 44px;
+
+      span {
+        color: #467DFE;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/police/AppPeopleList/components/img/4.png b/src/project/police/AppPeopleList/components/img/4.png
new file mode 100644
index 00000000..d7cee623
Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/4.png differ
diff --git a/src/project/police/AppPeopleList/components/img/44.png b/src/project/police/AppPeopleList/components/img/44.png
new file mode 100644
index 00000000..ae49d85f
Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/44.png differ
diff --git a/src/project/police/AppPeopleList/components/img/blue-bg.png b/src/project/police/AppPeopleList/components/img/blue-bg.png
new file mode 100644
index 00000000..ca1d392b
Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/blue-bg.png differ
diff --git a/src/project/police/AppPeopleList/components/img/del-icon.png b/src/project/police/AppPeopleList/components/img/del-icon.png
new file mode 100644
index 00000000..b3424dac
Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/del-icon.png differ
diff --git a/src/project/police/AppPeopleList/components/img/edit-icon.png b/src/project/police/AppPeopleList/components/img/edit-icon.png
new file mode 100644
index 00000000..30a07533
Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/edit-icon.png differ
diff --git a/src/project/police/AppPeopleList/components/img/green-bg.png b/src/project/police/AppPeopleList/components/img/green-bg.png
new file mode 100644
index 00000000..d8de7d1f
Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/green-bg.png differ
diff --git a/src/project/police/AppPeopleList/components/img/icon1h@2x.png b/src/project/police/AppPeopleList/components/img/icon1h@2x.png
new file mode 100644
index 00000000..c245cabd
Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/icon1h@2x.png differ
diff --git a/src/project/police/AppPeopleList/components/img/icon1n@2x.png b/src/project/police/AppPeopleList/components/img/icon1n@2x.png
new file mode 100644
index 00000000..556b0245
Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/icon1n@2x.png differ
diff --git a/src/project/police/AppPeopleList/components/img/right-icon.png b/src/project/police/AppPeopleList/components/img/right-icon.png
new file mode 100644
index 00000000..58a59c4d
Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/right-icon.png differ
diff --git a/src/project/police/AppPeopleList/components/img/tsrq@2x.png b/src/project/police/AppPeopleList/components/img/tsrq@2x.png
new file mode 100644
index 00000000..34f11370
Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/tsrq@2x.png differ
diff --git a/src/project/police/AppPeopleList/components/img/tsrq备份@2x.png b/src/project/police/AppPeopleList/components/img/tsrq备份@2x.png
new file mode 100644
index 00000000..4e215d2a
Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/tsrq备份@2x.png differ
diff --git a/src/project/police/AppResidentFile/AppResidentFile.vue b/src/project/police/AppResidentFile/AppResidentFile.vue
new file mode 100644
index 00000000..2652b965
--- /dev/null
+++ b/src/project/police/AppResidentFile/AppResidentFile.vue
@@ -0,0 +1,369 @@
+<template>
+  <div class="AppResidentFile">
+    <div class="currentTabBar1">
+      <AiTopFixed>
+        <u-search placeholder="请输入昵称、姓名" :show-action="false" search-icon-color="#ccc" v-model="search.name" @search=";(page1.current = 1), getList()" />
+        <AiCell>
+          <b slot="label" class="title">共<i v-html="page1.total || 0" />个居民</b>
+        </AiCell>
+      </AiTopFixed>
+      <div class="mainPane">
+        <AiCell v-for="item in data" :key="item.id" @click.native="showResident(item)">
+          <template #label>
+            <AiImage :src="item.avatar" preview />
+          </template>
+          <div class="card wrap start" flex>
+            <b>{{ item.name }}</b>
+            <div flex class="tag" v-for="(tag, j) in item.tags" :key="j">{{ tag.tagName }}</div>
+            <div class="realName" shrink v-html="`真实姓名：${item.realName || '-'}`" />
+          </div>
+        </AiCell>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'AppResidentFile',
+  appName: '居民信息管理',
+  data() {
+    return {
+      areaId: '',
+      current: 1,
+      data: [],
+      search: { name: '' },
+      page1: { current: 1, size: 10, total: 0 },
+    }
+  },
+  computed: {
+    ...mapState(['user', 'global']),
+  },
+  onLoad() {
+    document.title = '居民信息管理'
+    this.getList()
+    this.areaId = this.user.areaId
+  },
+  methods: {
+    // 居民列表
+    getList() {
+      this.$http.post('/app/wxcp/wxcustomer/list', null, {
+        params: { ...this.page1, ...this.search, type: 1 },
+      })
+      .then((res) => {
+        if (res?.data) {
+          if (this.page1.current > 1) {
+            this.data = [...this.data, ...res.data.records]
+          } else this.data = res.data.records
+          this.page1.total = res.data.total
+        }
+      })
+    },
+    showResident({ id }) {
+      id &&
+        uni.navigateTo({
+          url: './resident?id=' + id,
+        })
+    },
+  },
+  onReachBottom() {
+    this.page1.current++
+    this.getList()
+  },
+}
+</script>
+
+<style scoped lang="scss">
+uni-page-body {
+  height: 100%;
+}
+.AppResidentFile {
+  height: 100%;
+
+  .currentTabBar0 {
+    padding-bottom: 98px;
+    .peopleGroup,
+    .people {
+      .topcard {
+        position: relative;
+        background: url(http://respub.sinoecare.net/20211221/4-20211221095551.png) no-repeat;
+        background-size: 100% 100%;
+        height: 320px;
+        .cards {
+          box-sizing: border-box;
+          position: absolute;
+          bottom: -35px;
+          width: 92%;
+          box-sizing: border-box;
+          margin: 0 32px;
+          height: 232px;
+          background: #ffffff;
+          border-radius: 8px;
+          z-index: 999;
+          display: flex;
+          justify-content: space-around;
+          align-items: center;
+          .items {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            span {
+              font-size: 30px;
+              font-weight: 500;
+              color: #999999;
+            }
+            .items1 {
+              font-size: 40px;
+              font-weight: bold;
+              color: #354fc7;
+            }
+            .items2 {
+              font-size: 40px;
+              font-weight: bold;
+              color: #868686;
+            }
+            .items3 {
+              font-size: 40px;
+              font-weight: bold;
+              color: #5fba95;
+            }
+            .items4 {
+              font-size: 40px;
+              font-weight: bold;
+              color: #f09535;
+            }
+          }
+        }
+      }
+
+      .echartes {
+        margin-top: 64px;
+        padding-bottom: 20px;
+        height: 616px;
+        background: #fff;
+        box-sizing: border-box;
+
+        .echartss {
+          margin: 0 32px;
+          height: 100%;
+          padding-top: 16px;
+          box-sizing: border-box;
+        }
+      }
+    }
+  }
+
+  .currentTabBar1 {
+    height: 100%;
+    padding-bottom: 98px;
+    background: #fff;
+    ::v-deep .AiTopFixed {
+      b.title {
+        color: #333;
+        font-size: 32px;
+
+        & > i {
+          color: #267fce;
+          font-style: normal;
+          margin: 0 4px;
+        }
+      }
+    }
+
+    ::v-deep .mainPane {
+      background: #fff;
+      padding: 0 32px 88px;
+
+      .AiCell {
+        flex-shrink: 0;
+        justify-content: flex-start;
+
+        .content {
+          flex: 1;
+          min-width: 0;
+          max-width: unset;
+          border-bottom: 1px solid rgba(221, 221, 221, 1);
+          min-height: 160px;
+        }
+      }
+
+      .card {
+        text-align: left;
+
+        b {
+          max-width: 100%;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          font-size: 36px;
+        }
+
+        .tag {
+          justify-content: center;
+          background: #f3f4f7;
+          border-radius: 4px;
+          padding: 0 16px;
+          font-size: 28px;
+          font-weight: 400;
+          color: #333;
+          margin-left: 16px;
+          margin-bottom: 16px;
+          height: 56px;
+        }
+
+        .realName {
+          width: 100%;
+          margin-top: 8px;
+          font-size: 28px;
+          font-weight: 400;
+          color: #999;
+        }
+      }
+
+      .AiImage {
+        margin-right: 24px;
+
+        image {
+          width: 112px;
+          height: 112px;
+        }
+      }
+    }
+  }
+
+  .currentTabBar2 {
+    padding-bottom: 98px;
+    ::v-deep .AiTopFixed {
+      b.title {
+        color: #333;
+        font-size: 32px;
+
+        & > i {
+          color: #267fce;
+          font-style: normal;
+          margin: 0 4px;
+        }
+      }
+    }
+
+    ::v-deep .mainPane {
+      background: #fff;
+      padding: 0 32px;
+
+      .AiCell {
+        align-items: center;
+        height: 230px;
+        justify-content: flex-start;
+
+        .content {
+          flex: 1;
+          min-width: 0;
+          height: 100%;
+          max-width: unset;
+          border-bottom: 1px solid rgba(221, 221, 221, 1);
+        }
+      }
+
+      .card {
+        height: 100%;
+        justify-content: center;
+
+        b {
+          font-size: 36px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .tag {
+          justify-content: center;
+          background: #f3f4f7;
+          border-radius: 4px;
+          padding: 0 16px;
+          font-size: 28px;
+          font-weight: 400;
+          color: #333;
+          margin-left: 16px;
+          height: 56px;
+        }
+
+        .groupName {
+          width: 100%;
+          text-align: left;
+        }
+
+        .owner,
+        .trends {
+          margin-top: 8px;
+          font-size: 28px;
+          font-weight: 400;
+          color: #999;
+        }
+
+        .personCount {
+          flex-shrink: 0;
+          font-size: 30px;
+          font-weight: 400;
+          color: #666;
+        }
+
+        .trends {
+          * + * {
+            margin-left: 24px;
+          }
+
+          em {
+            font-style: normal;
+            color: #5fba95;
+          }
+
+          p {
+            color: #f09535;
+          }
+        }
+      }
+
+      .AiImage {
+        margin-right: 24px;
+
+        image {
+          width: 112px;
+          height: 112px;
+        }
+      }
+    }
+  }
+
+  .tabs {
+    width: 100%;
+    height: 98px;
+    background: #fff;
+    border-top: 1px solid #ddd;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    display: flex;
+    .item {
+      flex: 1;
+      text-align: center;
+      img {
+        width: 56px;
+        height: 56px;
+        margin-top: 8px;
+      }
+      p {
+        font-size: 22px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #c4cad4;
+        line-height: 8px;
+      }
+      .color-3267F0 {
+        color: #3267f0;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/police/AppResidentFile/GroupList.vue b/src/project/police/AppResidentFile/GroupList.vue
new file mode 100644
index 00000000..8103db9c
--- /dev/null
+++ b/src/project/police/AppResidentFile/GroupList.vue
@@ -0,0 +1,325 @@
+<template>
+  <div class="group-resident">
+    <template v-if="!showTagManage">
+      <AiTopFixed>
+        <div class="card">
+          <header>
+            <u-avatar mode="square" :src="$cdn + 'groupAvatar.png'" :size="112"></u-avatar>
+            {{ detail.name }}
+          </header>
+          <u-grid :col="2" :border="false">
+            <u-grid-item>
+              <label>建群日期</label>
+              <label v-if="detail.createTime">{{ detail.createTime.split(' ')[0] }}</label>
+            </u-grid-item>
+            <u-grid-item>
+              <label>成员总数</label>
+              <label v-if="isToday">{{ detail.statistic.today.total }}</label>
+            </u-grid-item>
+            <u-grid-item>
+              <label>今日入群</label>
+              <label v-if="isToday">{{ detail.statistic.today.increase }}</label>
+            </u-grid-item>
+            <u-grid-item>
+              <label>今日退群</label>
+              <label v-if="isToday">{{ detail.statistic.today.decrease }}</label>
+            </u-grid-item>
+            <!--          <u-grid-item>-->
+            <!--            <label>今日活跃人数</label>-->
+            <!--            <label>{{item.value}}</label>-->
+            <!--          </u-grid-item>-->
+          </u-grid>
+          <p class="statistics">
+            <span>成员性别：</span>
+            <label>男性</label>
+            <b>{{ detail.man }}</b>
+            <label>女性</label>
+            <b>{{ detail.woman }}</b>
+            <label>未知</label>
+            <b>{{ detail.unknown }}</b>
+          </p>
+        </div>
+      </AiTopFixed>
+
+      <div class="card">
+        <AiCell title label="群标签">
+          <u-icon label="添加" size="38" name="iconAdd" custom-prefix="iconfont" color="#1365DD" label-color="#1365DD" @tap="showTagManage = true" />
+        </AiCell>
+        <AiCell top-label v-for="(op, name) in tagsList" :label="name" :key="name">
+          <u-row>
+            <div class="tag" v-for="(tag, j) in op" :key="j">{{ tag }}</div>
+          </u-row>
+        </AiCell>
+      </div>
+
+      <div class="card">
+        <AiCell title label="群成员"></AiCell>
+        <div class="wrap">
+          <div class="item" v-for="(item, index) in detail.groupUserList" :key="index" @click="handleWechat(item)">
+            <u-avatar mode="square" :src="item.avatar"></u-avatar>
+            <div class="info">
+              <div class="left">
+                <p>
+                  {{ item.memberName }}
+                  <b v-if="item.customerType == 2" style="color: #3c7fc8">@{{ item.corpName }}</b>
+                  <b v-if="item.customerType == 1" style="color: #2ea222">@微信</b>
+                </p>
+                <p>真实姓名：{{ item.realName }}</p>
+              </div>
+              <span v-if="item.userId == detail.owner">群主</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </template>
+
+    <TagManage v-if="showTagManage" />
+  </div>
+</template>
+
+<script>
+import { mapActions } from 'vuex'
+import TagManage from './tagManage'
+
+export default {
+  name: 'GroupList',
+  components: {
+    TagManage,
+  },
+  props: {},
+  provide() {
+    return {
+      top: this,
+    }
+  },
+  data() {
+    return {
+      id: '',
+      detail: {},
+      groupId: null,
+      showTagManage: false,
+    }
+  },
+  onShow() {
+    document.title =  '添加标签' 
+  },
+  computed: {
+    tagsList() {
+      let obj = {}
+      this.detail?.tagList?.map((e) => {
+        if (e?.groupName) {
+          if (obj?.[e.groupName]) {
+            obj[e.groupName].push(e.tagName)
+          } else {
+            obj[e.groupName] = [e.tagName]
+          }
+        }
+      })
+      return obj
+    },
+    isToday() {
+      return !!this.detail?.statistic?.today
+    },
+    isNormal() {
+      return !!this.id
+    },
+  },
+  watch: {},
+  onLoad(o) {
+    this.id = o.id
+    this.getContact()
+  },
+  onShow() {},
+  methods: {
+    ...mapActions(['injectJWeixin', 'wxInvoke']),
+    getContact() {
+      if (this.isNormal) {
+        this.groupId = this.id
+        this.getGroup(this.id)
+      } else
+        this.injectJWeixin('getCurExternalChat').then(() => {
+          this.wxInvoke([
+            'getCurExternalChat',
+            {},
+            (res) => {
+              if (res?.err_msg == 'getCurExternalChat:ok') {
+                this.groupId = res.chatId
+                this.getGroup(res.chatId)
+              }
+            },
+          ])
+        })
+    },
+    getGroup(id) {
+      this.$http
+        .post('/app/wxcp/wxgroup/getDetail', null, {
+          params: { id },
+        })
+        .then((res) => {
+          if (res?.data) {
+            this.detail = res.data
+          }
+        })
+    },
+    handleWechat({ userId, type }) {
+      this.injectJWeixin('openUserProfile').then(() => {
+        this.wxInvoke([
+          'openUserProfile',
+          {
+            type,
+            userid: userId,
+          },
+          () => 0,
+        ])
+      })
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.group-resident {
+  width: 100%;
+  min-height: 100%;
+  background-color: #f5f5f5;
+  display: flex;
+  flex-direction: column;
+
+  ::v-deep .AiTopFixed {
+    & > .card {
+      margin-top: 0;
+    }
+  }
+
+  ::v-deep .card {
+    background-color: #ffffff;
+    padding: 16px 32px;
+    box-sizing: border-box;
+    margin-top: 16px;
+
+    header {
+      height: 192px;
+      display: flex;
+      align-items: center;
+      font-size: 36px;
+      font-weight: 600;
+      color: #333333;
+
+      .u-avatar {
+        margin-right: 24px;
+      }
+    }
+
+    ::v-deep .u-grid-item-box {
+      box-sizing: border-box;
+      padding: 16px !important;
+
+      .uni-label-pointer {
+        width: 100%;
+        line-height: 40px;
+        color: #999999;
+      }
+
+      uni-label:last-child {
+        margin-top: 16px;
+        font-weight: 600;
+        color: #333333;
+      }
+    }
+
+    .statistics {
+      height: 96px;
+      display: flex;
+      align-items: center;
+      border-top: 1px solid #eee;
+      margin-top: 16px;
+
+      span {
+        font-size: 28px;
+        color: #999999;
+      }
+
+      label + b {
+        font-size: 28px;
+        color: #333333;
+      }
+
+      b {
+        color: #1365dd !important;
+        margin: 0 32px 0 16px;
+      }
+    }
+
+    & > section:first-child {
+      height: 90px !important;
+      display: flex;
+      align-items: center;
+    }
+
+    .wrap {
+      margin-bottom: 20px;
+
+      .item {
+        height: 176px;
+        display: flex;
+        align-items: center;
+
+        .info {
+          width: 100%;
+          height: 100%;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          margin-left: 24px;
+          border-bottom: 1px solid #eee;
+
+          .left {
+            font-size: 36px;
+            font-weight: 600;
+            color: #333333;
+
+            b {
+              font-size: 28px;
+              font-weight: 400;
+              color: #3c7fc8;
+              margin-left: 16px;
+            }
+
+            p:last-child {
+              font-size: 28px;
+              font-weight: 400;
+              color: #999999;
+              margin-top: 8px;
+            }
+          }
+
+          span {
+            width: 88px;
+            height: 56px;
+            text-align: center;
+            background: rgba(19, 101, 221, 0.1);
+            box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.02);
+            border-radius: 4px;
+            font-size: 28px;
+            font-weight: 400;
+            color: #1365dd;
+            line-height: 56px;
+          }
+        }
+      }
+    }
+  }
+
+  ::v-deep .tag {
+    height: 56px;
+    line-height: 56px;
+    background: #f3f4f7;
+    border-radius: 6px;
+    padding: 8px 16px;
+    margin-right: 16px;
+    margin-bottom: 16px;
+    overflow: hidden;
+    cursor: default;
+  }
+}
+</style>
diff --git a/src/project/police/AppResidentFile/components/document.vue b/src/project/police/AppResidentFile/components/document.vue
new file mode 100644
index 00000000..77009751
--- /dev/null
+++ b/src/project/police/AppResidentFile/components/document.vue
@@ -0,0 +1,138 @@
+<template>
+  <section class="document" v-if="isShow">
+    <div class="card">
+      <div class="info">
+        <u-image border-radius="4" :src="top.detail.avatar" width="118" height="118" />
+        <div class="fill">
+          <b>{{ top.detail.realName || top.detail.name }}</b>
+          <u-row>
+            <span class="idNumber" v-html="IDObj.id" />
+            <a @tap="showID = !showID">{{ IDObj.btn }}</a>
+          </u-row>
+        </div>
+      </div>
+      <AiCell label="性别">{{ $dict.getLabel('sex', resident.sex) || '-' }}</AiCell>
+      <AiCell label="出生日期">{{ resident.birthDate }}</AiCell>
+      <AiCell label="年龄">{{ resident.age }}</AiCell>
+      <AiCell label="籍贯">{{ resident.birthplaceAreaName }}</AiCell>
+      <AiCell label="民族">{{ $dict.getLabel('nation', resident.nation) || '-' }}</AiCell>
+      <AiCell label="文化程度">{{ $dict.getLabel('education', resident.education) || '-' }}</AiCell>
+      <AiCell label="兵役状况">{{ $dict.getLabel('militaryStatus', resident.militaryStatus) || '-' }}</AiCell>
+      <AiCell label="政治面貌">{{ $dict.getLabel('politicsStatus', resident.politicsStatus) || '-' }}</AiCell>
+      <AiCell label="职业">{{ $dict.getLabel('job', resident.job) || '-' }}</AiCell>
+      <AiCell label="宗教信仰">{{ $dict.getLabel('faithType', resident.faithType) || '-' }}</AiCell>
+    </div>
+    <div class="card">
+      <AiCell title label="联络信息" />
+      <AiCell label="联系方式">{{ resident.phone }}</AiCell>
+      <AiCell label="现住址">{{ resident.currentAreaName + resident.currentAddress }}</AiCell>
+    </div>
+    <div class="card">
+      <AiCell title label="家庭信息" />
+      <AiCell label="是否户主">{{ $dict.getLabel('householdName', resident.householdName) || '-' }}</AiCell>
+      <AiCell label="与户主关系">{{ $dict.getLabel('householdRelation', resident.householdRelation) || '-' }}</AiCell>
+      <AiCell label="现住址">{{ resident.householdAreaName + resident.householdAddress }}</AiCell>
+    </div>
+    <div class="card">
+      <AiCell title label="家庭成员" />
+      <AiTable :data="family" :colConfigs="colConfigs" />
+    </div>
+  </section>
+</template>
+
+<script>
+export default {
+  name: 'document',
+  inject: ['top'],
+  computed: {
+    IDObj() {
+      return this.showID
+        ? {
+            id: this.resident?.idNumber,
+            btn: '隐藏',
+          }
+        : {
+            id: this.resident?.idNumber?.replace(/(\d{10}).+/g, '$1******'),
+            btn: '显示',
+          }
+    },
+    colConfigs() {
+      return [
+        { label: '与户主关系', prop: 'householdRelation', width: '160rpx', dict: 'householdRelation' },
+        { label: '姓名', prop: 'name', width: '120rpx' },
+        { label: '性别', prop: 'sex', dict: 'sex' },
+        { label: '年龄', prop: 'age' },
+        { label: '身份证号', prop: 'idNumber', width: '320rpx' },
+      ]
+    },
+    resident() {
+      let obj = {}
+      Object.keys(this.top.detail?.residentInfo?.resident || {}).map((e) => {
+        obj[e] = this.top.detail?.residentInfo?.resident[e] || ''
+      })
+      return obj
+    },
+    family() {
+      return this.top.detail?.residentInfo?.family?.map((e) => ({ ...e, householdRelation: e.householdRelation || '户主' }))
+    },
+  },
+  data() {
+    return {
+      showID: false,
+      isShow: false,
+      familyList: [],
+    }
+  },
+  created() {
+    this.$dict.load('sex', 'nation', 'education', 'job', 'faithType', 'politicsStatus', 'militaryStatus', 'householdRelation', 'householdName').then(() => {
+      this.isShow = true
+    })
+    // console.log('居民档案性别(无字典)', this.resident.sex)
+    // console.log('居民档案性别(有字典)', this.$dict.getLabel('sex', this.resident.sex))
+    // console.log('居民档案字典值', this.$dict.getDict('sex'))
+  },
+  onShow() {
+    // this.$dict.load('sex', 'nation', 'education', 'job', 'faithType', 'politicsStatus', 'militaryStatus', 'householdRelation', 'householdName')
+    document.title = '居民详情'
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.document {
+  overflow-y: auto;
+  background: #f5f5f5;
+
+  .info {
+    height: 186px;
+    width: 100%;
+    display: flex;
+    align-items: center;
+
+    .fill {
+      color: #3c7fc8;
+      margin-left: 24px;
+      font-size: 28px;
+      line-height: 40px;
+      display: flex;
+      flex-direction: column;
+
+      b {
+        font-size: 36px;
+        color: #333;
+        margin-bottom: 8px;
+        line-height: 50px;
+      }
+
+      a {
+        cursor: pointer;
+      }
+
+      .idNumber {
+        margin-right: 16px;
+        color: #999;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/police/AppResidentFile/components/info.vue b/src/project/police/AppResidentFile/components/info.vue
new file mode 100644
index 00000000..bdf68ecd
--- /dev/null
+++ b/src/project/police/AppResidentFile/components/info.vue
@@ -0,0 +1,376 @@
+<template>
+  <section class="info">
+    <div class="card">
+      <div class="baseInfo">
+        <u-image border-radius="4" :src="top.detail.avatar" width="118" height="118" />
+        <div class="fill">
+          <b>{{ top.detail.name }}</b>
+          <div v-if="top.detail.type == 1" class="wx">@微信</div>
+          <div v-if="top.detail.type == 2">@企业微信</div>
+        </div>
+        <div class="certBtn" @tap="handleCert">{{ !isCert ? '实名认证' : '解绑' }}</div>
+      </div>
+      <u-row>
+        <AiCell class="half" top-label label="来源">{{ $dict.getLabel('wxCustomerAddWay', top.detail.addWay) }}</AiCell>
+        <AiCell class="half" top-label label="添加时间">{{ top.detail.createTime }}</AiCell>
+        <AiCell class="half" top-label label="真实姓名">{{ top.detail.realName }}</AiCell>
+        <AiCell class="half" top-label label="手机号码">{{ resident.phone || '-' }}</AiCell>
+        <AiCell class="half" top-label label="家庭积分">{{ resident.familyIntegral }}</AiCell>
+        <AiCell class="half" top-label label="个人积分">{{ resident.personalIntegral }}</AiCell>
+      </u-row>
+    </div>
+    <div class="card">
+      <AiCell title label="公共标签">
+        <u-icon label="添加" size="38" name="iconAdd" custom-prefix="iconfont" color="#1365DD" label-color="#1365DD" @tap="top.showTagManage = true" />
+      </AiCell>
+      <AiCell top-label v-for="(op, name) in tagsList" :label="name" :key="name">
+        <u-row>
+          <div class="tag" v-for="(tag, j) in op" :key="j">{{ tag }}</div>
+        </u-row>
+      </AiCell>
+    </div>
+    <div class="card">
+      <AiCell title label="动态" />
+      <AiCell top-label>
+        <div class="logItem" v-for="item in customLogs" :key="item.id">
+          <div flex class="column" shrink>
+            <div class="dot" />
+            <div class="line fill" />
+          </div>
+          <div flex class="start column">
+            <b>{{ $dict.getLabel('wxCustomerLogType', item.type) }}</b>
+            <span>{{ item.createTime }}</span>
+            <div v-html="item.content" />
+          </div>
+        </div>
+      </AiCell>
+    </div>
+    <u-mask :show="dialog" @tap="dialog = false">
+      <div class="bindCert" @tap.stop>
+        <b class="title">实名认证</b>
+        <u-input class="searchInput" v-model="search" clearable placeholder="请输入姓名或身份证号" @input="handleSearch" />
+        <div class="residents">
+          <div flex class="spb" v-for="(op, i) in result" :key="i" @tap="bindCert(op.id)">
+            <div v-html="op.name" class="user-name" />
+            <div class="area-name">{{ op.currentAddressCountry }}</div>
+            <div v-html="op.idNumber" />
+          </div>
+        </div>
+      </div>
+    </u-mask>
+    <div bottom>
+      <u-button type="primary" @tap="handleWechat">微信联系</u-button>
+      <u-button v-if="isMobile" :disabled="!resident.phone" @tap="handleTel">电话联系</u-button>
+    </div>
+  </section>
+</template>
+
+<script>
+import { mapActions } from 'vuex'
+
+export default {
+  name: 'info',
+  inject: ['top'],
+  computed: {
+    resident() {
+      return this.top.detail?.residentInfo?.resident || {}
+    },
+    tagsList() {
+      let obj = {}
+      this.top.detail?.tags?.map((e) => {
+        if (e.type == 1 && e?.groupName) {
+          if (obj?.[e.groupName]) {
+            obj[e.groupName].push(e.tagName)
+          } else {
+            obj[e.groupName] = [e.tagName]
+          }
+        }
+      })
+      return obj
+    },
+    isCert() {
+      return !!this.top?.detail?.residentInfo
+    },
+    isMobile() {
+      return ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad', 'iPod'].some((e) => navigator.userAgent.indexOf(e) > -1)
+    },
+  },
+  data() {
+    return {
+      dialog: false,
+      search: '',
+      result: [],
+      customLogs: [],
+    }
+  },
+  methods: {
+    ...mapActions(['injectJWeixin', 'wxInvoke']),
+    searchResident() {
+      this.$http
+        .post('/app/appresident/check-name', null, {
+          params: { name: this.search },
+        })
+        .then((res) => {
+          if (res?.data) {
+            let reg = new RegExp(this.search, 'g')
+            this.result = res.data?.map((e) => ({
+              ...e,
+              name: e.name.replace(reg, `<b>${this.search}</b>`),
+              idNumber: e.idNumber.replace(/^(\w{14})\w{4}(.*)$/, '$1****$2').replace(reg, `<b>${this.search}</b>`),
+            }))
+          }
+        })
+    },
+    handleSearch() {
+      if (this.search?.length >= 2) {
+        this.searchResident()
+      } else {
+        this.result = []
+      }
+    },
+    handleCert() {
+      if (this.isCert) {
+        this.$confirm('是否要解绑当前实名认证?').then(() => {
+          this.$http
+            .post('/app/wxcp/wxcustomer/unBindCustomer2Resident', null, {
+              params: { residentId: this.resident.id, customerId: this.top.custom },
+            })
+            .then((res) => {
+              if (res?.code == 0) {
+                this.$u.toast('解除绑定成功!')
+                this.top.getContact()
+              }
+            })
+        })
+      } else this.dialog = true
+    },
+    bindCert(residentId) {
+      this.dialog = false
+      this.$confirm('是否要绑定该居民?')
+        .then(() => {
+          this.$http
+            .post('/app/wxcp/wxcustomer/bindCustomer2Resident', null, {
+              params: { residentId, customerId: this.top.custom },
+            })
+            .then((res) => {
+              if (res?.code == 0) {
+                this.$u.toast('绑定成功!')
+                this.top.getContact()
+              }
+            })
+            .catch((err) => {
+              this.$u.toast(err)
+              setTimeout(() => (this.dialog = true), 1000)
+            })
+        })
+        .catch(() => (this.dialog = true))
+    },
+    getCustomLog(customerId) {
+      customerId &&
+        this.$http
+          .post('/app/wxcp/wxcustomerlog/listAll', null, {
+            params: { customerId },
+          })
+          .then((res) => {
+            if (res?.data) {
+              this.customLogs = res.data
+            }
+          })
+    },
+    handleTel() {
+      location.href = 'tel:' + this.resident.phone
+    },
+    handleWechat() {
+      this.wxInvoke([
+        'openUserProfile',
+        {
+          type: 2,
+          userid: this.top.custom,
+        },
+        () => 0,
+      ])
+    },
+  },
+  created() {
+    this.$dict.load('wxCustomerAddWay', 'wxCustomerLogType')
+    this.getCustomLog(this.top.custom)
+    this.injectJWeixin('openUserProfile')
+  },
+  onShow() {
+    document.title =  '居民详情'
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.info {
+  padding-bottom: 130px;
+
+  .certBtn {
+    cursor: pointer;
+    background: $uni-color-primary;
+    color: #fff;
+    padding: 8px 16px;
+    border-radius: 4px;
+  }
+
+  .baseInfo {
+    height: 186px;
+    width: 100%;
+    display: flex;
+    align-items: center;
+
+    .fill {
+      color: #3c7fc8;
+      margin-left: 24px;
+      font-size: 28px;
+      line-height: 40px;
+
+      b {
+        font-size: 36px;
+        color: #333;
+        margin-bottom: 8px;
+        line-height: 50px;
+      }
+
+      .wx {
+        color: #2ea222;
+      }
+    }
+  }
+
+  ::v-deep .AiCell {
+    &.half {
+      width: 50%;
+    }
+  }
+
+  ::v-deep .u-form-item {
+    width: 50%;
+    min-height: 124px;
+
+    .u-form-item--left {
+      color: #999;
+      min-height: 40px;
+    }
+
+    .u-form-item--right {
+      min-height: 0;
+      margin-top: 16px;
+    }
+  }
+
+  ::v-deep .u-mask {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .bindCert {
+      width: 600px;
+      padding: 32px;
+      min-height: 400px;
+      background-color: #fff;
+      display: flex;
+      flex-direction: column;
+      color: #333;
+    }
+
+    .residents {
+      max-height: 780px;
+      overflow-y: auto;
+      .user-name{
+        width: 100px;
+      }
+      .area-name{
+        width: 140px;
+        word-break: break-all;
+      }
+    }
+
+    .title {
+      text-align: center;
+      font-size: 36px;
+    }
+
+    .searchInput {
+      margin: 16px 0;
+      border: 1px solid #d0d4dc;
+      border-radius: 8px;
+      padding: 0 16px !important;
+      flex: 0;
+    }
+
+    .spb {
+      cursor: pointer;
+      padding: 0 16px;
+
+      b {
+        font-size: 32px;
+      }
+
+      &:nth-of-type(2n) {
+        background: #eee;
+      }
+    }
+  }
+
+  ::v-deep .logItem {
+    display: flex;
+    min-height: 220px;
+
+    &:last-of-type {
+      .line {
+        display: none;
+      }
+    }
+
+    & > .column + .column {
+      margin-left: 16px;
+    }
+
+    .dot {
+      flex-shrink: 0;
+      width: 16px;
+      height: 16px;
+      background: $uni-color-primary;
+      border: 8px solid #ffffff;
+      border-radius: 50%;
+      margin: 8px 0;
+    }
+
+    .line {
+      width: 4px;
+      background: #eee;
+    }
+
+    .start {
+      font-size: 26px;
+      font-weight: 400;
+      color: #666;
+
+      b {
+        color: #333;
+      }
+
+      i {
+        color: $uni-color-primary;
+        font-style: normal;
+      }
+
+      & > b {
+        font-size: 32px;
+        font-weight: bold;
+        margin-bottom: 8px;
+      }
+
+      & > span {
+        color: #999;
+      }
+
+      & > div {
+        margin-top: 16px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/police/AppResidentFile/resident.vue b/src/project/police/AppResidentFile/resident.vue
new file mode 100644
index 00000000..bff6801d
--- /dev/null
+++ b/src/project/police/AppResidentFile/resident.vue
@@ -0,0 +1,155 @@
+<template>
+  <section class="resident">
+    <AiLoading v-if="!custom && !error" tips="获取居民信息中..." />
+    <AiResult v-else-if="error" status="error" :tips="error" />
+    <template v-else>
+      <tag-manage v-if="showTagManage" />
+      <template v-else>
+        <AiTopFixed>
+          <u-tabs :list="tabs" :is-scroll="false" :current="currentType" font-size="32" bar-width="192" height="96" @change="handleTabClick" />
+        </AiTopFixed>
+        <component :is="currentTab.comp" />
+      </template>
+    </template>
+  </section>
+</template>
+
+<script>
+import { mapActions } from 'vuex'
+import Info from './components/info'
+import Document from './components/document'
+import TagManage from './tagManage.vue'
+
+export default {
+  name: 'resident',
+  components: { TagManage, Document, Info },
+  provide() {
+    return {
+      top: this,
+      id: '',
+    }
+  },
+  onShow() {
+    document.title =  '居民详情' 
+  },
+  computed: {
+    tabs() {
+      return [
+        { name: '居民信息', value: 0, comp: Info },
+        { name: '居民档案', value: 1, comp: Document, hide: !this.detail.residentInfo },
+      ].filter((e) => !e.hide)
+    },
+    currentTab() {
+      return this.tabs.find((e) => e.value == this.currentType)
+    },
+    isNormal() {
+      return !!this.id
+    },
+  },
+  data() {
+    return {
+      currentType: 0,
+      detail: {},
+      showTagManage: false,
+      custom: '',
+      error: '',
+    }
+  },
+  methods: {
+    ...mapActions(['injectJWeixin', 'wxInvoke']),
+    handleTabClick(i) {
+      this.currentType = i
+    },
+    getContact() {
+      if (this.isNormal) {
+        this.getCustom(this.id)
+      } else {
+        this.injectJWeixin('getCurExternalContact')
+          .then(() => {
+            this.wxInvoke([
+              'getCurExternalContact',
+              {},
+              (res) => {
+                if (res?.err_msg == 'getCurExternalContact:ok') {
+                  this.getCustom(res.userId)
+                }
+              },
+            ])
+          })
+          .catch(({ errMsg }) => {
+            this.error = errMsg
+          })
+      }
+    },
+    getCustom(id) {
+      this.$http
+        .post('/app/wxcp/wxcustomer/queryCustomerById', null, {
+          params: { id },
+        })
+        .then((ret) => {
+          if (ret?.data) {
+            this.custom = id
+            this.detail = ret.data
+            if (this.detail.type == 2) {
+              this.error = '只能查看个人微信绑定的居民信息'
+            }
+          }
+        })
+    },
+  },
+  onLoad(o) {
+    this.id = o.id
+    this.getContact()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.resident {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  background: #f5f5f5;
+
+  .error {
+    font-size: 32px;
+    color: #666;
+    text-align: center;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+
+  ::v-deep .u-scroll-box {
+    border-bottom: 1px solid #d4d4d4;
+
+    .u-tab-bar {
+      position: absolute;
+      bottom: -6px;
+    }
+  }
+
+  ::v-deep .card {
+    background: #fff;
+    margin-bottom: 16px;
+    padding: 16px 32px;
+  }
+
+  .half {
+    width: 50%;
+  }
+
+  ::v-deep .tag {
+    height: 56px;
+    line-height: 56px;
+    background: #f3f4f7;
+    border-radius: 6px;
+    padding: 8px 16px;
+    margin-right: 16px;
+    margin-bottom: 16px;
+    overflow: hidden;
+    cursor: default;
+  }
+}
+</style>
diff --git a/src/project/police/AppResidentFile/tagManage.vue b/src/project/police/AppResidentFile/tagManage.vue
new file mode 100644
index 00000000..9d94159e
--- /dev/null
+++ b/src/project/police/AppResidentFile/tagManage.vue
@@ -0,0 +1,92 @@
+<template>
+  <section class="tagManage">
+    <div class="card" v-for="(group, i) in tags" :key="i">
+      <AiCell title :label="group.name" />
+      <u-row>
+        <div class="tag" v-for="(op, j) in group.tagList" :key="j" :class="{ selected: selected.includes(op.id) }" @tap="$u.debounce(handleToggle(op.id))">
+          {{ op.name }}
+        </div>
+      </u-row>
+    </div>
+
+  </section>
+</template>
+
+<script>
+export default {
+  name: 'tagManage',
+  inject: ['top'],
+  data() {
+    return {
+      tags: [],
+    }
+  },
+  computed: {
+    selected() {
+      return this.top.groupId ? this.top.detail?.tagList.map((e) => e.tagId) : this.top.detail?.tags.map((e) => e.tagId)
+    },
+  },
+  methods: {
+    getTags() {
+      this.$http
+        .post(this.top.groupId ? '/app/wxcp/wxgroupchattag/listAll' : '/app/wxcp/wxcorptag/listAll', null, {
+          params: { size: 9999 },
+        })
+        .then((res) => {
+          if (res?.data) {
+            this.tags = res.data.records
+          }
+        })
+    },
+    handleToggle(tagId) {
+      uni.showLoading({
+        title: '提交中',
+      })
+
+      this.$http
+        .post(this.top.groupId ? '/app/wxcp/wxgroupchattag/markTagForCP' : '/app/wxcp/wxcorptag/markTagForCP', null, {
+          params: this.top.groupId ? { tagId, groupId: this.top.groupId } : { tagId, customerId: this.top.custom },
+        })
+        .then((res) => {
+          uni.hideLoading()
+          if (res?.code == 0) {
+            this.$u.toast('操作成功!')
+            this.getTags()
+            this.top.getContact()
+          }
+        })
+        .catch((err) => {
+          uni.hideLoading()
+          this.$u.toast(err)
+        })
+    },
+  },
+  created() {
+    this.getTags()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.tagManage {
+  padding-top: 16px;
+
+  .tag {
+    cursor: pointer !important;
+
+    &.selected {
+      background-color: $uni-color-primary !important;
+      color: #fff;
+    }
+
+    &.disabled {
+      color: #999;
+      cursor: not-allowed;
+    }
+
+    & + .tag {
+      margin-left: 16px;
+    }
+  }
+}
+</style>