From 4c8766ad94cce8e90683b08755cfbf7c6ca56577 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 6 Mar 2023 17:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qujing/AppConflictMediation/detail.vue    | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/project/qujing/AppConflictMediation/detail.vue b/src/project/qujing/AppConflictMediation/detail.vue
index 2f46edaf..e23d073f 100644
--- a/src/project/qujing/AppConflictMediation/detail.vue
+++ b/src/project/qujing/AppConflictMediation/detail.vue
@@ -1,9 +1,7 @@
 <template>
   <div class="Detail" v-if="showPage">
     <div class="header-top">
-      <div class="avatars">
-        {{ data.name.substring(data.name.length, data.name.length - 2) }}
-      </div>
+      <div class="avatars" v-text="avatar(data.name)"/>
       <div class="right">
         <div class="names">{{ data.name }}的上报</div>
         <div class="times">{{ data.createTime }}</div>
@@ -46,16 +44,14 @@
           <div class="cardss">
             <div class="cardss-left">
               <div class="card-img">
-                <div v-text="transTxt(item.systemExplain).avatar" style="display: inline-block; font-size:12px;"/>
+                <div v-text="avatar(item.girdMemberName)" style="display: inline-block; font-size:12px;"/>
                 <img src="./components/1.png" class="avatarIcon" alt=""/>
               </div>
             </div>
-            <div class="fill mar-l8">
+            <div class="fill mar-l16">
               <div class="cardssss-right-left-top flex">
-                <div v-text="transTxt(item.systemExplain).name"/>
-                <div v-html="transTxt(item.systemExplain).desc"/>
-                <div v-if="transTxt(item.systemExplain).transfer" v-text="`转交给${transTxt(item.systemExplain).transfer}`"/>
-                <div v-text="$dict.getLabel('clapDoStatus', item.doStatus)"/>
+                <div v-if="item.systemExplain" v-text="item.systemExplain"/>
+                <div v-else v-text="item.girdMemberName+$dict.getLabel('clapDoStatus', item.doStatus)"/>
               </div>
             </div>
           </div>
@@ -113,9 +109,8 @@ export default {
     document.title = '矛盾调解'
   },
   methods: {
-    transTxt(str) {
-      const [, name, desc, transfer] = str?.split("$") || []
-      return {avatar: name?.slice(0, 1)?.toUpperCase() || '无名', name, desc, transfer}
+    avatar(str) {
+      return str?.slice(0, 1)?.toUpperCase() || "用户"
     },
     getDetail() {
       this.$http.post(`/app/appconflicteventinfo/queryDetailById?id=${this.id}`).then((res) => {
@@ -154,8 +149,7 @@ uni-page-body {
 
   .header-top {
     display: flex;
-    margin: 26px 0 14px 0;
-    padding: 0 32px;
+    padding: 26px 32px 14px;
 
     .avatars {
       width: 80px;