diff --git a/src/project/pingchang/AppGetwayRegister/AppGetwayRegister.vue b/src/project/pingchang/AppGetwayRegister/AppGetwayRegister.vue
new file mode 100644
index 0000000..6ba4aa4
--- /dev/null
+++ b/src/project/pingchang/AppGetwayRegister/AppGetwayRegister.vue
@@ -0,0 +1,18 @@
+<template>
+  <div class="AppGetwayRegister"></div>
+</template>
+
+<script>
+export default {
+  name: "AppGetwayRegister",
+  data() {
+    return {
+      
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppGetwayRegister {}
+</style>
\ No newline at end of file
diff --git a/src/project/pingchang/AppHealthReport/AddReport.vue b/src/project/pingchang/AppHealthReport/AddReport.vue
new file mode 100644
index 0000000..91d71af
--- /dev/null
+++ b/src/project/pingchang/AppHealthReport/AddReport.vue
@@ -0,0 +1,431 @@
+<template>
+  <div class="album">
+    <div class="tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>
+    <div class="form-item__group">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>返乡人员姓名</h2>
+          </div>
+          <div class="form-item__right">
+            <input placeholder="请输入" v-model="form.name" disabled :maxlength="20"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>身份证号</h2>
+          </div>
+          <div class="form-item__right">
+            <input placeholder="请输入" v-model="form.idNumber" disabled :maxlength="20"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form-item__group">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>当前体温</h2>
+          </div>
+          <div class="form-item__right">
+            <input placeholder="请输入" v-model="form.temperature" :maxlength="20"/>
+            <i>℃</i>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__imgs">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>14天内是否接触新冠确诊或疑似患者</h2>
+          </div>
+          <div class="form-item__right">
+            <AiRadio style="width: 100%;" v-model="form.touchInFourteen" dict="epidemicTouchInFourteen"></AiRadio>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__imgs">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>当前健康状况（可多选）</h2>
+          </div>
+          <div class="form-item__right">
+            <AiCheckbox style="width: 100%;" v-model="form.health" dict="epidemicRecentHealth"></AiCheckbox>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form-item__group">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>核酸检测日期</h2>
+          </div>
+          <div class="form-item__right">
+            <div class="ai-area" @click="isShowDate = true">
+              <div class="ai-area__wrapper">
+                <span class="label" v-if="form.checkTime">{{ form.checkTime }}</span>
+                <i v-else>请选择</i>
+                <u-icon name="arrow-right" color="#ddd"/>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__imgs">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>核酸检测结果</h2>
+          </div>
+          <div class="form-item__right">
+            <AiRadio style="width: 100%;" v-model="form.checkResult" dict="epidemicRecentTestResult"></AiRadio>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__imgs">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>健康码类型</h2>
+          </div>
+          <div class="form-item__right">
+            <AiRadio style="width: 100%;" v-model="form.healthCode" dict="epidemicHealthCode"></AiRadio>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__imgs">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>已接种疫苗次数</h2>
+          </div>
+          <div class="form-item__right">
+            <AiRadio style="width: 100%;" v-model="form.vaccine" dict="epidemicVaccineTime"></AiRadio>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__imgs">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i style="margin-right: 8px"></i>
+            <h2>本人健康码截图<span style="color: #999; font-size:14px;font-weight:normal;">(最多9张)</span></h2>
+          </div>
+          <div class="form-item__right" style="padding-left: 5px">
+            <AiUploader v-model="form.checkPhoto" :limit="9" multiple></AiUploader>
+          </div>
+        </div>
+      </div>
+    </div>
+    <u-picker mode="time" :params="dataParams" v-model="isShowDate" @confirm="onDateChange"></u-picker>
+    <div class="btn-wrapper">
+      <div class="btn" hover-class="text-hover" @click="submit">提交</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  appName:"今日上报",
+  data() {
+    return {
+      isShowDate: false,
+      dataParams: {
+        year: true,
+        month: true,
+        day: true
+      },
+      form: {
+        name: '',
+        idNumber: '',
+        checkPhoto: [],
+        checkResult: '',
+        health: '',
+        healthCode: '',
+        temperature: '',
+        vaccine: '',
+        checkTime: '',
+        memberId: ''
+      }
+    }
+  },
+
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  onLoad(query) {
+    this.form.memberId = query.id
+    this.getInfo(query.id)
+  },
+
+  methods: {
+    getInfo(id) {
+      this.$instance.post(`/app/appepidemicreportmember/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form.name = res.data.name
+          this.form.idNumber = res.data.idNumber
+
+          this.form.checkTime = res.data.checkTime ? res.data.checkTime.split(' ')[0] : ''
+          this.form.checkResult = res.data.checkResult || ''
+          this.form.healthCode = res.data.healthCode || ''
+          this.form.vaccine = res.data.vaccine || ''
+        }
+
+        this.$hideLoading()
+      }).catch(() => {
+        this.$hideLoading()
+      })
+    },
+
+    onDateChange(e) {
+      this.form.checkTime = `${e.year}-${e.month}-${e.day}`
+    },
+
+    submit() {
+      if (!this.form.temperature) {
+        return this.$toast('请输入当前体温')
+      }
+
+      if (!this.form.touchInFourteen) {
+        return this.$toast('请选择14天内是否接触新冠确诊或疑似患者')
+      }
+
+      if (!this.form.health.length) {
+        return this.$toast('请选择当前健康状况')
+      }
+      if (!this.form.checkTime) {
+        return this.$toast('请选择核酸检测日期')
+      }
+
+      if (!this.form.checkResult) {
+        return this.$toast('请选择核酸检测结果')
+      }
+
+      if (!this.form.healthCode) {
+        return this.$toast('请选择健康码类型')
+      }
+
+      if (!this.form.vaccine) {
+        return this.$toast('请选择已接种疫苗次数')
+      }
+
+      // if (!this.form.checkPhoto.length) {
+      //   return this.$toast('请上传健康码截图')
+      // }
+      this.$loading()
+      this.$instance.post(`/app/appepidemichealthreport/addOrUpdate`, {
+        ...this.form,
+        openid: this.user.openid,
+        health: this.form.health.join(','),
+        checkPhoto: JSON.stringify(this.form.checkPhoto),
+        checkTime: this.form.checkTime + ' 00:00:00'
+      }).then(res => {
+        if (res.code == 0) {
+          uni.$emit('update')
+          this.$toast('提交成功')
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 400)
+        }
+        this.$hideLoading()
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.album {
+  padding-bottom: 140px;
+
+  .tips {
+    line-height: 1.3;
+    padding: 32px 32px;
+    color: #FF883C;
+    font-size: 30px;
+    text-align: justify;
+    background: #FFF8F3;
+  }
+
+  .form-item__group {
+    margin-bottom: 24px;
+    background: #fff;
+  }
+
+  .form-item {
+    padding-left: 32px;
+
+    .form-item__checkbox {
+      width: 100%;
+
+      div {
+        width: 100%;
+        height: 80px;
+        line-height: 80px;
+        margin-bottom: 24px;
+        text-align: center;
+        background: #FFFFFF;
+        border-radius: 16px;
+        color: #333333;
+        font-size: 28px;
+        border: 1px solid #CCCCCC;
+
+        &.active {
+          background: #4181FF;
+          color: #fff;
+          border-color: #4181FF;
+        }
+      }
+    }
+
+    .form-item__radio {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+
+      div {
+        width: 212px;
+        height: 80px;
+        line-height: 80px;
+        margin-right: 16px;
+        margin-bottom: 8px;
+        text-align: center;
+        background: #FFFFFF;
+        border-radius: 16px;
+        color: #333333;
+        font-size: 28px;
+        border: 1px solid #CCCCCC;
+
+        &:nth-of-type(3n) {
+          margin-right: 0;
+        }
+
+        &.active {
+          background: #4181FF;
+          color: #fff;
+          border-color: #4181FF;
+        }
+      }
+    }
+
+    .ai-area__wrapper {
+      display: flex;
+      align-items: center;
+      padding-left: 100px;
+
+      span {
+        color: #333;
+        font-size: 30px;
+      }
+
+      i {
+        color: #999;
+        font-size: 30px;
+      }
+
+      image {
+        width: 16px;
+        height: 8px;
+      }
+    }
+
+    .form-item__wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 128px;
+      padding-right: 28px;
+      border-bottom: 1px solid #DDDDDD;
+
+      input {
+        flex: 1;
+        height: 100%;
+        text-align: right;
+        color: #333;
+        padding-right: 10px;
+      }
+
+      .form-item__right {
+        display: flex;
+        align-items: center;
+        font-size: 32px;
+
+        span {
+          max-width: 400px;
+          margin-right: 8px;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        i {
+          margin-right: 8px;
+          color: #999999;
+        }
+      }
+    }
+
+    &:last-child {
+      .form-item__wrapper {
+        border-bottom: none;
+      }
+    }
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+
+      i {
+        font-size: 32px;
+        color: #FF4466;
+      }
+
+      span {
+        font-size: 28px;
+        color: #999999;
+      }
+
+      h2 {
+        padding: 0 4px;
+        font-weight: 600;
+        font-size: 32px;
+        color: #333333;
+      }
+    }
+
+
+    &.form-item__imgs, &.form-item__textarea {
+      .form-item__wrapper {
+        display: block;
+        height: auto;
+        padding-bottom: 32px;
+      }
+
+      textarea {
+        width: 100%;
+        height: 90px;
+      }
+
+      .form-item__title {
+        padding: 32px 0;
+      }
+
+      .form-item__right {
+        padding-left: 18px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppHealthReport/AddUser.vue b/src/project/pingchang/AppHealthReport/AddUser.vue
new file mode 100644
index 0000000..a3ee64a
--- /dev/null
+++ b/src/project/pingchang/AppHealthReport/AddUser.vue
@@ -0,0 +1,327 @@
+<template>
+  <div class="album">
+    <div class="form-item__group">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>上报人姓名</h2>
+          </div>
+          <div class="form-item__right">
+            <input placeholder="请输入" v-model="form.name" :maxlength="20"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>身份证号</h2>
+          </div>
+          <div class="form-item__right">
+            <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="20"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>手机号码</h2>
+          </div>
+          <div class="form-item__right">
+            <input placeholder="请输入" type="number" v-model="form.phone" :maxlength="11"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>上报地区</h2>
+          </div>
+          <div class="form-item__right">
+            <AiAreaPicker class="ai-area" :areaId="$areaId" v-model="form.areaId" :fullName.sync="form.areaName">
+              <div class="ai-area__wrapper">
+                <span class="label" v-if="form.areaName">{{ form.areaName }}</span>
+                <i v-else>请选择</i>
+                <u-icon name="arrow-right" color="#ddd"/>
+              </div>
+            </AiAreaPicker>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__textarea">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>详细地址</h2>
+          </div>
+          <div class="form-item__right">
+            <textarea auto-height v-model="form.address" :maxlength="500" placeholder="请输入详细地址"
+                      placeholder-style="font-size: 16px;"></textarea>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="btn-wrapper">
+      <div class="btn" hover-class="text-hover" @click="submit">提交</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  appName: "添加上报人员",
+  data() {
+    return {
+      form: {
+        address: '',
+        areaId: '',
+        areaName: '',
+        idNumber: '',
+        name: '',
+        phone: ''
+      },
+      $areaId: '',
+      flag: false
+    }
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+
+  methods: {
+    submit() {
+      if (!this.form.name) {
+        return this.$toast('请输入上报人姓名')
+      }
+
+      if (!this.form.idNumber) {
+        return this.$toast('请输入上报人身份证号')
+      }
+
+      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.form.idNumber)) {
+        return this.$toast('请输入正确的身份证账号')
+      }
+      if (!this.form.phone) {
+        return this.$toast('请选择上报人手机号码')
+      }
+
+      if (!/^1[0-9]{10,10}$/.test(this.form.phone)) {
+        return this.$toast('请输入正确的手机号码')
+      }
+
+      if (!this.form.areaId) {
+        return this.$toast('请选择上报地区')
+      }
+
+      if (this.form.areaId.substr(this.form.areaId.length - 3, 3) === '000') {
+        return this.$toast('上报地区必须选到村或社区')
+      }
+
+      if (!this.form.address) {
+        return this.$toast('请输入详细地址')
+      }
+      if (this.flag) return
+      this.flag = true
+
+      this.$loading()
+      this.$instance.post(`/app/appepidemicreportmember/addOrUpdate`, {
+        ...this.form,
+        openid: this.user.openid
+      }).then(res => {
+        this.$hideLoading()
+        this.flag = false
+        if (res.code == 0) {
+          this.$toast('提交成功')
+          uni.$emit('update')
+          setTimeout(() => {
+            uni.redirectTo({
+              url: `./Result?id=${res.data.id}`
+            })
+          }, 400)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.album {
+  padding-bottom: 140px;
+
+  .form-item__group {
+    margin-bottom: 24px;
+    background: #fff;
+  }
+
+  .form-item {
+    padding-left: 32px;
+
+    .form-item__checkbox {
+      width: 100%;
+
+      div {
+        width: 100%;
+        height: 80px;
+        line-height: 80px;
+        margin-bottom: 24px;
+        text-align: center;
+        background: #FFFFFF;
+        border-radius: 16px;
+        color: #333333;
+        font-size: 28px;
+        border: 1px solid #CCCCCC;
+
+        &.active {
+          background: #4181FF;
+          color: #fff;
+          border-color: #4181FF;
+        }
+      }
+    }
+
+    .form-item__radio {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+
+      div {
+        width: 212px;
+        height: 80px;
+        line-height: 80px;
+        margin-right: 16px;
+        margin-bottom: 8px;
+        text-align: center;
+        background: #FFFFFF;
+        border-radius: 16px;
+        color: #333333;
+        font-size: 28px;
+        border: 1px solid #CCCCCC;
+
+        &:nth-of-type(3n) {
+          margin-right: 0;
+        }
+
+        &.active {
+          background: #4181FF;
+          color: #fff;
+          border-color: #4181FF;
+        }
+      }
+    }
+
+    .ai-area__wrapper {
+      display: flex;
+      align-items: center;
+      padding-left: 100px;
+
+      span {
+        color: #333;
+        font-size: 30px;
+      }
+
+      i {
+        color: #999;
+        font-size: 30px;
+      }
+
+      image {
+        width: 16px;
+        height: 8px;
+      }
+    }
+
+    .form-item__wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 128px;
+      padding-right: 28px;
+      border-bottom: 1px solid #DDDDDD;
+
+      input {
+        flex: 1;
+        height: 100%;
+        text-align: right;
+        color: #333;
+        padding-right: 10px;
+      }
+
+      .form-item__right {
+        display: flex;
+        align-items: center;
+        font-size: 32px;
+
+        span {
+          max-width: 400px;
+          margin-right: 8px;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        i {
+          margin-right: 8px;
+          color: #999999;
+        }
+      }
+    }
+
+    &:last-child {
+      .form-item__wrapper {
+        border-bottom: none;
+      }
+    }
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+
+      i {
+        font-size: 32px;
+        color: #FF4466;
+      }
+
+      span {
+        font-size: 28px;
+        color: #999999;
+      }
+
+      h2 {
+        padding: 0 4px;
+        font-weight: 600;
+        font-size: 32px;
+        color: #333333;
+      }
+    }
+
+
+    &.form-item__imgs, &.form-item__textarea {
+      .form-item__wrapper {
+        display: block;
+        height: auto;
+        padding-bottom: 32px;
+      }
+
+      textarea {
+        width: 100%;
+        height: 90px;
+      }
+
+      .form-item__title {
+        padding: 32px 0;
+      }
+
+      .form-item__right {
+        padding-left: 18px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppHealthReport/AppHealthReport.vue b/src/project/pingchang/AppHealthReport/AppHealthReport.vue
new file mode 100644
index 0000000..4b2219b
--- /dev/null
+++ b/src/project/pingchang/AppHealthReport/AppHealthReport.vue
@@ -0,0 +1,223 @@
+<template>
+  <div class="returnHomeRegister" v-if="pageShow">
+    <div class="title">
+      <h2>上报人员</h2>
+      <div class="right">
+        <span>共</span>
+        <i>{{ total }}</i>
+        <span>名</span>
+      </div>
+    </div>
+    <div class="home-list">
+      <div class="item" v-for="(item, index) in list" :key="index">
+        <div class="item-top">
+          <div class="item-top__left">
+            <h2>{{ item.name }}</h2>
+            <p @click.stop="$linkTo('./UserInfo?id=' + item.id)" hover-class="text-hover">查看个人信息></p>
+          </div>
+          <span v-if="item.status === '0'">健康数据异常</span>
+        </div>
+        <div class="item-bottom">
+          <div class="item-bottom__left">
+            <span>上报第</span>
+            <i>{{ item.diffNum || 0 }}</i>
+            <span>天</span>
+          </div>
+          <div class="item-bottom__right" hover-class="text-hover" v-if="item.today === '0'"
+               @click.stop="$linkTo('./AddReport?id=' + item.id)">
+            <span style="color: #FF883C">今日未上报</span>
+            <u-icon name="arrow-right" color="#ddd"/>
+          </div>
+          <div class="item-bottom__right" hover-class="text-hover" v-else
+               @click.stop="$linkTo('./RecordList?id=' + item.id)">
+            <span style="color: #999999">今日已上报</span>
+            <u-icon name="arrow-right" color="#ddd"/>
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="list.length==0"/>
+    </div>
+    <div class="btn-wrapper">
+      <div class="btn" @click="toReport" hover-class="text-hover">添加上报人员</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "AppHealthReport",
+  appName: "健康上报",
+  data() {
+    return {
+      list: [],
+      pageShow: false,
+      current: 1,
+      total: 0,
+    }
+  },
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  onLoad() {
+    this.$loading()
+    this.$dict.load(['villageActivityStatus']).then(() => {
+      this.getList()
+    })
+
+    uni.$on('update', () => {
+      this.current = 1
+      this.$nextTick(() => {
+        this.getList()
+      })
+    })
+  },
+
+  methods: {
+    toReport() {
+      this.$linkTo('./AddUser')
+    },
+
+    getList() {
+
+      this.$instance.post(`/app/appepidemicreportmember/list?openId=${this.user.openId}`, null, {
+        params: {
+          current: this.current,
+          size: 15
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.total = res.data.total
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records]
+          } else {
+            this.list = res.data.records
+          }
+          uni.hideLoading()
+          this.pageShow = true
+          if (res.data.records.length < 15) {
+
+            return false
+          }
+
+          this.current = this.current + 1
+        } else {
+          uni.hideLoading()
+        }
+      }).catch(() => {
+        uni.hideLoading()
+      })
+    }
+  },
+
+  onReachBottom() {
+    this.getList()
+  }
+}
+</script>
+
+<style lang="scss" socped>
+.returnHomeRegister {
+  padding: 0 0 150px 0;
+
+  .title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 32px;
+    padding: 48px 32px 0 32px;
+
+    & > h2 {
+      font-size: 38px;
+      color: #333;
+      font-weight: 600;
+    }
+
+    .right {
+      display: flex;
+      align-items: center;
+
+      span {
+        color: #666666;
+        font-size: 28px;
+      }
+
+      i {
+        color: #4181FF;
+        font-style: normal;
+        font-size: 28px;
+      }
+    }
+  }
+
+  .item {
+    margin: 0 32px 24px;
+    border-radius: 16px;
+    background: #fff;
+
+    .item-top {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 152px;
+      padding: 0 32px;
+      border-bottom: 1px solid #DDDDDD;
+
+      .item-top__left {
+        h2 {
+          line-height: 44px;
+          margin-bottom: 8px;
+          color: #333;
+          font-size: 32px;
+          font-weight: 600;
+        }
+
+        p {
+          color: #999999;
+          font-size: 26px;
+        }
+      }
+
+      & > span {
+        font-size: 26px;
+        color: #FF4466;
+      }
+    }
+
+    .item-bottom {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 104px;
+      padding: 0 32px;
+
+      .item-bottom__right {
+        span {
+          color: #999999;
+          font-size: 28px;
+        }
+      }
+
+      .item-bottom__left {
+        span {
+          color: #999999;
+          font-size: 28px;
+        }
+
+        i {
+          color: #4181FF;
+          font-size: 28px;
+        }
+      }
+
+      & > div {
+        display: flex;
+        align-items: center;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppHealthReport/Detail.vue b/src/project/pingchang/AppHealthReport/Detail.vue
new file mode 100644
index 0000000..c5b3632
--- /dev/null
+++ b/src/project/pingchang/AppHealthReport/Detail.vue
@@ -0,0 +1,246 @@
+<template>
+  <div class="detail">
+    <div class="detail-info">
+      <h2>健康状况</h2>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>当前体温</label>
+        </div>
+        <div class="right">
+          <span :style="{color: info.temperature >= 37.3 ? '#FF4466' : '#42D784'}">{{ info.temperature }}℃</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>14天内是否接触新冠确诊或疑似患者</label>
+        </div>
+        <div class="right">
+          <span :style="{color: info.touchInFourteen === '0' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen) }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>当前健康状况</label>
+        </div>
+        <div class="right">
+          <span :style="{color: !info.isHealth ? '#42D784' : '#FF4466'}">{{ info.healthName }}</span>
+        </div>
+      </div>
+    </div>
+    <div class="detail-info">
+      <h2>核酸检测信息</h2>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>核酸检测日期</label>
+        </div>
+        <div class="right">
+          <span>{{ info.checkTime.split(' ')[0] }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>核酸检测结果</label>
+        </div>
+        <div class="right">
+          <span :style="{color: info.checkResult === '0' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicRecentTestResult', info.checkResult) }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>健康码状态</label>
+        </div>
+        <div class="right">
+          <span :style="{color: info.healthCode === '0' || info.healthCode === '1' ? '#42D784' : '#FF4466'}">{{ $dict.getLabel('epidemicHealthCode', info.healthCode) }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>已接种疫苗次数</label>
+        </div>
+        <div class="right">
+          <span>{{ $dict.getLabel('epidemicVaccineTime', info.vaccine) }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item detail-info__item--img">
+        <div class="left">
+          <label>本人健康码截图</label>
+        </div>
+        <div class="right">
+          <image :src="item.url" @click="preview(item.url)" v-for="(item, index) in info.checkPhoto" :key="index" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    appName:"上报详情",
+    data () {
+      return {
+        info: {},
+        pageShow: false
+      }
+    },
+
+    onLoad (query) {
+      this.$loading()
+      this.$dict.load(['epidemicTouchInFourteen', 'epidemicRecentHealth', 'epidemicRecentTestResult', 'epidemicHealthCode', 'epidemicVaccineTime']).then(() => {
+        this.getInfo(query.id)
+      })
+    },
+
+    methods: {
+      preview (url) {
+        uni.previewImage({
+          urls: this.info.checkPhoto.map(v => v.url),
+          current: url
+        })
+      },
+
+      getInfo (id) {
+        this.$instance.post(`/app/appepidemichealthreport/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+            this.info.checkPhoto = JSON.parse(res.data.checkPhoto)
+            let healthName = ''
+            this.info.isHealth = false
+            res.data.health.split(',').forEach(v => {
+              if (v > 0) {
+                this.info.isHealth = true
+              }
+              healthName = healthName + this.$dict.getLabel('epidemicRecentHealth', v)
+            })
+            this.info.healthName = healthName
+
+            this.$nextTick(() => {
+              this.pageShow = true
+            })
+          }
+
+          this.$hideLoading()
+        })
+      },
+
+      call (phone) {
+        uni.makePhoneCall({
+          phoneNumber: phone
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .detail {
+    padding-bottom: 40px;
+
+    .detail-header {
+      padding: 32px;
+      background: #fff;
+
+      h2 {
+        margin-bottom: 32px;
+        color: #333333;
+        font-size: 40px;
+        font-weight: 600;
+      }
+
+      .item-info {
+        .item-info__item {
+          display: flex;
+          align-items: center;
+          margin-bottom: 8px;
+
+          &:last-child {
+            margin-bottom: 0;
+          }
+
+          image {
+            width: 32px;
+            height: 32px;
+            margin-right: 16px;
+          }
+
+          span {
+            color: #333;
+            font-size: 28px;
+          }
+        }
+      }
+    }
+
+    .detail-info {
+      margin-top: 24px;
+      padding: 0 32px;
+      background: #fff;
+
+      & > h2 {
+        height: 116px;
+        line-height: 116px;
+        font-size: 38px;
+        font-weight: 600;
+        color: #333;
+      }
+
+      .detail-info__item {
+        display: flex;
+        justify-content: space-between;
+        padding: 34px 0;
+        border-bottom: 1px solid #DDDDDD;
+
+        &:last-child {
+          border: none;
+        }
+
+        .left {
+          display: flex;
+          line-height: 1.3;
+          max-width: 360px;
+
+          label {
+            position: relative;
+            color: #999999;
+            font-size: 32px;
+          }
+        }
+
+        .right {
+          display: flex;
+          max-width: 450px;
+
+          span {
+            color: #333333;
+            font-size: 32px;
+            text-align: right;
+          }
+
+          image {
+            width: 40px;
+            height: 40px;
+          }
+        }
+      }
+
+      .detail-info__item--img {
+        display: block;
+
+        .right {
+          flex-wrap: wrap;
+          max-width: 100%;
+          margin-top: 34px;
+
+          image {
+            width: 226px;
+            height: 226px;
+            margin: 0 9px 9px 0;
+
+            &:nth-of-type(3n) {
+              margin-right: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/project/pingchang/AppHealthReport/RecordList.vue b/src/project/pingchang/AppHealthReport/RecordList.vue
new file mode 100644
index 0000000..e5bc507
--- /dev/null
+++ b/src/project/pingchang/AppHealthReport/RecordList.vue
@@ -0,0 +1,116 @@
+<template>
+  <div class="record" v-if="pageShow">
+    <div class="record-item" v-for="(item, index) in list" :key="index" @click="$linkTo('./Detail?id=' + item.id)"
+         hover-class="bg-hover">
+      <div class="left">{{ item.createTime.split(' ')[0] }}的健康上报</div>
+      <div class="right">
+        <i v-if="item.status === '0'">健康数据异常</i>
+        <u-icon name="arrow-right" color="#ddd"/>
+      </div>
+    </div>
+    <AiEmpty v-if="!list.length && isMore"/>
+  </div>
+</template>
+
+<script>
+export default {
+  appName: "上报记录",
+  data() {
+    return {
+      list: [],
+      pageShow: false,
+      current: 1,
+      total: 0,
+      isMore: false
+    }
+  },
+
+  onLoad(query) {
+    this.$loading()
+    this.getList(query)
+  },
+
+  methods: {
+    getList(query) {
+      if (this.isMore) return
+
+      this.$instance.post(`/app/appepidemichealthreport/list?memberId=${query.id}`, null, {
+        params: {
+          current: this.current,
+          size: 15
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.total = res.data.total
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records]
+          } else {
+            this.list = res.data.records
+          }
+          uni.hideLoading()
+          this.pageShow = true
+          if (res.data.records.length < 15) {
+            this.isMore = true
+
+            return false
+          }
+
+          this.current = this.current + 1
+        } else {
+          uni.hideLoading()
+        }
+      }).catch(() => {
+        uni.hideLoading()
+      })
+    }
+  },
+
+  onReachBottom() {
+    this.getList()
+  }
+}
+</script>
+
+<style lang="scss">
+.record {
+  padding: 32px 0;
+
+  .record-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 686px;
+    height: 112px;
+    margin: 0 auto 24px;
+    padding: 0 28px 0 32px;
+    background: #FFFFFF;
+    box-sizing: border-box;
+    box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.02);
+    border-radius: 16px;
+
+    .left {
+      color: #333333;
+      font-size: 32px;
+      font-weight: 600;
+    }
+
+    .right {
+      i {
+        width: 158px;
+        height: 36px;
+        line-height: 36px;
+        margin-right: 8px;
+        text-align: center;
+        font-size: 26px;
+        color: #FF4466;
+        background: #FFF5F7;
+      }
+    }
+
+    & > div {
+      display: flex;
+      align-items: center;
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppHealthReport/Result.vue b/src/project/pingchang/AppHealthReport/Result.vue
new file mode 100644
index 0000000..61a002e
--- /dev/null
+++ b/src/project/pingchang/AppHealthReport/Result.vue
@@ -0,0 +1,83 @@
+<template>
+  <div class="result">
+    <image src="/static/img/result.png" />
+    <h2>添加成功！</h2>
+    <div class="result-btn" hover-class="text-hover" @click="toReport">上报今日状态</div>
+    <div class="result-backBtn" @click="back">返回</div>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        id: ''
+      }
+    },
+
+    onLoad (query) {
+      this.id = query.id
+    },
+
+    methods: {
+      back () {
+        uni.navigateBack({
+          delta: 1
+        })
+      },
+
+      toReport () {
+        uni.redirectTo({
+          url: `./AddReport?id=${this.id}`
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .result {
+    min-height: 100vh;
+    padding-top: 160px;
+    box-sizing: border-box;
+    text-align: center;
+    background: #fff;
+
+    image {
+      width: 220px;
+      height: 220px;
+    }
+
+    .result-backBtn {
+      width: 320px;
+      height: 88px;
+      line-height: 88px;
+      margin: 32px auto 0;
+      text-align: center;
+      border: 1px solid #4181FF;
+      color: #4181FF;
+      font-size: 34px;
+      box-sizing: border-box;
+      border-radius: 16px;
+    }
+
+    h2 {
+      margin: 32px 0 80px;
+      font-weight: 600;
+      font-size: 40px;
+      color: #333;
+    }
+
+    .result-btn {
+      width: 320px;
+      height: 88px;
+      line-height: 88px;
+      margin: 0 auto;
+      text-align: center;
+      background: #4181FF;
+      color: #fff;
+      font-size: 34px;
+      border-radius: 16px;
+    }
+  }
+</style>
diff --git a/src/project/pingchang/AppHealthReport/UserInfo.vue b/src/project/pingchang/AppHealthReport/UserInfo.vue
new file mode 100644
index 0000000..f7a4cb0
--- /dev/null
+++ b/src/project/pingchang/AppHealthReport/UserInfo.vue
@@ -0,0 +1,134 @@
+<template>
+  <div class="userinfo" v-if="pageShow">
+    <div class="cell-group">
+      <div class="cell-item">
+        <div class="cell-item__wrapper">
+          <div class="left">
+            <span>上报人姓名</span>
+          </div>
+          <div class="right">
+            <span>{{ info.name }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="cell-item">
+        <div class="cell-item__wrapper">
+          <div class="left">
+            <span>身份证号</span>
+          </div>
+          <div class="right">
+            <span>{{ info.idNumber }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="cell-item">
+        <div class="cell-item__wrapper">
+          <div class="left">
+            <span>手机号码</span>
+          </div>
+          <div class="right">
+            <span>{{ info.phone }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="cell-item">
+        <div class="cell-item__wrapper">
+          <div class="left">
+            <span>上报地区</span>
+          </div>
+          <div class="right">
+            <span>{{ info.areaName }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="cell-item">
+        <div class="cell-item__wrapper">
+          <div class="left">
+            <span>详细地址</span>
+          </div>
+          <div class="right">
+            <span>{{ info.address }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    appName:"个人信息",
+    data () {
+      return {
+        info: {},
+        pageShow: false
+      }
+    },
+
+    onLoad (query) {
+      this.$loading()
+      this.getInfo(query.id)
+    },
+
+    methods: {
+      getInfo (id) {
+        this.$instance.post(`/app/appepidemicreportmember/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.info = res.data
+            if (res.data.eventStatus > 1) {
+              this.result = res.data.processList[0]
+            }
+            this.$nextTick(() => {
+              this.pageShow = true
+            })
+          }
+
+          this.$hideLoading()
+        }).catch(() => {
+          this.$hideLoading()
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .userinfo {
+    .cell-group {
+      background: #fff;
+
+      .cell-item {
+        padding-left: 32px;
+
+        .cell-item__wrapper {
+          display: flex;
+          justify-content: space-between;
+          padding: 34px 32px 34px 0;
+          border-bottom: 1px solid #DDDDDD;
+
+          .left {
+            span {
+              color: #999999;
+              font-size: 32px;
+            }
+          }
+
+          .right {
+            max-width: 450px;
+            text-align: right;
+            span {
+              color: #333333;
+              font-size: 32px;
+            }
+          }
+        }
+
+        &:last-child {
+          .cell-item__wrapper {
+            border-bottom: none;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/src/project/pingchang/AppReturnHomeRegister/Add.vue b/src/project/pingchang/AppReturnHomeRegister/Add.vue
new file mode 100644
index 0000000..bcf5c45
--- /dev/null
+++ b/src/project/pingchang/AppReturnHomeRegister/Add.vue
@@ -0,0 +1,635 @@
+<template>
+  <div class="album">
+    <div class="tips">请确保以下信息全部由本人填写，本人对所填写内容的真实性和完整性负责</div>
+    <div class="form-item__group">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>返乡人员姓名</h2>
+          </div>
+          <div class="form-item__right">
+            <input placeholder="请输入" v-model="form.name" :maxlength="20"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>身份证号</h2>
+          </div>
+          <div class="form-item__right">
+            <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="20"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>手机号码</h2>
+          </div>
+          <div class="form-item__right">
+            <input placeholder="请输入" type="number" v-model="form.phone" :maxlength="11"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>人员类别</h2>
+          </div>
+          <div class="form-item__right">
+            <AiSelect v-model="form.type" dict="epidemicRecentPersonType" class="select"></AiSelect>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form-item__group">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>出行方式</h2>
+          </div>
+          <div class="form-item__right">
+            <AiSelect dict="epidemicRecentTravel" v-model="form.travelType" class="select"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>出发时间</h2>
+          </div>
+          <div class="form-item__right">
+            <div class="ai-area" @click="isShowStartTime = true">
+              <div class="ai-area__wrapper">
+                <span class="label" v-if="form.startTime">{{ form.startTime }}</span>
+                <i v-else>请选择</i>
+                <u-icon name="arrow-right" color="#ddd"/>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>出发地区</h2>
+          </div>
+          <div class="form-item__right">
+            <AiAreaPicker class="ai-area" v-model="form.startAreaId" :fullName.sync="form.startAreaName" all>
+              <div class="ai-area__wrapper">
+                <span class="label" v-if="form.startAreaName">{{ form.startAreaName }}</span>
+                <i v-else>请选择</i>
+                <u-icon name="arrow-right" color="#ddd"/>
+              </div>
+            </AiAreaPicker>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__textarea">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>出发地址</h2>
+          </div>
+          <div class="form-item__right">
+            <textarea auto-height v-model="form.startAddress" :maxlength="500" placeholder="请输入详细的出发地址"
+                      placeholder-style="font-size: 16px"></textarea>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>到达时间</h2>
+          </div>
+          <div class="form-item__right">
+            <div class="ai-area" @click="isShowEndTime = true">
+              <div class="ai-area__wrapper">
+                <span class="label" v-if="form.arriveTime">{{ form.arriveTime }}</span>
+                <i v-else>请选择</i>
+                <u-icon name="arrow-right" color="#ddd"/>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>到达地区</h2>
+          </div>
+          <div class="form-item__right">
+            <AiAreaPicker class="ai-area" v-model="form.arriveAreaId" :fullName.sync="form.arriveAreaName" :areaId="$areaId">
+              <div class="ai-area__wrapper">
+                <span class="label" v-if="form.arriveAreaName">{{ form.arriveAreaName }}</span>
+                <i v-else>请选择</i>
+                <u-icon name="arrow-right" color="#ddd"/>
+              </div>
+            </AiAreaPicker>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__textarea">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>返乡地址</h2>
+          </div>
+          <div class="form-item__right">
+            <textarea auto-height v-model="form.arriveAddress" :maxlength="500" placeholder="请输入详细的返乡地址"
+                      placeholder-style="font-size: 16px"></textarea>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__textarea">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>行程描述</h2>
+          </div>
+          <div class="form-item__right">
+            <textarea auto-height style="height: 90px" v-model="form.description" :maxlength="500" placeholder="请输入行程描述"
+                      placeholder-style="font-size: 16px"></textarea>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form-item__group">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>核酸检测日期</h2>
+          </div>
+          <div class="form-item__right">
+            <div class="ai-area" @click="isShowDate = true">
+              <div class="ai-area__wrapper">
+                <span class="label" v-if="form.checkTime">{{ form.checkTime }}</span>
+                <i v-else>请选择</i>
+                <u-icon name="arrow-right" color="#ddd"/>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__imgs">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>本人健康码截图或核酸检测报告<span style="color:#999; fontSize:14px; font-weight: normal;">(最多9张)</span></h2>
+          </div>
+          <div class="form-item__right" style="padding-left: 5px;">
+            <AiUploader v-model="form.checkPhoto" :limit="9" multiple></AiUploader>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__imgs">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>核酸检测结果</h2>
+          </div>
+          <div class="form-item__right">
+            <AiRadio style="width: 100%;" v-model="form.checkResult" dict="epidemicRecentTestResult"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form-item__group">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>当前体温</h2>
+          </div>
+          <div class="form-item__right">
+            <input placeholder="请输入" v-model="form.temperature" :maxlength="20"/>
+            <i>℃</i>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__imgs">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>14天内是否接触新冠确诊或疑似患者</h2>
+          </div>
+          <div class="form-item__right">
+            <AiRadio style="width: 100%;" v-model="form.touchInFourteen" dict="epidemicTouchInFourteen"></AiRadio>
+          </div>
+        </div>
+      </div>
+      <div class="form-item form-item__imgs">
+        <div class="form-item__wrapper">
+          <div class="form-item__title">
+            <i>*</i>
+            <h2>当前健康状况（可多选）</h2>
+          </div>
+          <div class="form-item__right">
+            <AiCheckbox style="width: 100%;" v-model="form.health" dict="epidemicRecentHealth"></AiCheckbox>
+          </div>
+        </div>
+      </div>
+    </div>
+    <u-picker mode="time" :params="dataParams" v-model="isShowDate" @confirm="onDateChange"></u-picker>
+    <u-picker mode="time" :params="params" v-model="isShowStartTime" @confirm="onStartChange"></u-picker>
+    <u-picker mode="time" :params="params" v-model="isShowEndTime" @confirm="onEndChange"></u-picker>
+    <div class="btn-wrapper">
+      <div class="btn" hover-class="text-hover" @click="submit">提交</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  appName: "添加返乡记录",
+  data() {
+    return {
+      isShowType: false,
+      isShowEndTime: false,
+      isShowStartTime: false,
+      isShowDate: false,
+      params: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true
+      },
+      dataParams: {
+        year: true,
+        month: true,
+        day: true
+      },
+      form: {
+        arriveAddress: '',
+        arriveAreaId: '',
+        arriveAreaName: '',
+        arriveTime: '',
+        checkPhoto: [],
+        checkResult: '',
+        checkTime: '',
+        description: '',
+        health: [],
+        idNumber: '',
+        name: '',
+        phone: '',
+        startAddress: '',
+        startAreaId: '',
+        startAreaName: '',
+        startTime: '',
+        temperature: '',
+        touchInFourteen: '',
+        travelType: '',
+        type: '',
+        unusual: '',
+      },
+      dictList: [],
+      arr: [],
+      gridList: [[], [], []],
+      flag: false,
+      $areaId: ''
+    }
+  },
+
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  onLoad() {
+    this.$areaId = this.user.$areaId
+  },
+
+  methods: {
+    onDateChange(e) {
+      this.form.checkTime = `${e.year}-${e.month}-${e.day}`
+    },
+
+    onStartChange(e) {
+      this.form.startTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
+    },
+
+    onEndChange(e) {
+      this.form.arriveTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
+    },
+
+    submit() {
+      if (!this.form.name) {
+        return this.$toast('请输入返乡人员姓名')
+      }
+
+      if (!this.form.idNumber) {
+        return this.$toast('请输入返乡人员身份证号')
+      }
+
+      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.form.idNumber)) {
+        return this.$toast('请输入正确的身份证账号')
+      }
+
+      if (!this.form.phone) {
+        return this.$toast('请输入返乡人员手机号码')
+      }
+
+      if (!/^1[0-9]{10,10}$/.test(this.form.phone)) {
+        return this.$toast('请输入正确的手机号码')
+      }
+
+      if (!this.form.type) {
+        return this.$toast('请选择人员类别')
+      }
+
+      if (!this.form.travelType) {
+        return this.$toast('请选择出行方式')
+      }
+
+      if (!this.form.startTime) {
+        return this.$toast('请选择出发时间')
+      }
+
+      // if (new Date(this.form.startTime.replace(/-/g, '/')).getTime() > new Date().getTime()) {
+      //   return this.$toast('出发时间不得晚于当前时间')
+      // }
+
+      if (!this.form.startAreaName) {
+        return this.$toast('请选择出发地区')
+      }
+
+      if (this.form.startAreaId.substr(this.form.startAreaId.length - 3, 3) === '000') {
+        return this.$toast('出发地区必须选到村或社区')
+      }
+      if (!this.form.startAddress) {
+        return this.$toast('请输入出发详细地址')
+      }
+
+      if (!this.form.arriveTime) {
+        return this.$toast('请选择到达时间')
+      }
+
+      if (new Date(this.form.startTime.replace(/-/g, '/')).getTime() >= new Date(this.form.arriveTime.replace(/-/g, '/')).getTime()) {
+        return this.$toast('到达时间不得早于出发时间')
+      }
+
+      if (!this.form.arriveAreaName) {
+        return this.$toast('请选择到达地区')
+      }
+      if (this.form.arriveAreaId.substr(this.form.arriveAreaId.length - 3, 3) === '000') {
+        return this.$toast('到达地区必须选到村或社区')
+      }
+      if (!this.form.arriveAddress) {
+        return this.$toast('请输入返乡地址')
+      }
+
+      if (!this.form.description) {
+        return this.$toast('请输入行程描述')
+      }
+      if (!this.form.checkTime) {
+        return this.$toast('请选择核酸检测日期')
+      }
+      if (!this.form.checkPhoto.length) {
+        return this.$toast('请上传本人健康码截图或核酸检测报告')
+      }
+
+      if (!this.form.checkResult) {
+        return this.$toast('请选择核酸检测结果')
+      }
+      if (!this.form.temperature) {
+        return this.$toast('请输入当前体温')
+      }
+      if (!this.form.touchInFourteen) {
+        return this.$toast('请选择14天内是否接触新冠确诊或疑似患者')
+      }
+
+      if (!this.form.health.length) {
+        return this.$toast('请选择当前健康状况')
+      }
+      if (this.flag) return
+      this.flag = true
+
+      this.$loading()
+      this.$instance.post(`/app/appepidemicbackhomerecord/addOrUpdate`, {
+        ...this.form,
+        openid: this.user.openid,
+        startTime: this.form.startTime + ':00',
+        arriveTime: this.form.arriveTime + ':00',
+        checkTime: this.form.checkTime + ' 00:00:00',
+        health: this.form.health.join(','),
+        checkPhoto: JSON.stringify(this.form.checkPhoto)
+      }).then(res => {
+        this.$hideLoading()
+        this.flag = false
+        if (res.code == 0) {
+          uni.$emit('update')
+          this.$toast('提交成功')
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 400)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.album {
+  padding-bottom: 140px;
+
+  .tips {
+    line-height: 1.3;
+    padding: 32px 32px;
+    color: #FF883C;
+    font-size: 30px;
+    text-align: justify;
+    background: #FFF8F3;
+  }
+
+  .form-item__group {
+    margin-bottom: 24px;
+    background: #fff;
+  }
+
+  .form-item {
+    padding-left: 32px;
+
+    .form-item__checkbox {
+      width: 100%;
+
+      div {
+        width: 100%;
+        height: 80px;
+        line-height: 80px;
+        margin-bottom: 24px;
+        text-align: center;
+        background: #FFFFFF;
+        border-radius: 16px;
+        color: #333333;
+        font-size: 28px;
+        border: 1px solid #CCCCCC;
+
+        &.active {
+          background: #4181FF;
+          color: #fff;
+          border-color: #4181FF;
+        }
+      }
+    }
+
+    .form-item__radio {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+
+      div {
+        width: 212px;
+        height: 80px;
+        line-height: 80px;
+        margin-right: 16px;
+        margin-bottom: 8px;
+        text-align: center;
+        background: #FFFFFF;
+        border-radius: 16px;
+        color: #333333;
+        font-size: 28px;
+        border: 1px solid #CCCCCC;
+
+        &:nth-of-type(3n) {
+          margin-right: 0;
+        }
+
+        &.active {
+          background: #4181FF;
+          color: #fff;
+          border-color: #4181FF;
+        }
+      }
+    }
+
+    .ai-area__wrapper {
+      display: flex;
+      align-items: center;
+      padding-left: 100px;
+
+      span {
+        color: #333;
+        font-size: 30px;
+      }
+
+      i {
+        color: #999;
+        font-size: 30px;
+      }
+
+      image {
+        width: 16px;
+        height: 8px;
+      }
+    }
+
+    .form-item__wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 128px;
+      padding-right: 28px;
+      border-bottom: 1px solid #DDDDDD;
+
+      input {
+        flex: 1;
+        height: 100%;
+        text-align: right;
+        color: #333;
+        padding-right: 10px;
+      }
+
+      .form-item__right {
+        display: flex;
+        align-items: center;
+        font-size: 32px;
+
+        .select {
+          ._i {
+            padding-left: 100px;
+          }
+        }
+
+        span {
+          max-width: 400px;
+          margin-right: 8px;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        i {
+          margin-right: 8px;
+          color: #999999;
+        }
+      }
+    }
+
+    &:last-child {
+      .form-item__wrapper {
+        border-bottom: none;
+      }
+    }
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+
+      i {
+        font-size: 32px;
+        color: #FF4466;
+      }
+
+      span {
+        font-size: 28px;
+        color: #999999;
+      }
+
+      h2 {
+        padding: 0 4px;
+        font-weight: 600;
+        font-size: 32px;
+        color: #333333;
+      }
+    }
+
+
+    &.form-item__imgs, &.form-item__textarea {
+      .form-item__wrapper {
+        display: block;
+        height: auto;
+        padding-bottom: 32px;
+      }
+
+      textarea {
+        width: 100%;
+        height: 90px;
+      }
+
+      .form-item__title {
+        padding: 32px 0;
+      }
+
+      .form-item__right {
+        padding-left: 18px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue b/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue
new file mode 100644
index 0000000..a783973
--- /dev/null
+++ b/src/project/pingchang/AppReturnHomeRegister/AppReturnHomeRegister.vue
@@ -0,0 +1,197 @@
+<template>
+  <div class="returnHomeRegister">
+    <div class="title">
+      <h2>全部记录</h2>
+      <div class="right">
+        <span>共</span>
+        <i>{{ total }}</i>
+        <span>条</span>
+      </div>
+    </div>
+    <div class="home-list">
+      <div class="item" hover-class="bg-hover" @click="$linkTo(`./Detail?id=${item.id}`)"
+           v-for="(item, index) in list" :key="index">
+        <div class="item-top">
+          <h2>{{ item.name }}</h2>
+          <span v-if="item.status === '0'">有异常情况</span>
+        </div>
+        <p>{{ item.idNumber.replace(/^(\d{6})\d{8}(.{4}$)/g, `$1${Array(9).join('*')}$2`) }}</p>
+        <div class="item-info">
+          <div class="item-info__item">
+            <image src="/static/img/from-icon.png"/>
+            <span>{{ item.startAreaName }}</span>
+          </div>
+          <div class="item-info__item">
+            <image src="/static/img/to-icon.png"/>
+            <span>{{ item.arriveAreaName }}</span>
+          </div>
+          <div class="item-info__item">
+            <image src="/static/img/to-date.png"/>
+            <span>{{ item.arriveTime && item.arriveTime.substr(0, item.arriveTime.length - 3) }} 到达</span>
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="list.length==0"/>
+    </div>
+    <div class="btn-wrapper">
+      <div class="btn" @click="toReport" hover-class="text-hover">添加返乡记录</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "AppReturnHomeRegister",
+  appName: "返乡登记",
+  data() {
+    return {
+      list: [],
+      current: 1,
+      total: 0
+    }
+  },
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  onLoad() {
+    this.$loading()
+    this.getList()
+    this.$dict.load('villageActivityStatus')
+    uni.$on('update', () => {
+      this.current = 1
+      this.$nextTick(() => {
+        this.getList()
+      })
+    })
+  },
+
+  methods: {
+    toReport() {
+      this.$linkTo('./Add')
+    },
+    getList() {
+      this.$instance.post(`/app/appepidemicbackhomerecord/list`, null, {
+        params: {
+          openId: this.user.openId,
+          current: this.current,
+          size: 15
+        }
+      }).then(res => {
+        uni.hideLoading()
+        if (res?.data) {
+          this.total = res.data.total
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records]
+          } else {
+            this.list = res.data.records
+          }
+        }
+      }).catch(() => {
+        uni.hideLoading()
+      })
+    }
+  },
+
+  onReachBottom() {
+    this.current++
+    this.getList()
+  }
+}
+</script>
+
+<style lang="scss" socped>
+.returnHomeRegister {
+  padding: 0 0 150px 0;
+
+  .title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 32px;
+    padding: 48px 32px 0 32px;
+
+    & > h2 {
+      font-size: 38px;
+      color: #333;
+      font-weight: 600;
+    }
+
+    .right {
+      display: flex;
+      align-items: center;
+
+      span {
+        color: #666666;
+        font-size: 28px;
+      }
+
+      i {
+        color: #4181FF;
+        font-style: normal;
+        font-size: 28px;
+      }
+    }
+  }
+
+  .item {
+    margin: 0 32px 24px;
+    padding: 32px;
+    border-radius: 16px;
+    background: #fff;
+
+    .item-info {
+      .item-info__item {
+        display: flex;
+        margin-bottom: 8px;
+        line-height: 1.3;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+
+        image {
+          position: relative;
+          top: 2px;
+          width: 32px;
+          height: 32px;
+          margin-right: 16px;
+        }
+
+        span {
+          flex: 1;
+          color: #333;
+          font-size: 28px;
+        }
+      }
+    }
+
+    .item-top {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 50px;
+
+      h2 {
+        color: #333333;
+        font-size: 36px;
+        font-weight: 600;
+      }
+
+      span {
+        font-size: 28px;
+        color: #FF4466;
+      }
+    }
+
+    p {
+      margin: 14px 0 20px;
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+}
+</style>
diff --git a/src/project/pingchang/AppReturnHomeRegister/Detail.vue b/src/project/pingchang/AppReturnHomeRegister/Detail.vue
new file mode 100644
index 0000000..e039891
--- /dev/null
+++ b/src/project/pingchang/AppReturnHomeRegister/Detail.vue
@@ -0,0 +1,356 @@
+<template>
+  <div class="detail" v-if="pageShow">
+    <div class="detail-header">
+      <h2>{{ info.name }}的返乡登记信息</h2>
+      <div class="item-info">
+        <div class="item-info__item">
+          <image src="/static/img/from-icon.png"/>
+          <span>{{ info.startAreaName }}</span>
+        </div>
+        <div class="item-info__item">
+          <image src="/static/img/to-icon.png"/>
+          <span>{{ info.arriveAreaName }}</span>
+        </div>
+        <div class="item-info__item">
+          <image src="/static/img/to-date.png"/>
+          <span>{{ info.arriveTime && info.arriveTime.substr(0, info.arriveTime.length - 3) }} 到达</span>
+        </div>
+      </div>
+    </div>
+    <div class="detail-info">
+      <h2>基本信息</h2>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>姓名</label>
+        </div>
+        <div class="right">
+          <span>{{ info.name }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>身份证号</label>
+        </div>
+        <div class="right">
+          <span>{{ info.idNumber }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>手机号码</label>
+        </div>
+        <div class="right" @click="call(info.phone)" hover-class="text-hover">
+          <image src="https://cdn.cunwuyun.cn/dvcp/h5/common/phone.png"/>
+          <span style="color: #4181FF">{{ info.phone }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>人员类别</label>
+        </div>
+        <div class="right">
+          <span :style="{color: /[03]/.test(info.type) ? '#42D784' : '#FF4466'}">{{
+              $dict.getLabel('epidemicMemberType', info.type)
+            }}</span>
+        </div>
+      </div>
+    </div>
+    <div class="detail-info">
+      <h2>行程信息</h2>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>出行方式</label>
+        </div>
+        <div class="right">
+          <span>{{ $dict.getLabel('epidemicRecentTravel', info.travelType) }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>出发时间</label>
+        </div>
+        <div class="right">
+          <span>{{ info.startTime && info.startTime.substr(0, info.startTime.length - 3) }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>出发地区</label>
+        </div>
+        <div class="right">
+          <span :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{ info.startAreaName }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>出发地址</label>
+        </div>
+        <div class="right">
+          <span>{{ info.startAddress }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>到达时间</label>
+        </div>
+        <div class="right">
+          <span>{{ info.arriveTime && info.arriveTime.substr(0, info.arriveTime.length - 3) }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>返乡地区</label>
+        </div>
+        <div class="right">
+          <span>{{ info.arriveAreaName }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>返乡地址</label>
+        </div>
+        <div class="right">
+          <span>{{ info.arriveAddress }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>行程描述</label>
+        </div>
+        <div class="right">
+          <span>{{ info.description }}</span>
+        </div>
+      </div>
+    </div>
+    <div class="detail-info">
+      <h2>核酸检测信息</h2>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>核酸检测日期</label>
+        </div>
+        <div class="right">
+          <span>{{ info.checkTime.split(' ')[0] }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>核酸检测结果</label>
+        </div>
+        <div class="right">
+          <span :style="{color: info.checkResult === '0' ? '#42D784' : '#FF4466'}">{{
+              $dict.getLabel('epidemicRecentTestResult', info.checkResult)
+            }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item detail-info__item--img">
+        <div class="left" style="max-width: 100%;">
+          <label>本人健康码截图或核酸检测报告</label>
+        </div>
+        <div class="right">
+          <image :src="item.url" @click="preview(item.url)" v-for="(item, index) in info.checkPhoto" :key="index"/>
+        </div>
+      </div>
+    </div>
+    <div class="detail-info">
+      <h2>健康状况</h2>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>当前体温</label>
+        </div>
+        <div class="right">
+          <span :style="{color: info.temperature >= 37.3 ? '#FF4466' : '#42D784'}">{{ info.temperature }}℃</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>14天内是否接触新冠确诊或疑似患者</label>
+        </div>
+        <div class="right">
+          <span :style="{color: info.touchInFourteen === '0' ? '#42D784' : '#FF4466'}">{{
+              $dict.getLabel('epidemicTouchInFourteen', info.touchInFourteen)
+            }}</span>
+        </div>
+      </div>
+      <div class="detail-info__item">
+        <div class="left">
+          <label>当前健康状况</label>
+        </div>
+        <div class="right">
+          <span :style="{color: !info.isHealth ? '#42D784' : '#FF4466'}">{{ info.healthName }}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  appName: "返乡登记详情",
+  data() {
+    return {
+      info: {},
+      pageShow: false
+    }
+  },
+
+  onLoad(query) {
+    this.$loading()
+    this.$dict.load(['epidemicRecentHealth', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicMemberType', 'epidemicRecentTestResult']).then(() => {
+      this.getInfo(query.id)
+    })
+  },
+
+  methods: {
+    preview(url) {
+      uni.previewImage({
+        urls: this.info.checkPhoto.map(v => v.url),
+        current: url
+      })
+    },
+
+    getInfo(id) {
+      this.$instance.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+          this.info.checkPhoto = JSON.parse(res.data.checkPhoto)
+          let healthName = ''
+          this.info.isHealth = false
+          res.data.health.split(',').forEach(v => {
+            if (v > 0) {
+              this.info.isHealth = true
+            }
+            healthName = healthName + this.$dict.getLabel('epidemicRecentHealth', v)
+          })
+          this.info.healthName = healthName
+
+          this.$nextTick(() => {
+            this.pageShow = true
+          })
+        }
+
+        this.$hideLoading()
+      })
+    },
+
+    call(phone) {
+      uni.makePhoneCall({
+        phoneNumber: phone
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.detail {
+  padding-bottom: 40px;
+
+  .detail-header {
+    padding: 32px;
+    background: #fff;
+
+    h2 {
+      margin-bottom: 32px;
+      color: #333333;
+      font-size: 40px;
+      font-weight: 600;
+    }
+
+    .item-info {
+      .item-info__item {
+        display: flex;
+        align-items: center;
+        margin-bottom: 8px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+
+        image {
+          width: 32px;
+          height: 32px;
+          margin-right: 16px;
+        }
+
+        span {
+          color: #333;
+          font-size: 28px;
+        }
+      }
+    }
+  }
+
+  .detail-info {
+    margin-top: 24px;
+    padding: 0 32px;
+    background: #fff;
+
+    & > h2 {
+      height: 116px;
+      line-height: 116px;
+      font-size: 38px;
+      font-weight: 600;
+      color: #333;
+    }
+
+    .detail-info__item {
+      display: flex;
+      justify-content: space-between;
+      padding: 34px 0;
+      border-bottom: 1px solid #DDDDDD;
+
+      &:last-child {
+        border: none;
+      }
+
+      .left {
+        display: flex;
+        line-height: 1.3;
+        max-width: 360px;
+
+        label {
+          position: relative;
+          color: #999999;
+          font-size: 32px;
+        }
+      }
+
+      .right {
+        display: flex;
+        max-width: 450px;
+
+        span {
+          color: #333333;
+          font-size: 32px;
+          text-align: right;
+        }
+
+        image {
+          width: 40px;
+          height: 40px;
+        }
+      }
+    }
+
+    .detail-info__item--img {
+      display: block;
+
+      .right {
+        flex-wrap: wrap;
+        max-width: 100%;
+        margin-top: 34px;
+
+        image {
+          width: 226px;
+          height: 226px;
+          margin: 0 9px 9px 0;
+
+          &:nth-of-type(3n) {
+            margin-right: 0;
+          }
+        }
+      }
+    }
+  }
+}
+</style>