From ecf746e0a92b3b9d83e767389234dac3b179e0d6 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 16 Feb 2022 16:15:40 +0800
Subject: [PATCH] 27434

---
 src/saas/AppConflictMediation/Content.vue | 3 ++-
 src/saas/AppConflictMediation/detail.vue  | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue
index 72572f66..69ab9ba3 100644
--- a/src/saas/AppConflictMediation/Content.vue
+++ b/src/saas/AppConflictMediation/Content.vue
@@ -74,6 +74,7 @@ export default {
     this.typeList()
     uni.$on('goback', (res) => {
       this.selectUser = res
+      console.log(res);
       if(res.name) {
         this.forms.name = res.name
       }else{
@@ -124,7 +125,7 @@ export default {
         }
         if(this.selectUser.name) { //选择的网格员
           params.girdId = this.selectUser.girdId
-          params.girdMemberId = this.selectUser.id
+          params.girdMemberId = this.selectUser.wxUserId
           params.girdMemberName = this.selectUser.name
         }
       }
diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue
index d9fe91b0..4cd8afc3 100644
--- a/src/saas/AppConflictMediation/detail.vue
+++ b/src/saas/AppConflictMediation/detail.vue
@@ -64,7 +64,11 @@
               <div class="cardsss-right-left">
                 <div class="cardssss-right-left-top">
                   <AiOpenData type="userName" :openid="transTxt(item.systemExplain)[1]" style="display: inline-block;"/>
-                  <div v-html="transTxt(item.systemExplain)[2]"/>
+                  <div v-html="transTxt(item.systemExplain)[2]" style="display: inline-block;"/>
+
+                  <AiOpenData v-if="transTxt(item.systemExplain)[3]" type="userName" 
+                  :openid="transTxt(item.systemExplain)[3]" style="display: inline-block;"/>
+                  <!-- <span>{{ item.girdName }}</span> -->
                   <div style="color: #2ea222; font-size: 16px; margin-top: 5px">
                     {{ $dict.getLabel('clapDoStatus', item.doStatus) }}
                   </div>
@@ -135,6 +139,7 @@ export default {
   },
   methods: {
     transTxt(str){
+      console.log(str.split("$"));
       return str.split("$")
     },