From aefaa0160d6d0ace7ec1b4f11855de87a87b27ee Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 28 Mar 2022 17:05:40 +0800
Subject: [PATCH 1/4] 28586

---
 src/apps/AppWarningMonitoring/AppWarningMonitoring.vue | 2 +-
 src/apps/AppWarningMonitoring/detail.vue               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppWarningMonitoring/AppWarningMonitoring.vue b/src/apps/AppWarningMonitoring/AppWarningMonitoring.vue
index 89585849..ef308e8e 100644
--- a/src/apps/AppWarningMonitoring/AppWarningMonitoring.vue
+++ b/src/apps/AppWarningMonitoring/AppWarningMonitoring.vue
@@ -6,7 +6,7 @@
       </div>
       <div class="search-box">
         <div class="area-select">
-          <AiAreaPicker v-model="areaId" :areaId="user.areaId" :name.sync="areaName" @select="areaSelect">
+          <AiAreaPicker v-model="areaId" :areaId="user.areaId" :name.sync="areaName" @select="areaSelect" select-root>
             <div style="display: flex;">
               <u-icon name="map-fill" size="18px" color="#FFF" style="width:18px;display:inline-block;margin-top: 18px"></u-icon>
               <span v-if="areaName" style="color:#FFF;fontSize: 14px;" class="areaName">{{ areaName }}</span>
diff --git a/src/apps/AppWarningMonitoring/detail.vue b/src/apps/AppWarningMonitoring/detail.vue
index 0f4c349f..d8ac2ee7 100644
--- a/src/apps/AppWarningMonitoring/detail.vue
+++ b/src/apps/AppWarningMonitoring/detail.vue
@@ -122,7 +122,7 @@
         </div>
       </div>
     </div>
-
+4
     <div style="height: 56px"></div>
 
     <div class="btn" @click="toResult" v-if="(checkType == 1 || checkType == 2) && tabIndex==0 ">
@@ -176,7 +176,7 @@ export default {
     getCheckType() {
       this.$http.post('/app/appgirdmemberinfo/checkLogOnUser',null,{
         params: {
-          corpId: this.user.id
+          girdId: this.user.id
         }
       }).then((res) => {
         if(res.code == 0) {

From 1ff7f4dc9957fd8326026baddd124a776cc8c8be Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 28 Mar 2022 17:16:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=89=8B=E8=AF=AF=20=E5=A4=9A=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppWarningMonitoring/detail.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/apps/AppWarningMonitoring/detail.vue b/src/apps/AppWarningMonitoring/detail.vue
index d8ac2ee7..a20ffd5c 100644
--- a/src/apps/AppWarningMonitoring/detail.vue
+++ b/src/apps/AppWarningMonitoring/detail.vue
@@ -122,7 +122,6 @@
         </div>
       </div>
     </div>
-4
     <div style="height: 56px"></div>
 
     <div class="btn" @click="toResult" v-if="(checkType == 1 || checkType == 2) && tabIndex==0 ">

From 65ec3c2d5bac6d40cfd4a0eee8aa38a8ce79fd1a Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 28 Mar 2022 17:51:15 +0800
Subject: [PATCH 3/4] 28598

---
 src/apps/AppWarningMonitoring/detail.vue | 17 +++++++++++++----
 src/apps/AppWarningMonitoring/result.vue |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/apps/AppWarningMonitoring/detail.vue b/src/apps/AppWarningMonitoring/detail.vue
index a20ffd5c..38806579 100644
--- a/src/apps/AppWarningMonitoring/detail.vue
+++ b/src/apps/AppWarningMonitoring/detail.vue
@@ -58,7 +58,7 @@
     </div>
 
     <!-- 待审核 -->
-    <div class="to-check" v-if="data.visitUserName" >
+    <div class="to-check" v-if="data.visitUserName">
       <div class="title">
         <span>走访核实</span>
         <span style="color:#FF8822" v-if="data.status == 1">疑似风险</span>
@@ -124,9 +124,14 @@
     </div>
     <div style="height: 56px"></div>
 
-    <div class="btn" @click="toResult" v-if="(checkType == 1 || checkType == 2) && tabIndex==0 ">
-      <span v-if="data.status==0 || data.status==1">走访核实</span>
-      <span v-else>处理结果</span>
+    <div class="btn" @click="toResult" v-if="checkType == 1 && tabIndex==0 && !data.visitUserName">
+      <span v-if="(data.status==0 || data.status==1)">走访核实</span>
+      <!-- <span v-if="(data.status==2 || data.status==3)">处理结果</span> -->
+    </div>
+
+    <div class="btn" @click="toResult" v-if="checkType == 2 && tabIndex==0" !data.auditUserName>
+      <!-- <span v-if="(data.status==0 || data.status==1)">走访核实</span> -->
+      <span v-if="(data.status==2 || data.status==3)">处理结果</span>
     </div>
 
   </div>
@@ -152,7 +157,11 @@ export default {
       this.tabIndex = o.tabIndex;
       this.getDetail()
       this.getCheckType()
+      uni.$on('update',()=>{
+        this.getDetail()
+      })
     })
+
   },
   methods: {
     previewImage(images, img) {
diff --git a/src/apps/AppWarningMonitoring/result.vue b/src/apps/AppWarningMonitoring/result.vue
index ca28463c..d9d6609a 100644
--- a/src/apps/AppWarningMonitoring/result.vue
+++ b/src/apps/AppWarningMonitoring/result.vue
@@ -57,6 +57,7 @@ export default {
   },
   methods: {
     submit() {
+      
       if(!this.operation) {
         return this.$u.toast('请选择处理意见')
       }

From 468b088507039418bd02c3a8b25e33ba91bbcb6c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 28 Mar 2022 17:56:13 +0800
Subject: [PATCH 4/4] 28598

---
 src/apps/AppWarningMonitoring/result.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/apps/AppWarningMonitoring/result.vue b/src/apps/AppWarningMonitoring/result.vue
index d9d6609a..867a6f78 100644
--- a/src/apps/AppWarningMonitoring/result.vue
+++ b/src/apps/AppWarningMonitoring/result.vue
@@ -90,6 +90,11 @@ export default {
 
 <style lang="scss" scoped>
 .result {
+  padding-bottom: 112px;
+  ::v-deep .ai-uploader .fileList .default {
+    width: 160px;
+    height: 160px;
+  }
   .type {
     height: 112px;
     line-height: 112px;