diff --git a/src/apps/AppWarningMonitoring/detail.vue b/src/apps/AppWarningMonitoring/detail.vue
index a9a59be6..763a2a1c 100644
--- a/src/apps/AppWarningMonitoring/detail.vue
+++ b/src/apps/AppWarningMonitoring/detail.vue
@@ -57,8 +57,8 @@
       </div>
     </div>
 
-    <!-- 待审核 v-if="data.status==1"-->
-    <div class="to-check" >
+    <!-- 待审核 -->
+    <div class="to-check" v-if="data.status != 0" >
       <div class="title">
         <span>走访核实</span>
         <span style="color:#FF8822">疑似风险</span>
@@ -74,7 +74,7 @@
         </div>
         <div class="item-info">
           <label>联系方式:</label>
-          <span>17964042574</span>
+          <span>{{ data.visitUserPhone }}</span>
         </div>
         <div class="item-info">
           <label>备注说明:</label>
@@ -93,29 +93,30 @@
     <div class="processingResults"  v-if="data.status==2 || data.status==3">
       <div class="title">
         <span>处理结果</span>
-        <span style="color:#2EA222">解除风险</span>
+        <span style="color:#2EA222" v-if="data.status == 3">解除风险</span>
+        <span style="color:#FF4466" v-if="data.status == 2">纳入监测</span>
       </div>
       <div class="check-info">
         <div class="item-info">
           <label>审核人:</label>
-          <span>李怡</span>
+          <span>{{ data.auditUserName }}</span>
         </div>
         <div class="item-info">
           <label>操作时间:</label>
-          <span>2021-10-10 10:10:10</span>
+          <span>{{ data.auditTime }}</span>
         </div>
         <div class="item-info">
           <label>联系方式:</label>
-          <span>17964042574</span>
+          <span>{{ data.auditUserPhone }}</span>
         </div>
         <div class="item-info">
           <label>备注说明:</label>
-          <span>经现场了解，该人员家庭有多出房产，无返贫风险倾向。</span>
+          <span>{{ data.auditOpinion }}</span>
         </div>
         <div class="item-info">
           <label>图片:</label>
           <div>
-            <img src="./img/phone.png" alt="">
+            <img :src="e.url" v-for="(item,index) in data.auditFiles" :key="index"  @click.stop="previewImage(data.visitFiles, e.url)" />
           </div>
         </div>
       </div>
@@ -123,8 +124,8 @@
 
     <div style="height: 56px"></div>
 
-    <div class="btn" @click="toResult" >
-      <span v-if="data.status==0 && checkType ==0 ">走访核实</span>
+    <div class="btn" @click="toResult" v-if="(checkType == 0 || checkType == 1) && tabIndex==0 ">
+      <span v-if="data.status==0 || data.status==1">走访核实</span>
       <span v-else>处理结果</span>
     </div>
 
@@ -139,6 +140,7 @@ export default {
       id: '',
       data: {},
       checkType: '',
+      tabIndex: ''
     }
   },
   computed: {
@@ -147,6 +149,7 @@ export default {
   onLoad(o) {
     this.$dict.load('fpRiskPersonStatus','fpRiskType','fpRiskPersonOperation1','fpRiskPersonOperation2').then(()=>{
       this.id = o.id;
+      this.tabIndex = o.tabIndex;
       this.getDetail()
       this.getCheckType()
     })
diff --git a/src/apps/AppWarningMonitoring/result.vue b/src/apps/AppWarningMonitoring/result.vue
index 0e12cc44..1a0c9ef4 100644
--- a/src/apps/AppWarningMonitoring/result.vue
+++ b/src/apps/AppWarningMonitoring/result.vue
@@ -74,7 +74,7 @@ export default {
         if (res.code == 0) {
           this.$u.toast('提交成功')
           setTimeout(() => {
-            uni,navigateBack()
+            uni.navigateBack({delta: 2})
           },600)
         }
       })
diff --git a/src/apps/AppWarningMonitoring/riskList.vue b/src/apps/AppWarningMonitoring/riskList.vue
index 8788d5c8..24a9a32a 100644
--- a/src/apps/AppWarningMonitoring/riskList.vue
+++ b/src/apps/AppWarningMonitoring/riskList.vue
@@ -6,16 +6,18 @@
       </div>
       <div class="search-box">
         <div class="area-select">
-          <AiAreaPicker :fullName.sync="areaName" @select="areaSelect">
+          <!-- v-model="areaId" -->
+          <!-- :areaId="user.areaId" :value="areaId" -->
+          <AiAreaPicker v-model="areaId" :name.sync="areaName" @select="areaSelect">
             <u-icon name="map-fill" size="18px" color="#FFF"></u-icon>
-            <span v-if="areaName" style="color: #333333;fontSize: 14px;">{{ areaName }}</span>
-            <span v-else :style="{color:areaName? '#333333': '#FFFFFF'}">请选择</span>
+            <span v-if="areaName" style="color:#FFF;fontSize: 14px;">{{ areaName }}</span>
+            <span v-else :style="{color:areaName? '#FFF': '#E2E8F1'}">请选择</span>
             <u-icon name="arrow-down" color="#FFF" size="24" style="margin-left: 4px"></u-icon>
           </AiAreaPicker>
         </div>
         <div class="search">
           <u-search placeholder="请输入姓名" v-model="name" bg-color="#1F5CAF" search-icon-color="#E2E8F1"
-          placeholder-style="color: #E2E8F1;" :show-action="false" @search="searchHandler"></u-search>
+          placeholder-style="color: #E2E8F1;" :show-action="false" @search="searchHandler" @clear="name='',getList()"></u-search>
         </div>
       </div>
     </AiTopFixed>
@@ -58,6 +60,10 @@ export default {
     this.$dict.load('fpRiskPersonStatus','fpRiskType').then(()=>{
       this.areaId = this.user.areaId
       this.areaName = this.user.areaName
+      uni.$on('update',()=>{
+        this.current = 1
+        this.getList()
+      })
       this.getList()
     })
   },
@@ -67,8 +73,13 @@ export default {
       this.getList()
     },
     areaSelect(v) {
+      console.log(v);
       this.areaId = v
+      console.log(this.areaId);
+      this.$forceUpdate()
       this.current = 1
+      this.getList()
+      
     },
     searchHandler() {
       this.list = []
@@ -88,7 +99,7 @@ export default {
       })
     },
     toDetail(id) {
-      uni.navigateTo({url:`./detail?id=${id}`})
+      uni.navigateTo({url:`./detail?id=${id}&tabIndex=${this.tabIndex}`})
     }
   },
   onReachBottom() {
@@ -98,27 +109,18 @@ export default {
   onShow() {
     document.title = "风险预警"
   },
-  // filter() {
-  //   format(num) {
-  //     if(num==0) {
-  //       return ''
-  //     }
-  //   }
-  // }
 }
 </script>
 
 <style lang="scss" scoped>
 .riskList {
+  background: #f3f4f5;
   ::v-deep .AiTopFixed .content {
     padding: 0;
   }
   ::v-deep .AiTopFixed .search {
     margin-bottom: 0;
   }
-  // ::v-deep .search-box .area-select .AiAreaPicker span {
-  //   color: #FFF;
-  // }
   .tab-select {
     width: 100%;
     height: 96px;
@@ -179,6 +181,8 @@ export default {
       border-radius: 16px;
       margin-bottom: 16px;
       box-sizing: border-box;
+      width: 100%;
+      height: 100%;
       .top {
         padding: 32px 32px;
         .name-type {