From af698b84681d80d41f9ec0f131f906d15ca4f4ce Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 6 May 2022 17:07:56 +0800
Subject: [PATCH] 29529

---
 src/apps/AppInfotainment/AppInfotainment.vue |  2 +-
 src/saas/AppConflictMediation/Content.vue    | 15 ++++++++-------
 src/saas/AppConflictMediation/List.vue       |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/apps/AppInfotainment/AppInfotainment.vue b/src/apps/AppInfotainment/AppInfotainment.vue
index c4628a6c..d9ec456b 100644
--- a/src/apps/AppInfotainment/AppInfotainment.vue
+++ b/src/apps/AppInfotainment/AppInfotainment.vue
@@ -37,7 +37,7 @@ export default {
   },
   onShow() {
     document.title = this.parentName
-    if(this.parentName.length) {
+    if(this.parentName) {
       this.getList()
     }
   },
diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue
index 8ecdca0f..1f4558ff 100644
--- a/src/saas/AppConflictMediation/Content.vue
+++ b/src/saas/AppConflictMediation/Content.vue
@@ -144,14 +144,15 @@ export default {
       this.$http.post(url, params).then((res) => {
         if (res.code == 0) {
           this.$u.toast(successText)
-          uni.$emit('updateDeatil')
-          uni.$emit('getListInit')
+          uni.$emit('update')
+          // uni.$emit('getListInit')
           setTimeout(() => {
-            if (this.status == 4) {
-              uni.navigateBack({delta: 2})
-            } else {
-              uni.navigateBack()
-            }
+            uni.navigateBack({delta: 2})
+            // if (this.status == 4) {
+            //   uni.navigateBack({delta: 2})
+            // } else {
+            //   uni.navigateBack()
+            // }
           }, 600)
         }
       })
diff --git a/src/saas/AppConflictMediation/List.vue b/src/saas/AppConflictMediation/List.vue
index ebd51430..ece6cb9c 100644
--- a/src/saas/AppConflictMediation/List.vue
+++ b/src/saas/AppConflictMediation/List.vue
@@ -144,7 +144,7 @@ export default {
           },
         })
         .then((res) => {
-          if (res.code == 0) {
+          if (res?.data) {
             this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
             this.pages = res.data.pages
             this.$forceUpdate()
@@ -153,7 +153,7 @@ export default {
     },
     getStaticList() {
       this.$http.post('/app/appclapeventinfo/clapEventStatisticByGirdMember').then((res) => {
-        if (res.code == 0) {
+        if (res?.data) {
           Object.keys(res.data).forEach(() => {
             this.staticName[0].value = res.data['待处理']
             this.staticName[1].value = res.data['上报数']