diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index 62195a48..77b3f871 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -194,8 +194,8 @@
             <span>是否参加医保</span>
           </div>
           <div class="right">
-            <div class="check-item">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">否<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.medicalInsurance == 1 ? 'check-active' : '' " @click="form.medicalInsurance=1">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.medicalInsurance != 1 ? 'check-active' : '' " @click="form.medicalInsurance=0">否<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
@@ -206,8 +206,8 @@
             <span>是否参加大病保险</span>
           </div>
           <div class="right">
-            <div class="check-item">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">否<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.sicknessInsurance == 1 ? 'check-active' : '' " @click="form.sicknessInsurance=1">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.sicknessInsurance != 1 ? 'check-active' : '' " @click="form.sicknessInsurance=0">否<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
@@ -218,8 +218,8 @@
             <span>是否参加养老保险</span>
           </div>
           <div class="right">
-            <div class="check-item">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">否<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.endowmentInsurance == 1 ? 'check-active' : '' " @click="form.endowmentInsurance=1">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.endowmentInsurance != 1 ? 'check-active' : '' " @click="form.endowmentInsurance=0">否<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
@@ -227,11 +227,11 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i>*</i>
-            <span>最低生活保障</span>
+            <span>是否享受最低生活保障</span>
           </div>
           <div class="right">
-            <div class="check-item">享受<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">未享受<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.subsistenceAllowance == 1 ? 'check-active' : '' " @click="form.subsistenceAllowance=1">享受<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.subsistenceAllowance != 1 ? 'check-active' : '' " @click="form.subsistenceAllowance=0">未享受<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
@@ -242,8 +242,8 @@
             <span>是否特困供养</span>
           </div>
           <div class="right">
-            <div class="check-item">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">否<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.destitute == 1 ? 'check-active' : '' " @click="form.destitute=1">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.destitute != 1 ? 'check-active' : '' " @click="form.destitute=0">否<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue
index e69de29b..7f839413 100644
--- a/src/apps/AppMonitoringObject/Detail.vue
+++ b/src/apps/AppMonitoringObject/Detail.vue
@@ -0,0 +1,616 @@
+<template>
+  <div class="detail" v-if="pageShow" :class="[isFrom ? 'active' : '']">
+    <div class="tab" v-if="!isFrom">
+      <span @click="changeTab(0)" :class="[currIndex === 0 ? 'active' : '']">基本信息</span>
+      <span @click="changeTab(1)" :class="[currIndex === 1 ? 'active' : '']">帮扶日志</span>
+    </div>
+    <div class="tab-content">
+      <div class="tab-content__item" v-show="currIndex === 0">
+        <div class="item-wrapper">
+          <div class="item-header item-avatar">
+            <div class="left">
+               <image :src="$cdn + 'avatar.png'"/>
+              <div class="left-right">
+                <h2>{{ info.name }}</h2>
+                <p>{{ info.phone }}</p>
+              </div>
+            </div>
+            <span @click="linkTo('./Add?id=' + info.id)">编辑</span>
+          </div>
+          <div class="item-info">
+            <label>现住地址</label>
+            <span>{{ info.addressArea }}</span>
+          </div>
+          <div class="item-info">
+            <label>详细地址</label>
+            <span>{{ info.address }}</span>
+          </div>
+          <div class="more-info" v-if="viewAll">
+            <div class="item-info">
+              <label>民族</label>
+              <span>{{ info.address }}</span>
+            </div>
+            <div class="item-info">
+              <label>政治面貌</label>
+              <span>{{ info.address }}</span>
+            </div>
+            <div class="item-info">
+              <label>文化程度</label>
+              <span>{{ info.address }}</span>
+            </div>
+            <div class="item-info">
+              <label>在校生情况</label>
+              <span>{{ info.address }}</span>
+            </div>
+            <div class="item-info">
+              <label>健康状况</label>
+              <span>{{ info.address }}</span>
+            </div>
+            <div class="item-info">
+              <label>大病保险</label>
+              <span>{{ info.address }}</span>
+            </div>
+            <div class="item-info">
+              <label>医疗参保</label>
+              <span>{{ info.address }}</span>
+            </div>
+            <div class="item-info">
+              <label>享受最低生活保障</label>
+              <span>{{ info.address }}</span>
+            </div>
+            <div class="item-info">
+              <label>养老保险</label>
+              <span>{{ info.address }}</span>
+            </div>
+            <div class="item-info">
+              <label>特困供养</label>
+              <span>{{ info.address }}</span>
+            </div>
+            <div class="item-info">
+              <label>劳动技能</label>
+              <span>{{ info.address }}</span>
+            </div>
+            <div class="item-info">
+              <label>务工时间/月</label>
+              <span>{{ info.address }}</span>
+            </div>
+            <div class="item-info">
+              <label>务工区域</label>
+              <span>{{ info.address }}</span>
+            </div>
+          </div>
+          <div class="view-all" @click="viewAll = !viewAll">{{viewAll ? '收起详情 ' : '展开详情 '}}<img :class="viewAll ? 'img-active' : ''" src="./components/img/top-icon-blue.png" /></div>
+          <!-- <div class="item-info">
+            <label>是否扶贫搬迁</label>
+            <span>{{ $dict.getLabel('fpYesOrNo', info.move) }}</span>
+          </div>
+          <div class="item-info" v-if="info.move === '01'">
+            <label>安置地区</label>
+            <span>{{ info.placeArea }}</span>
+          </div>
+          <div class="item-info" v-if="info.move === '01'">
+            <label>安置详细地址</label>
+            <span>{{ info.place }}</span>
+          </div>
+          <div class="item-info">
+            <label>纳入监测时间</label>
+            <span>{{ info.createTime }}</span>
+          </div>
+          <div class="item-info">
+            <label>监测员</label>
+            <span>{{ info.monitoringContact || '-' }}</span>
+          </div>
+          <div class="item-info">
+            <label>监测员电话</label>
+            <span style="color: #3D94FB;"
+                  @click="call(info.monitoringContactPhone)">{{ info.monitoringContactPhone || '-' }}</span>
+          </div> -->
+        </div>
+        <div class="item-wrapper">
+          <div class="item-header">
+            <div class="left">
+              <h2>家庭成员</h2>
+              <i :style="{color: info.familyList.length ? '#2EA222' : '#FF4466'}">({{
+                  info.familyList.length ? '已填写' : '未填写'
+                }})</i>
+            </div>
+            <span @click="linkTo('./MonitorFamilyMember?id=' + info.id)">编辑</span>
+          </div>
+          <div class="item-info">
+            <label>未参加医疗参保</label>
+            <span>{{ info.ylbxCount }}人</span>
+          </div>
+          <div class="item-info">
+            <label>未参加养老保险</label>
+            <span>{{ info.ylCount }}人</span>
+          </div>
+        </div>
+        <div class="item-wrapper">
+          <div class="item-header">
+            <div class="left">
+              <h2>家庭情况</h2>
+              <i :style="{color: isFamilySituation ? '#2EA222' : '#FF4466'}">({{
+                  isFamilySituation ? '已填写' : '未填写'
+                }})</i>
+            </div>
+            <span @click="linkTo('./MonitorFamilySituation?id=' + info.id)">编辑</span>
+          </div>
+          <div class="item-info">
+            <label>是否危房</label>
+            <span>{{ $dict.getLabel('fpYesOrNo', info.dilapidatedHouse) || '-' }}</span>
+          </div>
+          <div class="item-info">
+            <label>饮用水安全问题</label>
+            <span>{{ $dict.getLabel('fpYesOrNo', info.drinkingWaterSafety) || '-' }}</span>
+          </div>
+        </div>
+        <div class="item-wrapper">
+          <div class="item-header">
+            <div class="left">
+              <h2>收支情况</h2>
+              <i :style="{color: isIncome ? '#2EA222' : '#FF4466'}">({{ isIncome ? '已填写' : '未填写' }})</i>
+            </div>
+            <span @click="linkTo('./MonitorIncome?id=' + info.id)">编辑</span>
+          </div>
+          <div class="item-info">
+            <label>家庭纯收入</label>
+            <span>{{ info.income6 }}元</span>
+          </div>
+          <div class="item-info">
+            <label>家庭人均纯收入</label>
+            <span>{{ info.income7 }}元</span>
+          </div>
+        </div>
+        <div class="item-wrapper">
+          <div class="item-header">
+            <div class="left">
+              <h2>结对帮扶</h2>
+              <i :style="{color: isPoorStatus ? '#2EA222' : '#FF4466'}">({{ isPoorStatus ? '已填写' : '未填写' }})</i>
+            </div>
+            <span @click="linkTo('./MonitorPoorStatus?id=' + info.id)">编辑</span>
+          </div>
+          <div class="item-info">
+            <label>结对帮扶</label>
+            <span>{{ info.riskEliminationMethod ? '是' : '-' }}</span>
+          </div>
+          <div class="item-info">
+            <label>消除风险</label>
+            <span>{{ info.riskEliminationMethod ? '是' : '-' }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="tab-content__item" v-show="currIndex === 1">
+        <div class="log-item" v-for="(item, index) in list" :key="index">
+          <div class="log-item__wrapper">
+            <div class="log-item__user">
+              <div class="left">
+                <div class="user">
+                  <span>{{ item.createUserName.substr(item.createUserName.length - 2) }}</span>
+                </div>
+                <h2>{{ item.createUserName }}</h2>
+              </div>
+              <div class="right">
+                <span>{{ item.createTime }}</span>
+                <image src="/static/images/more.png" @click="edit(item.id)"/>
+              </div>
+            </div>
+            <p>{{ item.detail }}</p>
+            <div class="imgs">
+              <image :src="img.url" @click="prevImg(item.imgs, img.url)" v-for="(img, index) in item.imgs"
+                     :key="index"/>
+            </div>
+          </div>
+        </div>
+        <AiEmpty v-if="!list.length" style="padding-bottom: 20px;"></AiEmpty>
+      </div>
+    </div>
+    <AiFixedBtn v-if="currIndex === 1">
+      <div class="addBtn iconfont iconfont-iconfangda" @tap="toAddLog"></div>
+    </AiFixedBtn>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'detail',
+
+  data() {
+    return {
+      info: {},
+      pageShow: false,
+      currIndex: 0,
+      list: [],
+      isFrom: false,
+      viewAll: false
+    }
+  },
+
+
+  computed: {
+    isIncome() {
+      if (!this.info.id) {
+        return false
+      }
+
+      return this.info.income6 > 0 && this.info.income7 > 0;
+
+
+    },
+
+    isPoorStatus() {
+      if (!this.info.id) {
+        return false
+      }
+
+      return !!this.info.riskEliminationMethod;
+
+
+    },
+
+    isFamilySituation() {
+      if (!this.info.id) {
+        return false
+      }
+
+      return !!(this.info.drinkingWaterSafety && this.info.dilapidatedHouse);
+
+
+    }
+  },
+
+  onLoad(query) {
+    if (query.isFrom) {
+      this.isFrom = true
+    }
+    uni.showLoading()
+    this.$dict.load(['fpType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo']).then(() => {
+      this.getInfo(query.id)
+    })
+
+    this.id = query.id
+    uni.$on('reload', () => {
+      this.getInfo(query.id)
+    })
+  },
+  onShow() {
+    document.title = '风险预警详情'
+  },
+
+  methods: {
+    linkTo(url) {
+      uni.navigateTo({url})
+    },
+
+    call(phone) {
+      if (phone) {
+        uni.makePhoneCall({
+          phoneNumber: phone
+        })
+      }
+    },
+
+    edit(id) {
+      uni.showActionSheet({
+        itemList: ['编辑', '删除'],
+        success: res => {
+          if (res.tapIndex === 0) {
+            uni.navigateTo({
+              url: `./MonitorAddLog?pid=${this.info.id}&id=${id}`
+            })
+          } else if (res.tapIndex === 1) {
+            this.$confirm('确定删除该数据？').then(() => {
+              uni.showLoading()
+              this.$http.post(`/app/apppreventionreturntopovertylog/delete?ids=${id}`).then(res => {
+                if (res.code === 0) {
+                  this.$u.toast('删除成功')
+                  this.getInfo(this.id)
+                }
+                uni.hideLoading()
+              })
+            }).catch(() => {
+            })
+          }
+        }
+      })
+    },
+
+    prevImg(urls, img) {
+      const imgs = urls.map(v => v.url)
+      uni.previewImage({
+        urls: imgs,
+        current: img
+      })
+    },
+
+    toAddLog() {
+      uni.navigateTo({
+        url: './MonitorAddLog?pid=' + this.info.id
+      })
+    },
+
+    changeTab(index) {
+      this.currIndex = index
+    },
+
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+
+          let ylbxCount = 0
+          let ylCount = 0
+          res.data.familyList.forEach(item => {
+            if (item.medicalInsurance === '02') {
+              ylbxCount = ylbxCount + 1
+            }
+            if (item.endowmentInsurance === '02') {
+              ylCount = ylCount + 1
+            }
+          })
+          this.info.ylbxCount = ylbxCount
+          this.info.ylCount = ylCount
+          this.pageShow = true
+        }
+
+        uni.hideLoading()
+      })
+      this.$http.post(`/app/apppreventionreturntopovertylog/list?pid=${id}&size=1000&current=1`).then(res => {
+        if (res.code === 0) {
+          this.list = res.data.records.map(item => {
+            return {
+              ...item,
+              imgs: JSON.parse(item.picture)
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.detail {
+  padding-top: 96px;
+  padding-bottom: 60px;
+
+  &.active {
+    padding-top: 0;
+  }
+
+  .addBtn {
+    width: 96px;
+    height: 96px;
+    flex-shrink: 0;
+    background: $uni-color-primary;
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
+    font-size: 48px;
+    color: #fff;
+    border-radius: 50%;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+  }
+
+  .tab {
+    display: flex;
+    position: fixed;
+    align-items: center;
+    left: 0;
+    top: 0;
+    z-index: 1;
+    width: 100%;
+    height: 96px;
+    padding: 0 60px;
+    background: #FFFFFF;
+    border-bottom: 1px solid #D4D4D4;
+    box-sizing: border-box;
+
+    * {
+      box-sizing: border-box;
+    }
+
+    span {
+      position: relative;
+      flex: 1;
+      height: 96px;
+      line-height: 96px;
+      color: #000000;
+      text-align: center;
+      font-size: 32px;
+
+      &::after {
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        width: 192px;
+        height: 6px;
+        background: transparent;
+        transform: translateX(-50%);
+        content: ' ';
+      }
+
+      &.active {
+        color: #1365DD;
+
+        &::after {
+          background: #1365DD;
+        }
+      }
+    }
+  }
+
+  .item-wrapper {
+    background: #fff;
+    margin-bottom: 16px;
+    padding: 0 32px 16px;
+
+    .item-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 96px;
+
+      & > span {
+        color: #3975C6;
+        font-size: 32px;
+      }
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        h2 {
+          color: #333333;
+          font-size: 32px;
+          font-weight: 500;
+        }
+
+        i {
+          font-style: normal;
+          color: #2EA222;
+          font-size: 32px;
+        }
+      }
+    }
+
+    .item-info {
+      display: flex;
+      justify-content: space-between;
+      padding: 14px 0;
+
+      label {
+        color: #999999;
+        font-size: 32px;
+      }
+
+      span {
+        max-width: 496px;
+        text-align: right;
+        color: #333333;
+        font-size: 32px;
+      }
+    }
+
+    .item-avatar {
+      height: 192px;
+
+      image {
+        width: 112px;
+        height: 112px;
+        margin-right: 24px;
+      }
+
+      .left-right {
+        p {
+          margin-top: 8px;
+          color: #999999;
+          font-size: 28px;
+        }
+      }
+    }
+  }
+
+  .log-item {
+    padding: 0 0 0 32px;
+    background: #fff;
+
+    &:first-child {
+      margin-top: 16px;
+    }
+
+    &:last-child {
+      .log-item__wrapper {
+        border: none !important;
+      }
+    }
+
+    .log-item__wrapper {
+      padding: 32px 32px 32px 0;
+      border-bottom: 1px solid #E4E5E6;
+
+      .log-item__user {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        & > div {
+          display: flex;
+          align-items: center;
+        }
+
+        .left {
+          .user, image {
+            width: 80px;
+            height: 80px;
+            line-height: 80px;
+            margin-right: 16px;
+            text-align: center;
+            border-radius: 50%;
+            background: #2266FF;
+
+            span {
+              color: #fff;
+              font-size: 28px;
+            }
+          }
+
+          h2 {
+            color: #333;
+            font-size: 32px;
+          }
+        }
+
+        .right {
+          image {
+            width: 32px;
+            height: 32px;
+          }
+
+          span {
+            margin-right: 6px;
+            color: #999999;
+            font-size: 28px;
+          }
+        }
+      }
+
+      p {
+        margin: 4px 0 16px 96px;
+        color: #343D65;
+        font-size: 28px;
+      }
+
+      .imgs {
+        margin-left: 96px;
+
+        image {
+          width: 136px;
+          height: 136px;
+          margin-right: 8px;
+          margin-bottom: 8px;
+        }
+      }
+    }
+  }
+  .view-all{
+    text-align: center;
+    font-size: 32px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #3975C6;
+    line-height: 44px;
+    img{
+      width: 32px;
+      height: 32px;
+      margin-left: 8px;
+      transform: rotate(180deg);
+      transition: all 0.3s ease-in-out;
+      vertical-align: middle;
+    }
+    .img-active{
+      transform: rotate(0deg);
+    }
+  }
+}
+</style>
diff --git a/src/apps/AppMonitoringObject/FamilyList.vue b/src/apps/AppMonitoringObject/FamilyList.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/apps/AppMonitoringObject/List.vue b/src/apps/AppMonitoringObject/List.vue
index bed731c5..a7307833 100644
--- a/src/apps/AppMonitoringObject/List.vue
+++ b/src/apps/AppMonitoringObject/List.vue
@@ -19,7 +19,7 @@
       </div>
     </AiTopFixed>
     <div class="list-data" v-if="list.length > 0">
-      <div class="item" v-for="(item, iindex) in list" :key="iindex" @click="toDetailCard(item)">
+      <div class="item" v-for="(item, iindex) in list" :key="iindex" @click="toDetail(item)">
         <div class="left">
           <img :src="item.photo" alt="" v-if="item.photo"/>
           <img src="./components/img/user-img.png" alt="" v-else/>
@@ -30,8 +30,8 @@
             <span class="status status0">待纳入</span>
           </div>
           <div class="right-bottom">
-            <p>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</p>
-            <p>{{ item.currentAreaName }}</p>
+            <p>{{ item.idNumber || '' }}</p>
+            <p>{{ item.addressArea }}</p>
           </div>
         </div>
       </div>
@@ -75,30 +75,33 @@ export default {
     ...mapState(['user']),
   },
   created() {
-    this.areaId = this.$store.state.user.areaId
-    this.areaName = this.$store.state.user.areaId
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+    this.getList()
   },
   onShow() {
-    document.title = '查看居民档案'
+    document.title = '监测对象'
   },
   methods: {
     getList() {
-      var residentType = ['', 0, 1][this.currentTabs]
-      this.$http
-      .post('/app/appresident/list', null, {
+      this.$http.post('/app/apppreventionreturntopoverty/list', null, {
         params: {
-          size: 20,
           current: this.current,
-          con: this.keyword,
-          areaId: this.areaId,
-          residentType: residentType,
-          auditStatus: 1
+          size: 15,
+          status: this.currIndex === 1 ? '1' : '',
+          addressAreaId: this.areaId,
+          name: this.keyword
         },
       })
       .then((res) => {
         if (res.code == 0) {
+          res.data.records.map((item) => {
+            if( item.idNumber) {
+              item.idNumber = item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2')
+            }
+          })
           this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
-
+          console.log(this.list)
           this.pages = res.data.pages
         }
       })
@@ -111,8 +114,8 @@ export default {
       this.getList()
     },
 
-    toDetailCard(item) {
-      uni.navigateTo({url: `./DetailCard?id=${item.id}`})
+    toDetail(item) {
+      uni.navigateTo({url: `./Detail?id=${item.id}`})
     },
 
     seachObj(e) {
diff --git a/src/apps/AppMonitoringObject/AddFamily.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
similarity index 64%
rename from src/apps/AppMonitoringObject/AddFamily.vue
rename to src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
index 5684da59..820bbed6 100644
--- a/src/apps/AppMonitoringObject/AddFamily.vue
+++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
@@ -8,10 +8,12 @@
             <span>与户主关系</span>
           </div>
           <div class="right">
-            <AiSelect dict="fpType" v-model="form.type"></AiSelect>
+            <AiSelect dict="fpRelationship" v-model="form.relationship"></AiSelect>
           </div>
         </div>
       </div>
+    </div>
+    <div class="form-group">
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
@@ -19,8 +21,7 @@
             <span>姓名</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" type="text" v-model="form.phone" :maxlength="8"
-                   placeholder-style="color: #999; font-size: 30rpx;"/>
+            <input placeholder="请输入" v-model="form.name" placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -31,8 +32,7 @@
             <span>身份证号</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" type="idcard" v-model="form.phone" :maxlength="18"
-                   placeholder-style="color: #999; font-size: 30rpx;"/>
+            <input placeholder="请输入" v-model="form.idNumber" placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -43,8 +43,40 @@
             <span>性别</span>
           </div>
           <div class="right">
-            <input placeholder="自动识别" type="idcard" v-model="form.phone" disabled
-                   placeholder-style="color: #999; font-size: 30rpx;"/>
+            <AiSelect dict="sex" v-model="form.sex"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="opacity: 0;">*</i>
+            <span>民族</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpNation" v-model="form.nation"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="opacity: 0;">*</i>
+            <span>政治面貌</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpPoliticalOutlook" v-model="form.politicalOutlook"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="opacity: 0;">*</i>
+            <span>文化程度</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpEducation" v-model="form.education"></AiSelect>
           </div>
         </div>
       </div>
@@ -72,48 +104,13 @@
             <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.addressArea" :value="form.addressAreaId" :areaId="$areaId" mode="custom" all @select="onAreaChange">
                 <div class="aiArea">
                   <span class="label" v-if="form.addressArea">{{ form.addressArea }}</span>
-                  <i v-else>请选择</i>
+                  <span v-else>请选择</span>
                   <u-icon name="arrow-right" color="#ddd"/>
                 </div>
             </AiAreaPicker>
           </div>
         </div>
       </div>
-    </div>
-    <div class="form-group">
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>民族</span>
-          </div>
-          <div class="right">
-            <AiSelect dict="fpType" v-model="form.type"></AiSelect>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>政治面貌</span>
-          </div>
-          <div class="right">
-            <AiSelect dict="fpType" v-model="form.type"></AiSelect>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>文化程度</span>
-          </div>
-          <div class="right">
-            <AiSelect dict="fpType" v-model="form.type"></AiSelect>
-          </div>
-        </div>
-      </div>
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
@@ -139,16 +136,26 @@
         <AiUploader :def.sync="form.files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
       </div>
     </div>
-
     <div class="form-group">
       <div class="form-item">
         <div class="form-item__wrapper">
           <div class="left">
-            <i style="opacity: 0;">*</i>
+            <i>*</i>
             <span>在校情况</span>
           </div>
           <div class="right">
-            <AiSelect dict="fpType" v-model="form.type"></AiSelect>
+            <AiSelect dict="fpStudentsInSchool" v-model="form.studentsInSchool"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>健康状况</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpHealth" v-model="form.health"></AiSelect>
           </div>
         </div>
       </div>
@@ -159,7 +166,7 @@
             <span>劳动技能</span>
           </div>
           <div class="right">
-            <AiSelect dict="fpType" v-model="form.type"></AiSelect>
+            <AiSelect dict="fpLaborSkills" v-model="form.laborSkills"></AiSelect>
           </div>
         </div>
       </div>
@@ -170,7 +177,7 @@
             <span>务工区域</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.address" placeholder-style="color: #999; font-size: 30rpx;"/>
+            <input placeholder="请输入" v-model="form.workArea" placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -178,10 +185,11 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i style="opacity: 0;">*</i>
-            <span>务工时间/月</span>
+            <span>务工时长(月)</span>
           </div>
           <div class="right">
-            <input placeholder="请输入" v-model="form.address" type="number" placeholder-style="color: #999; font-size: 30rpx;" maxlength="2"/>
+            <input placeholder="请输入" type="number" v-model="form.workingMonths"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
           </div>
         </div>
       </div>
@@ -194,8 +202,8 @@
             <span>是否参加医保</span>
           </div>
           <div class="right">
-            <div class="check-item">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">否<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.medicalInsurance == 1 ? 'check-active' : '' " @click="form.medicalInsurance=1">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.medicalInsurance != 1 ? 'check-active' : '' " @click="form.medicalInsurance=0">否<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
@@ -206,8 +214,8 @@
             <span>是否参加大病保险</span>
           </div>
           <div class="right">
-            <div class="check-item">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">否<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.sicknessInsurance == 1 ? 'check-active' : '' " @click="form.sicknessInsurance=1">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.sicknessInsurance != 1 ? 'check-active' : '' " @click="form.sicknessInsurance=0">否<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
@@ -218,8 +226,8 @@
             <span>是否参加养老保险</span>
           </div>
           <div class="right">
-            <div class="check-item">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">否<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.endowmentInsurance == 1 ? 'check-active' : '' " @click="form.endowmentInsurance=1">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.endowmentInsurance != 1 ? 'check-active' : '' " @click="form.endowmentInsurance=0">否<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
@@ -227,11 +235,11 @@
         <div class="form-item__wrapper">
           <div class="left">
             <i>*</i>
-            <span>最低生活保障</span>
+            <span>是否享受最低生活保障</span>
           </div>
           <div class="right">
-            <div class="check-item">享受<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">未享受<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.subsistenceAllowance == 1 ? 'check-active' : '' " @click="form.subsistenceAllowance=1">享受<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.subsistenceAllowance != 1 ? 'check-active' : '' " @click="form.subsistenceAllowance=0">未享受<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
@@ -242,15 +250,13 @@
             <span>是否特困供养</span>
           </div>
           <div class="right">
-            <div class="check-item">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">否<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.destitute == 1 ? 'check-active' : '' " @click="form.destitute=1">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.destitute != 1 ? 'check-active' : '' " @click="form.destitute=0">否<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
     </div>
-
-   
-    <div class="btn" hover-class="text" @click="submit"> {{ isEdit ? '保存' : '申请纳入监测' }}</div>
+    <div class="btn" @click="submit">提交</div>
   </div>
 </template>
 
@@ -260,59 +266,102 @@ export default {
   data() {
     return {
       form: {
-        addressAreaId: '',
-        address: '',
-        addressArea: '',
-        move: '02',
-        place: '',
-        placeAreaId: '',
-        placeArea: '',
-        type: '',
-        files: []
+        destitute: '',
+        education: '',
+        endowmentInsurance: '',
+        health: '',
+        idNumber: '',
+        laborSkills: '',
+        medicalInsurance: '',
+        name: '',
+        nation: '',
+        politicalOutlook: '',
+        relationship: '',
+        relocation: '',
+        sex: '',
+        sicknessInsurance: '',
+        studentsInSchool: '',
+        subsistenceAllowance: '',
+        workArea: '',
+        workingMonths: ''
       },
-      $areaId: '',
-      isEdit: false,
       id: '',
-      areaName: '',
+      info: {},
+      isEdit: false,
+      index: ''
     }
   },
 
-  created() {
-    this.areaName = this.$store.state.user.areaFullName
-    this.$dict.load(['fpType', 'fpYesOrNo'])
-  },
-
   onLoad(query) {
-    if (query.id) {
-      this.isEdit = true
-      this.id = query.id
+    uni.showLoading()
+    this.id = query.id
+    this.$dict.load(['fpRelationship', 'sex', 'fpNation', 'fpHealth', 'fpEducation', 'fpYesOrNo', 'fpLaborSkills', 'fpPoliticalOutlook',
+      'fpRelationship', 'fpStudentsInSchool', 'fpFnancialAssistance', 'fpHealthAssistance', 'fpHousingSecurity']).then(() => {
+      this.getInfo(query.id)
+    })
+    document.title = query.index ? '编辑家庭成员' : '添加家庭成员'
 
-      this.getInfo(this.id)
+    if (query.index > -1) {
+      this.isEdit = true
+      this.index = Number(query.index)
     }
-    document.title = query.id ? '编辑监测对象' : '添加监测对象'
   },
 
   methods: {
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          if (this.isEdit) {
+            this.form = {
+              ...res.data.familyList[this.index]
+            }
+          }
+          this.info = res.data
+        }
+
+        uni.hideLoading()
+      })
+    },
+
+    rules() {
+      return {
+        relationship: '请选择与户主关系',
+        name: '请输入姓名',
+        idNumber: '请输入身份证号',
+        sex: '请选择性别',
+        studentsInSchool: '请选择在校情况',
+        health: '请选择健康状况',
+        medicalInsurance: '请选择是否参加医保',
+        sicknessInsurance: '请选择是否参加大病保险',
+        endowmentInsurance: '请选择是否参加养老保险',
+        subsistenceAllowance: '请选择是否享受最低生活保障',
+        destitute: '请选择是否特困供养',
+      }
+    },
+
     submit() {
-      if (!this.form.type) {
-        return this.$u.toast('请选择监测类型')
-      }
+      const rules = this.rules()
 
-      if (!this.form.phone) {
-        return this.$u.toast('请输入联系方式')
-      }
-
-      if (!this.form.addressAreaId) {
-        return this.$u.toast('请选择住址')
+      for (let v of Object.keys(rules)) {
+        if (!this.form[v]) {
+          return this.$u.toast(rules[v])
+        }
       }
 
       uni.showLoading()
+      let familyList = this.info.familyList
+      if (this.isEdit) {
+        familyList[this.index] = this.form
+      } else {
+        familyList.push(this.form)
+      }
       this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
-        ...this.form,
-        id: this.isEdit ? this.id : ''
+        ...this.info,
+        familyList,
+        id: this.id
       }).then(res => {
         if (res.code === 0) {
-          this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
+          this.$u.toast(this.isEdit ? '编辑成功' : '提交成功')
           uni.$emit('reload')
           uni.navigateBack({
             delta: 1
@@ -320,25 +369,6 @@ export default {
         }
         uni.hideLoading()
       })
-    },
-
-    onAreaChange(e) {
-      this.form.addressAreaId = e
-    },
-
-    onChange(e) {
-      this.form.placeAreaId = e
-    },
-
-    getInfo(id) {
-      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
-        if (res.code === 0) {
-          this.form = {
-            ...this.form,
-            ...res.data
-          }
-        }
-      })
     }
   }
 }
@@ -348,28 +378,6 @@ export default {
 .add {
   padding-bottom: 120px;
 
-  .aiArea {
-    display: flex;
-    align-items: center;
-
-    .label {
-      max-width: 480px;
-      height: 112px;
-      overflow: hidden;
-      text-overflow:ellipsis;
-      white-space: nowrap;
-      color: #303133 !important;
-      font-size: 30px;
-    }
-
-    i {
-      margin-left: 4px;
-      font-style: normal;
-      color: #999999;
-      font-size: 30px;
-    }
-  }
-
   ::v-deep .u-radio {
     &:last-child {
       .u-radio__label {
diff --git a/src/apps/AppMonitoringObject/MonitorAddLog.vue b/src/apps/AppMonitoringObject/MonitorAddLog.vue
new file mode 100644
index 00000000..8d0ab0ec
--- /dev/null
+++ b/src/apps/AppMonitoringObject/MonitorAddLog.vue
@@ -0,0 +1,158 @@
+<template>
+  <div class="form">
+    <div class="form-item form-item__textarea">
+      <div class="form-item__title">
+        <em>*</em>
+        <h2>帮扶内容</h2>
+      </div>
+      <textarea :maxlength="500" v-model="detail" placeholder="请输入帮扶内容"></textarea>
+    </div>
+    <div class="form-item form-item__imgs">
+      <div class="form-item__title">
+        <h2>图片</h2>
+        <i>（最多9张）</i>
+      </div>
+      <div>
+        <AiUploader :limit="9" multiple :def.sync="picture"></AiUploader>
+      </div>
+    </div>
+    <div class="btn" @click="submit">提交</div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      detail: '',
+      pid: '',
+      id: '',
+      picture: []
+    }
+  },
+
+  onShow() {
+    document.title = '添加帮扶日志'
+  },
+
+  onLoad(query) {
+    if (query.id) {
+      this.getInfo(query.id)
+      this.id = query.id
+    }
+    this.pid = query.pid
+  },
+
+  methods: {
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopovertylog/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.detail = res.data.detail
+          this.picture = JSON.parse(res.data.picture)
+        }
+      })
+    },
+
+    submit() {
+      if (!this.detail) {
+        return this.$u.toast('请输入帮扶内容')
+      }
+
+      uni.showLoading()
+      this.$http.post('/app/apppreventionreturntopovertylog/addOrUpdate', {
+        detail: this.detail,
+        picture: JSON.stringify(this.picture),
+        pid: this.pid,
+        id: this.id || ''
+      }).then(res => {
+        if (res.code === 0) {
+          this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
+          uni.$emit('reload')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+        uni.hideLoading()
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.form {
+  padding-bottom: 120px;
+
+  div {
+    margin-bottom: 16px;
+    background: #fff;
+  }
+
+  .form-item {
+    padding: 32px;
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+      margin-bottom: 34px;
+
+      em {
+        margin-right: 4px;
+        font-style: normal;
+        color: #FF4466;
+      }
+
+      h2 {
+        color: #333333;
+        font-weight: normal;
+        font-size: 32px;
+      }
+
+      i {
+        color: #999999;
+        font-size: 28px;
+        font-style: normal;
+      }
+    }
+
+    textarea {
+      width: 100%;
+    }
+  }
+
+  .form-type {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 112px;
+    padding: 0 32px;
+
+    h2 {
+      font-weight: normal;
+      color: #333333;
+      font-size: 32px;
+    }
+
+    span {
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 11;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    margin: 0;
+    text-align: center;
+    color: #FFFFFF;
+    font-size: 32px;
+    background: #3192F4;
+  }
+}
+</style>
diff --git a/src/apps/AppMonitoringObject/MonitorFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorFamilyMember.vue
new file mode 100644
index 00000000..0d7724be
--- /dev/null
+++ b/src/apps/AppMonitoringObject/MonitorFamilyMember.vue
@@ -0,0 +1,333 @@
+<template>
+  <div class="familyMember" v-if="pageShow">
+    <div class="item" v-for="(item, index) in list" :key="index">
+      <div class="item-title">
+        <div class="top">
+          <div class="left">
+            <h2>{{ item.name }}</h2>
+            <span>{{ item.idNumber }}</span>
+          </div>
+          <span>{{ $dict.getLabel('fpRelationship', item.relationship) }}</span>
+        </div>
+        <div class="bottom">
+          <span>{{ $dict.getLabel('sex', item.sex) }}</span>
+          <span>{{ item.age }}岁</span>
+        </div>
+      </div>
+      <div class="item-info" v-if="item.isShow">
+        <div class="item-info__item">
+          <label>民族</label>
+          <span>{{ $dict.getLabel('fpNation', item.nation) }}</span>
+        </div>
+        <div class="item-info__item">
+          <label>政治面貌</label>
+          <span>{{ $dict.getLabel('fpPoliticalOutlook', item.politicalOutlook) }}</span>
+        </div>
+        <div class="item-info__item">
+          <label>文化程度</label>
+          <span>{{ $dict.getLabel('fpEducation', item.education) }}</span>
+        </div>
+        <div class="item-info__item">
+          <label>在校情况</label>
+          <span>{{ $dict.getLabel('fpStudentsInSchool', item.studentsInSchool) }}</span>
+        </div>
+        <div class="item-info__item">
+          <label>健康状况</label>
+          <span>{{ $dict.getLabel('fpHealth', item.health) }}</span>
+        </div>
+        <div class="item-info__item">
+          <label>劳动技能</label>
+          <span>{{ $dict.getLabel('fpLaborSkills', item.laborSkills) }}</span>
+        </div>
+        <div class="item-info__item">
+          <label>务工区域</label>
+          <span>{{ item.workArea }}</span>
+        </div>
+        <div class="item-info__item">
+          <label>务工时间</label>
+          <span>{{ item.workingMonths }}月</span>
+        </div>
+        <div class="item-info__item">
+          <label>是否参加医疗参保</label>
+          <span>{{ $dict.getLabel('fpYesOrNo', item.medicalInsurance) }}</span>
+        </div>
+        <div class="item-info__item">
+          <label>是否参加大病保险</label>
+          <span>{{ $dict.getLabel('fpYesOrNo', item.sicknessInsurance) }}</span>
+        </div>
+        <div class="item-info__item">
+          <label>是否参加养老保险</label>
+          <span>{{ $dict.getLabel('fpYesOrNo', item.endowmentInsurance) }}</span>
+        </div>
+        <div class="item-info__item">
+          <label>是否享受最低生活保障</label>
+          <span>{{ $dict.getLabel('fpYesOrNo', item.subsistenceAllowance) }}</span>
+        </div>
+        <div class="item-info__item">
+          <label>是否特困供养</label>
+          <span>{{ $dict.getLabel('fpYesOrNo', item.destitute) }}</span>
+        </div>
+        <div class="item-info__item">
+        </div>
+      </div>
+      <div class="item-bottom">
+        <span @click="showMore(index)">{{ item.isShow ? '收起详情' : '展开详情' }}</span>
+        <span @click="toEdit(index)">编辑</span>
+        <span @click="remove(index)">删除</span>
+      </div>
+    </div>
+    <AiFixedBtn>
+      <div class="addBtn iconfont iconfont-iconfangda" @tap="toAdd"></div>
+    </AiFixedBtn>
+    <div class="no-more" v-if="!list.length">
+      <image src="/static/images/empty.png"/>
+      <div>
+        <span>您还未添加过家庭成员点击</span>
+        <i>新增按钮</i>
+        <span>试试吧~</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      list: [],
+      id: '',
+      info: {},
+      pageShow: false
+    }
+  },
+
+  onShow() {
+    document.title = '家庭成员'
+  },
+
+  onLoad(query) {
+    uni.showLoading()
+    this.id = query.id
+    this.$dict.load(['fpRelationship', 'sex', 'fpNation', 'fpHealth', 'fpEducation', 'fpYesOrNo', 'fpLaborSkills', 'fpPoliticalOutlook',
+      'fpRelationship', 'fpStudentsInSchool', 'fpFnancialAssistance', 'fpHealthAssistance', 'fpHousingSecurity']).then(() => {
+      this.getInfo(query.id)
+    })
+
+    uni.$on('reload', () => {
+      this.getInfo(query.id)
+    })
+  },
+
+  methods: {
+    toAdd() {
+      uni.navigateTo({
+        url: './MonitorAddFamilyMember?id=' + this.id
+      })
+    },
+
+    toEdit(index) {
+      this.$confirm('确定编辑该数据？').then(() => {
+        uni.navigateTo({
+          url: `./MonitorAddFamilyMember?id=${this.id}&index=${index}`
+        })
+      }).catch(() => {
+      })
+    },
+
+    remove(index) {
+      this.$confirm('确定删除该数据？').then(() => {
+        let familyList = JSON.parse(JSON.stringify(this.list))
+        familyList.splice(index, 1)
+        uni.showLoading()
+        this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
+          ...this.info,
+          familyList,
+          id: this.id
+        }).then(res => {
+          if (res.code === 0) {
+            this.$u.toast('删除成功')
+            this.getInfo(this.id)
+          }
+          uni.hideLoading()
+        })
+      }).catch(() => {
+      })
+    },
+
+    showMore(index) {
+      this.list[index].isShow = !this.list[index].isShow
+    },
+
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+          this.list = res.data.familyList.map(item => {
+            return {
+              ...item,
+              isShow: false,
+              age: this.$calcAge(item.idNumber)
+            }
+          })
+
+          this.pageShow = true
+        }
+
+        uni.hideLoading()
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.familyMember {
+  padding: 32px 0;
+
+  .no-more {
+    padding-top: 160px;
+    text-align: center;
+
+    image {
+      width: 282px;
+      height: 304px;
+    }
+
+    div {
+      width: 280px;
+      margin: 0 auto;
+
+      span {
+        color: #999999;
+        font-size: 28px;
+      }
+
+      i {
+        font-style: normal;
+        color: #467DFE;
+        font-size: 28px;
+      }
+    }
+  }
+
+  .addBtn {
+    width: 96px;
+    height: 96px;
+    flex-shrink: 0;
+    background: $uni-color-primary;
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
+    font-size: 48px;
+    color: #fff;
+    border-radius: 50%;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+  }
+
+  .item {
+    width: 686px;
+    margin: 0 auto 32px;
+    border-radius: 16px;
+    overflow: hidden;
+    background: #fff;
+
+    .item-bottom {
+      display: flex;
+      align-items: center;
+      height: 94px;
+
+      span {
+        flex: 1;
+        height: 100%;
+        line-height: 96px;
+        color: #3975C6;
+        font-size: 26px;
+        text-align: center;
+      }
+    }
+
+    .item-title {
+      padding: 32px;
+      background: #FFFFFF;
+      border-bottom: 1px solid #DDDDDD;
+
+      .top {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 8px;
+
+        .left {
+          display: flex;
+          align-items: center;
+
+          h2 {
+            margin-right: 32px;
+            color: #333333;
+            font-size: 40px;
+            font-weight: 500;
+          }
+
+          span {
+            color: #999999;
+            font-size: 28px;
+          }
+        }
+
+        & > span {
+          color: #3975C6;
+          font-size: 28px;
+        }
+      }
+    }
+
+    .item-info {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      background: #F9F9F9;
+
+      .item-info__item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width: 50%;
+        height: 72px;
+        padding: 0 20px;
+        border-bottom: 1px solid #DDDDDD;
+        border-right: 1px solid #DDDDDD;
+        box-sizing: border-box;
+
+        &:nth-of-type(2n) {
+          border-right: none;
+        }
+      }
+
+      label {
+        color: #999999;
+        font-size: 26px;
+      }
+
+      span {
+        color: #3975C6;
+        font-size: 26px;
+      }
+    }
+
+    .bottom {
+      display: flex;
+      align-items: center;
+
+      span {
+        color: #999999;
+        font-size: 28px;
+
+        &:first-child {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/apps/AppMonitoringObject/EditFamily.vue b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
similarity index 69%
rename from src/apps/AppMonitoringObject/EditFamily.vue
rename to src/apps/AppMonitoringObject/MonitorFamilySituation.vue
index d74b7a70..b809be64 100644
--- a/src/apps/AppMonitoringObject/EditFamily.vue
+++ b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue
@@ -19,8 +19,8 @@
             <span>是否危房</span>
           </div>
           <div class="right">
-            <div class="check-item">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">否<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.dilapidatedHouse == 1 ? 'check-active' : '' " @click="form.dilapidatedHouse=1">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.dilapidatedHouse != 1 ? 'check-active' : '' " @click="form.dilapidatedHouse=0">否<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
@@ -31,8 +31,8 @@
             <span>是否饮水安全问题</span>
           </div>
           <div class="right">
-            <div class="check-item">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">否<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.drinkingWaterSafety == 1 ? 'check-active' : '' " @click="form.drinkingWaterSafety=1">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.drinkingWaterSafety != 1 ? 'check-active' : '' " @click="form.drinkingWaterSafety=0">否<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
@@ -43,15 +43,14 @@
             <span>是否搬迁</span>
           </div>
           <div class="right">
-            <div class="check-item">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item check-active">否<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.drinkingWaterSafety == 1 ? 'check-active' : '' " @click="form.drinkingWaterSafety=1">是<img src="./components/img/check-icon.png" alt=""></div>
+            <div class="check-item" :class="form.drinkingWaterSafety != 1 ? 'check-active' : '' " @click="form.drinkingWaterSafety=0">否<img src="./components/img/check-icon.png" alt=""></div>
           </div>
         </div>
       </div>
     </div>
-
-   
     <div class="btn" hover-class="text" @click="submit">保存</div>
+
   </div>
 </template>
 
@@ -61,56 +60,42 @@ export default {
   data() {
     return {
       form: {
-        addressAreaId: '',
-        address: '',
-        addressArea: '',
-        move: '02',
-        place: '',
-        placeAreaId: '',
-        placeArea: '',
-        type: '',
-        files: []
+        dilapidatedHouse: '',
+        drinkingWaterSafety: '',
+        riskType: ''
       },
-      $areaId: '',
-      isEdit: false,
-      id: '',
-      areaName: '',
+      id: ''
     }
   },
 
-  created() {
-    this.areaName = this.$store.state.user.areaFullName
-    this.$dict.load(['fpType', 'fpYesOrNo'])
-  },
 
   onLoad(query) {
-    if (query.id) {
-      this.isEdit = true
-      this.id = query.id
-
-      this.getInfo(this.id)
-    }
-    document.title = query.id ? '编辑监测对象' : '添加监测对象'
+    this.$dict.load(['fpYesOrNo', 'fpRiskType'])
+    uni.showLoading()
+    this.id = query.id
+    this.getInfo(query.id)
+    document.title = query.id ? '编辑家庭情况' : '添加家庭情况'
   },
 
   methods: {
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form = {
+            ...this.form,
+            ...res.data
+          }
+        }
+
+        uni.hideLoading()
+      })
+    },
+
     submit() {
-      if (!this.form.type) {
-        return this.$u.toast('请选择监测类型')
-      }
-
-      if (!this.form.phone) {
-        return this.$u.toast('请输入联系方式')
-      }
-
-      if (!this.form.addressAreaId) {
-        return this.$u.toast('请选择住址')
-      }
-
       uni.showLoading()
       this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
         ...this.form,
-        id: this.isEdit ? this.id : ''
+        id: this.id
       }).then(res => {
         if (res.code === 0) {
           this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
@@ -122,25 +107,6 @@ export default {
         uni.hideLoading()
       })
     },
-
-    onAreaChange(e) {
-      this.form.addressAreaId = e
-    },
-
-    onChange(e) {
-      this.form.placeAreaId = e
-    },
-
-    getInfo(id) {
-      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
-        if (res.code === 0) {
-          this.form = {
-            ...this.form,
-            ...res.data
-          }
-        }
-      })
-    }
   }
 }
 </script>
@@ -149,28 +115,27 @@ export default {
 .add {
   padding-bottom: 120px;
 
-  .aiArea {
-    display: flex;
-    align-items: center;
+  .form-textarea {
+    padding: 32px;
 
-    .label {
-      max-width: 480px;
-      height: 112px;
-      overflow: hidden;
-      text-overflow:ellipsis;
-      white-space: nowrap;
-      color: #303133 !important;
-      font-size: 30px;
+    h2 {
+      margin-bottom: 32px;
+      color: #333333;
+      font-size: 32px;
+      font-weight: 500;
     }
 
-    i {
-      margin-left: 4px;
-      font-style: normal;
-      color: #999999;
-      font-size: 30px;
+    textarea {
+      width: 100%;
+      height: 200px;
     }
   }
 
+  & > div {
+    margin-bottom: 16px;
+    background: #fff;
+  }
+
   ::v-deep .u-radio {
     &:last-child {
       .u-radio__label {
@@ -179,11 +144,6 @@ export default {
     }
   }
 
-  & > div {
-    margin-bottom: 16px;
-    background: #fff;
-  }
-
   .form-group {
     .form-item {
       padding-left: 32px;
@@ -328,13 +288,5 @@ export default {
     font-size: 32px;
     background: #3192F4;
   }
-  .upload {
-    width: 100%;
-    padding: 10px 32px 32px 32px;
-    box-sizing: border-box;
-  }
-  .border-b0{
-    border-bottom: 0!important;
-  }
 }
 </style>
diff --git a/src/apps/AppMonitoringObject/MonitorIncome.vue b/src/apps/AppMonitoringObject/MonitorIncome.vue
new file mode 100644
index 00000000..4a4adfaf
--- /dev/null
+++ b/src/apps/AppMonitoringObject/MonitorIncome.vue
@@ -0,0 +1,275 @@
+<template>
+  <div class="add">
+    <div class="form-group">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <span>工资收入</span>
+          </div>
+          <div class="right">
+            <input placeholder="请输入" v-model="form.income1" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <span>生产经营收入</span>
+          </div>
+          <div class="right">
+            <input placeholder="请输入" v-model="form.income2" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <span>财产性收入</span>
+          </div>
+          <div class="right">
+            <input placeholder="请输入" v-model="form.income3" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <span>转移性收入</span>
+          </div>
+          <div class="right">
+            <input placeholder="请输入" v-model="form.income4" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <span>理赔收入</span>
+          </div>
+          <div class="right">
+            <input placeholder="请输入" v-model="form.income8" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <span>生产经营支出</span>
+          </div>
+          <div class="right">
+            <input placeholder="请输入" v-model="form.income5" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <span>合规自然支出</span>
+          </div>
+          <div class="right">
+            <input placeholder="请输入" v-model="form.income9" type="number"
+                   placeholder-style="color: #999; font-size: 30rpx;"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <p class="tips">*不填时默认为0元</p>
+    <div class="btn" hover-class="text" @click="submit">保存</div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      form: {
+        income1: '',
+        income2: '',
+        income3: '',
+        income4: '',
+        income5: '',
+        income8: '',
+        income9: ''
+      },
+      id: ''
+    }
+  },
+
+  onLoad(query) {
+    uni.showLoading()
+    this.id = query.id
+    this.getInfo(query.id)
+    document.title = query.id ? '编辑收支情况' : '添加收支情况'
+  },
+
+  methods: {
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form = {
+            ...this.form,
+            ...res.data
+          }
+        }
+
+        uni.hideLoading()
+      })
+    },
+
+    submit() {
+      uni.showLoading()
+      this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
+        ...this.form,
+        id: this.id
+      }).then(res => {
+        if (res.code === 0) {
+          this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
+          uni.$emit('reload')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+        uni.hideLoading()
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.add {
+  padding-bottom: 120px;
+
+  .tips {
+    margin: 32px 0 0 32px;
+    color: #999999;
+    font-size: 26px;
+  }
+
+  & > div {
+    margin-bottom: 16px;
+    background: #fff;
+  }
+
+  .form-group {
+    .form-item {
+      padding-left: 32px;
+
+      .form-item__wrapper {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 112px;
+        border-bottom: 1px solid #E4E5E6;
+      }
+
+      .right {
+        height: 112px;
+        line-height: 112px;
+        padding-right: 32px;
+
+        span {
+          font-size: 30px;
+          color: #999999;
+        }
+      }
+
+      input {
+        height: 100%;
+        text-align: right;
+      }
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        span {
+          color: #333333;
+          font-size: 32px;
+        }
+
+        i {
+          margin-right: 4px;
+          font-style: normal;
+          color: #FF4466;
+          font-size: 32px;
+        }
+      }
+
+      &:last-child {
+        .form-item__wrapper {
+          border: none;
+        }
+      }
+    }
+  }
+
+  .form-item__imgs {
+    padding: 32px;
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+      margin-bottom: 34px;
+
+      h2 {
+        color: #333333;
+        font-weight: normal;
+        font-size: 32px;
+      }
+
+      i {
+        color: #999999;
+        font-size: 28px;
+        font-style: normal;
+      }
+    }
+
+    textarea {
+      width: 100%;
+    }
+  }
+
+  .form-type {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 112px;
+    padding: 0 32px;
+
+    h2 {
+      font-weight: normal;
+      color: #333333;
+      font-size: 32px;
+    }
+
+    span {
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 11;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    margin: 0;
+    text-align: center;
+    color: #FFFFFF;
+    font-size: 32px;
+    background: #3192F4;
+  }
+}
+</style>
diff --git a/src/apps/AppMonitoringObject/MonitorPoorStatus.vue b/src/apps/AppMonitoringObject/MonitorPoorStatus.vue
new file mode 100644
index 00000000..e17941ec
--- /dev/null
+++ b/src/apps/AppMonitoringObject/MonitorPoorStatus.vue
@@ -0,0 +1,347 @@
+<template>
+  <div class="add">
+    <div class="form-group">
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="opacity: 0;">*</i>
+            <span>产业帮扶</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpIndustrialAssistance" v-model="form.industrialAssistance"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="opacity: 0;">*</i>
+            <span>健康帮扶</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpHealthAssistance" v-model="form.healthAssistance"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="opacity: 0;">*</i>
+            <span>就业帮扶</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpEmploymentAssistance" v-model="form.employmentAssistance"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="opacity: 0;">*</i>
+            <span>教育帮扶</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpEducationalAssistance" v-model="form.educationalAssistance"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="opacity: 0;">*</i>
+            <span>金融帮扶</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpFinancialAssistance" v-model="form.financialAssistance"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="opacity: 0;">*</i>
+            <span>社会帮扶</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpSocialAssistance" v-model="form.socialAssistance"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i style="opacity: 0;">*</i>
+            <span>公益岗位帮扶</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpPublicWelfarePostAssistance" v-model="form.publicWelfarePostAssistance"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <!-- <div class="form-item">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>是否消除风险</span>
+          </div>
+          <div class="right">
+            <u-radio-group v-model="form.isRisk" @change="onRiskChange">
+              <u-radio :name="item.dictValue" v-for="(item, index) in $dict.getDict('fpYesOrNo')" :key="index">
+                {{ item.dictName }}
+              </u-radio>
+            </u-radio-group>
+          </div>
+        </div>
+      </div>
+      <div class="form-item" v-if="form.isRisk === '01'">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>风险消除方式</span>
+          </div>
+          <div class="right">
+            <AiSelect dict="fpRiskEliminationMethod" v-model="form.riskEliminationMethod"></AiSelect>
+          </div>
+        </div>
+      </div>
+      <div class="form-item" v-if="form.isRisk === '01'">
+        <div class="form-item__wrapper">
+          <div class="left">
+            <i>*</i>
+            <span>风险消除时间</span>
+          </div>
+          <div class="right">
+            <AiDate v-model="form.riskEliminationDate" @change="v => form.riskEliminationDate = v"></AiDate>
+          </div>
+        </div>
+      </div> -->
+    </div>
+    <div class="btn" hover-class="text" @click="submit">保存</div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      result: '',
+      form: {
+        isRisk: '02',
+        riskEliminationMethod: '',
+        riskEliminationDate: '',
+        industrialAssistance: '',
+        healthAssistance: '',
+        employmentAssistance: '',
+        educationalAssistance: '',
+        financialAssistance: '',
+        socialAssistance: '',
+        publicWelfarePostAssistance: ''
+      },
+      id: ''
+    }
+  },
+
+  onLoad(query) {
+    uni.showLoading()
+    this.$dict.load(['fpYesOrNo', 'fpRiskEliminationMethod', 'fpIndustrialAssistance', 'fpHealthAssistance', 'fpEmploymentAssistance',
+      'fpEducationalAssistance', 'fpFinancialAssistance', 'fpSocialAssistance', 'fpPublicWelfarePostAssistance']).then(() => {
+      this.getInfo(query.id)
+    })
+    this.id = query.id
+    document.title = query.id ? '编辑风险解除' : '添加风险解除'
+  },
+
+  methods: {
+    getInfo(id) {
+      this.$http.post(`/app/apppreventionreturntopoverty/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form = {
+            ...this.form,
+            ...res.data
+          }
+
+          if (this.form.riskEliminationMethod) {
+            this.form.isRisk = '01'
+          }
+        }
+
+        uni.hideLoading()
+      })
+    },
+
+    onRiskChange(e) {
+      if (e === '02') {
+        this.form.riskEliminationMethod = ''
+        this.form.riskEliminationDate = ''
+      }
+    },
+
+    submit() {
+      if (!this.form.isRisk) {
+        return this.$u.toast('请选择是否消除风险')
+      }
+
+      if (this.form.isRisk === '01') {
+        if (!this.form.riskEliminationMethod) {
+          return this.$u.toast('请选择风险消除方式')
+        }
+
+        if (!this.form.riskEliminationDate) {
+          return this.$u.toast('请选择风险消除时间')
+        }
+      }
+
+      uni.showLoading()
+      this.$http.post('/app/apppreventionreturntopoverty/addOrUpdate', {
+        ...this.form,
+        riskEliminationMethod: this.form.isRisk ? this.form.riskEliminationMethod : '',
+        id: this.id,
+        status: this.form.isRisk === '01' ? 1 : ''
+      }).then(res => {
+        if (res.code === 0) {
+          this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
+          uni.$emit('reload')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+        uni.hideLoading()
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.add {
+  padding-bottom: 120px;
+
+  & > div {
+    margin-bottom: 16px;
+    background: #fff;
+  }
+
+  ::v-deep .u-radio {
+    &:last-child {
+      .u-radio__label {
+        margin-right: 0;
+      }
+    }
+  }
+
+  .form-group {
+    .form-item {
+      padding-left: 32px;
+
+      .form-item__wrapper {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 112px;
+        border-bottom: 1px solid #E4E5E6;
+      }
+
+      .right {
+        display: flex;
+        align-items: center;
+        height: 112px;
+        padding-right: 32px;
+
+        span {
+          font-size: 30px;
+          color: #999999;
+        }
+      }
+
+      input {
+        height: 100%;
+        text-align: right;
+      }
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        span {
+          color: #333333;
+          font-size: 32px;
+        }
+
+        i {
+          margin-right: 4px;
+          font-style: normal;
+          color: #FF4466;
+          font-size: 32px;
+        }
+      }
+
+      &:last-child {
+        .form-item__wrapper {
+          border: none;
+        }
+      }
+    }
+  }
+
+  .form-item__imgs {
+    padding: 32px;
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+      margin-bottom: 34px;
+
+      h2 {
+        color: #333333;
+        font-weight: normal;
+        font-size: 32px;
+      }
+
+      i {
+        color: #999999;
+        font-size: 28px;
+        font-style: normal;
+      }
+    }
+
+    textarea {
+      width: 100%;
+    }
+  }
+
+  .form-type {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 112px;
+    padding: 0 32px;
+
+    h2 {
+      font-weight: normal;
+      color: #333333;
+      font-size: 32px;
+    }
+
+    span {
+      color: #999999;
+      font-size: 28px;
+    }
+  }
+
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 11;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    margin: 0;
+    text-align: center;
+    color: #FFFFFF;
+    font-size: 32px;
+    background: #3192F4;
+  }
+}
+</style>