diff --git a/src/apps/AppEpidemicSituation/AppEpidemicSituation.vue b/src/apps/AppEpidemicSituation/AppEpidemicSituation.vue
index d3fbfb3b..e4636a43 100644
--- a/src/apps/AppEpidemicSituation/AppEpidemicSituation.vue
+++ b/src/apps/AppEpidemicSituation/AppEpidemicSituation.vue
@@ -57,7 +57,9 @@ export default {
     return {}
   },
   computed: { ...mapState(['user']) },
-  onShow() {},
+  onShow() {
+    document.title = '疫情防控'
+  },
   methods: {
     toHealth(){
       uni.navigateTo({
diff --git a/src/apps/AppEpidemicSituation/BackUserList.vue b/src/apps/AppEpidemicSituation/BackUserList.vue
index 0c0eb3fd..fbf85db4 100644
--- a/src/apps/AppEpidemicSituation/BackUserList.vue
+++ b/src/apps/AppEpidemicSituation/BackUserList.vue
@@ -27,20 +27,21 @@
           <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
         </AiAreaPicker>
       </div>
-      <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" search-icon-color="#999" color="#999" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+      <u-search v-model="name" :clearabled="true" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" search-icon-color="#999" color="#999" height="58" @search="handerSearch" @clear="handerClear"></u-search>
     </div>
     <div class="tab-select">
-      <div class="item active">返乡人员<span></span></div>
-      <div class="item">异常人员<span></span></div>
+      <div class="item" :class="!tabIndex ? 'active' : ''" @click="tabClick(0)">返乡人员<span></span></div>
+      <div class="item" :class="tabIndex ? 'active' : ''" @click="tabClick(1)">异常人员<span></span></div>
     </div>
     <div class="user-list">
-      <div class="item" @click="toUser">
-        <h2 class="name">林益丰<span class="status">有异常</span></h2>
-        <p class="color-999">420107********3274</p>
-        <p><img src="./components/img/blue-icon.png" alt="">湖北省武汉市洪山区</p>
-        <p><img src="./components/img/org-icon.png" alt="">重庆市荣昌区</p>
-        <p><img src="./components/img/time-icon.png" alt="">2021-12-06 13:23</p>
+      <div class="item" @click="toUser(item)" v-for="(item,index) in list" :key="index">
+        <h2 class="name">{{item.name}}<span class="status" v-if="item.status == 0">有异常</span></h2>
+        <p class="color-999">{{item.idNumber}}</p>
+        <p><img src="./components/img/blue-icon.png" alt="">{{item.startAreaName}}</p>
+        <p><img src="./components/img/org-icon.png" alt="">{{item.arriveAreaName}}</p>
+        <p><img src="./components/img/time-icon.png" alt="">{{item.checkTime}}</p>
       </div>
+      <AiEmpty v-if="!list.length"></AiEmpty>
     </div>
   </div>
 </template>
@@ -52,19 +53,52 @@ export default {
   data() {
     return {
       areaId: '',
-      areaName: ''
+      areaName: '',
+      tabIndex: 0,
+      current: 1,
+      list: [],
+      name: '',
     }
   },
   computed: { ...mapState(['user']) },
-  onShow() {},
+  onShow() {
+    this.areaId = this.user.areaId
+    document.title = '疫情防控'
+    this.getList()
+  },
   methods: {
     areaSelect() {
-
+      this.getListInit()
     },
-    toUser() {
-      uni.navigateTo({url: './ErrorDetail'})
+    tabClick(index) {
+      this.tabIndex = index
+      this.getListInit()
+    },
+    getListInit() {
+      this.current = 1
+      this.list = []
+      this.getList()
+    },
+    getList() {
+      var status = ''
+      if(this.tabIndex == 1) {
+        status = 0
+      }
+      this.$http.post(`/app/appepidemicbackhomerecord/list?current=${this.current}&size=10&status=${status}&name=${this.name}`)
+      .then((res) => {
+        if (res.code == 0) {
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
+    },
+    toUser(row) {
+      uni.navigateTo({url: `./UserInfo?id=${row.id}`})
     }
   },
+  onReachBottom() {
+    this.current ++
+    this.getList()
+  }
 }
 </script>
 
@@ -133,8 +167,9 @@ export default {
       span{
         position: absolute;
         bottom: 0;
-        left: 92px;
+        left: 50%;
         width: 192px;
+        margin-left: -96px;
         border-bottom: 4px solid #135AB8;
       }
     }
diff --git a/src/apps/AppEpidemicSituation/UserInfo.vue b/src/apps/AppEpidemicSituation/UserInfo.vue
index 8261d406..0c469084 100644
--- a/src/apps/AppEpidemicSituation/UserInfo.vue
+++ b/src/apps/AppEpidemicSituation/UserInfo.vue
@@ -2,32 +2,31 @@
   <div class="BackUserList">
     <div class="user-list">
       <div class="item">
-        <h2 class="name">林益丰</h2>
-        <p class="color-999">420107********3274</p>
-        <p><img src="./components/img/blue-icon.png" alt="">湖北省武汉市洪山区</p>
-        <p><img src="./components/img/org-icon.png" alt="">重庆市荣昌区</p>
-        <p><img src="./components/img/time-icon.png" alt="">2021-12-06 13:23</p>
+        <h2 class="name">{{info.name}}的返乡登记信息</h2>
+        <p><img src="./components/img/blue-icon.png" alt="">{{info.arriveAreaName}}</p>
+        <p><img src="./components/img/org-icon.png" alt="">{{info.startAreaName}}</p>
+        <p><img src="./components/img/time-icon.png" alt="">{{info.checkTime}}</p>
       </div>
     </div>
     <div class="info">
       <div class="title">基本信息</div>
       <div class="item-flex">
         <div class="label">姓名</div>
-        <div class="value">陈晨</div>
+        <div class="value">{{info.name}}</div>
       </div>
       <div class="item-flex">
         <div class="label">身份证号</div>
-        <div class="value">422132199412038273</div>
+        <div class="value">{{info.idNumber}}</div>
       </div>
       <div class="item-flex">
         <div class="label">联系方式</div>
-        <div class="value" style="color:#4181FF;">
-          <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone('112')" class="phone-icon" >
-          152738193323</div>
+        <div class="value" style="color:#4181FF;" @click="callPhone(info.phone)">
+          <img :src="$cdn + 'common/phone.png'" alt="" class="phone-icon" >
+          {{info.phone}}</div>
       </div>
       <div class="item-flex">
         <div class="label">人员类别</div>
-        <div class="value" style="color:#42D784;">跨省返乡人员</div>
+        <div class="value" style="color:#42D784;">{{$dict.getLabel('epidemicMemberType', info.type)}}</div>
       </div>
     </div>
     <div class="line-bg"></div>
@@ -35,35 +34,35 @@
       <div class="title">行程信息</div>
       <div class="item-flex">
         <div class="label">出行方式</div>
-        <div class="value">高铁动车</div>
+        <div class="value">{{$dict.getLabel('epidemicRecentTravel', info.travelType)}}</div>
       </div>
       <div class="item-flex">
         <div class="label">出发时间</div>
-        <div class="value">2021-10-19</div>
+        <div class="value">{{info.startTime}}</div>
       </div>
       <div class="item-flex">
         <div class="label">出发地区</div>
-        <div class="value">湖北省武汉市汉阳区</div>
+        <div class="value">{{info.startAreaName}}</div>
       </div>
       <div class="item-flex">
         <div class="label">出发地址</div>
-        <div class="value">XXXXXXXXX小区，X栋X单元XXXXX</div>
+        <div class="value">{{info.startAddress}}</div>
       </div>
       <div class="item-flex">
         <div class="label">到达时间</div>
-        <div class="value">2021-10-19</div>
+        <div class="value">{{info.arriveTime}}</div>
       </div>
       <div class="item-flex">
         <div class="label">返乡地区</div>
-        <div class="value">湖北省武汉市汉阳区</div>
+        <div class="value">{{info.arriveAreaName}}</div>
       </div>
       <div class="item-flex">
         <div class="label">返乡地址</div>
-        <div class="value">XXXXXXXXX小区，X栋X单元XXXXX</div>
+        <div class="value">{{info.arriveAddress}}</div>
       </div>
       <div class="item-flex">
         <div class="label">行程描述</div>
-        <div class="value">2022.1.1上午11:00搭乘D5478次动车；座位号E56</div>
+        <div class="value">{{info.description}}</div>
       </div>
     </div>
     <div class="line-bg"></div>
@@ -71,17 +70,17 @@
       <div class="title">核酸检测信息</div>
       <div class="item-flex">
         <div class="label">核酸检测日期</div>
-        <div class="value">2021-10-19</div>
+        <div class="value">{{info.checkTime}}</div>
       </div>
       <div class="item-flex">
         <div class="label">核酸检测结果</div>
-        <div class="value" style="color:#42D784;">阴性</div>
+        <div class="value" :style="info.checkResult == 1 ? 'color:#f46;' : 'color:#42D784;'">{{$dict.getLabel('epidemicRecentTestResult', info.checkResult)}}</div>
       </div>
-      <div class="item-flex">
+      <div class="item-flex border-none">
         <div style="color:#999;">本人健康码截图或核酸检测报告</div>
       </div>
       <div class="img-list">
-        <img src="./components/img/time-icon.png" alt="">
+        <img :src="item.url" alt="" v-for="(item, index) in info.checkPhoto" :key="index" @click="previewImage(info.checkPhoto, item.url)">
       </div>
     </div>
     <div class="line-bg"></div>
@@ -89,19 +88,19 @@
       <div class="title">健康状况</div>
       <div class="item-flex">
         <div class="label">当前体温</div>
-        <div class="value">36℃</div>
+        <div class="value">{{info.temperature}}℃</div>
       </div>
       <div class="item-flex">
         <div class="label" style="width:360px;">14天内是否接触新冠确诊或疑似患者</div>
-        <div class="value" style="color:#42D784;">否</div>
+        <div class="value" :style="info.touchInFourteen == 1 ? 'color:#f46;' : 'color:#42D784;'">{{$dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen)}}</div>
       </div>
       <div class="item-flex">
         <div class="label">当前健康状况</div>
-        <div class="value" style="color:#FF4466;">感冒症状;乏力、咳嗽、发烧、肌肉痛、头痛</div>
+        <div class="value" :style=" info.health != 0 ? 'color:#FF4466;' : ''">{{$dict.getLabel('epidemicRecentHealth', info.health)}}</div>
       </div>
     </div>
-    <div class="line-bg"></div>
-    <div class="footer">异常情况处理</div>
+    <div class="line-bg" style="padding-bottom: 56px;"></div>
+    <div class="footer" v-if="info.status != 1" @click="toError">异常情况处理</div>
   </div>
 </template>
 
@@ -111,15 +110,28 @@ import { mapState } from 'vuex'
 export default {
   data() {
     return {
-      areaId: '',
-      areaName: ''
+      id: '',
+      info: {}
     }
   },
   computed: { ...mapState(['user']) },
-  onShow() {},
+  onShow() {
+    document.title = '返乡人员信息'
+  },
+  onLoad(option) {
+    this.$dict.load('epidemicMemberType', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentTestResult', 'epidemicRecentHealth').then(() => {
+      this.id = option.id
+      this.getDetail()
+    })
+  },
   methods: {
-    areaSelect() {
-
+    getDetail() {
+      this.$http.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.info = res.data
+          this.info.checkPhoto = JSON.parse(this.info.checkPhoto)
+        }
+      })
     },
     callPhone(phone) {
       uni.makePhoneCall({phoneNumber: phone})
@@ -130,6 +142,9 @@ export default {
         current: img
       })
     },
+    toError() {
+      uni.navigateTo({url: `./ErrorInfo?id=${this.id}`})
+    }
   },
 }
 </script>
@@ -212,6 +227,7 @@ export default {
       }
     }
     .img-list{
+      padding-bottom: 32px;
       img{
         width: 320px;
         height: 320px;
@@ -237,6 +253,12 @@ export default {
     font-weight: 500;
     color: #FFF;
     text-align: center;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+  }
+  .border-none{
+    border-bottom: 0!important;
   }
 }
 </style>