From 4106c488773bc8b5b6a04dfad16b4bd9f6c4e8a2 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 18 Feb 2022 17:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=91=E6=B0=91=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shandong/AppVillagersCircle/components/CommentsDetail.vue | 4 ++--
 .../shandong/AppVillagersCircle/components/CommentsList.vue   | 3 +--
 .../apps/shandong/AppVillagersCircle/components/List.vue      | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsDetail.vue b/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsDetail.vue
index a158f9a8..c7ab02d2 100644
--- a/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsDetail.vue
+++ b/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsDetail.vue
@@ -7,10 +7,10 @@
     <template slot="content">
       <ai-card title="基础信息">
         <ai-wrapper slot="content">
-          <ai-info-item label="话题" :value="dict.getLabel('villagerCircleTopic', info.villagerCircleInfo.topic)" isLine></ai-info-item>
+          <ai-info-item label="话题" :value="dict.getLabel('villagerCircleTopic', info.villagerCircleInfo ? info.villagerCircleInfo.topic : '')" isLine></ai-info-item>
           <ai-info-item label="发布人" :value="info.replyUserName" isLine></ai-info-item>
           <ai-info-item label="发布时间" :value="info.createTime" isLine></ai-info-item>
-          <ai-info-item label="所在位置" :value="info.villagerCircleInfo.gpsDesc" isLine></ai-info-item>
+          <ai-info-item label="所在位置" :value="info.villagerCircleInfo ? info.villagerCircleInfo.gpsDesc : ''" isLine></ai-info-item>
           <ai-info-item label="内容" :value="info.content" isLine></ai-info-item>
         </ai-wrapper>
       </ai-card>
diff --git a/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue b/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue
index d7108046..c9a27fa8 100644
--- a/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue
+++ b/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue
@@ -43,7 +43,6 @@
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" title="详情" @click="toDetail(row.id)">详情</el-button>
-              <el-button type="text" @click="remove(row.id)">删除</el-button>
             </div>
           </template>
         </el-table-column>
@@ -77,7 +76,7 @@
           { prop: 'replyUserName',  label: '发布人', align: 'left' },
           { prop: 'createTime', label: '发布时间', align: 'center' },
           { prop: 'content', label: '发布内容', align: 'center' },
-          { prop: 'villagerCircleInfo', label: '话题类型', align: 'center', formart: v => this.dict.getLabel('villagerCircleTopic', v.topic) },
+          { prop: 'villagerCircleInfo', label: '话题类型', align: 'center', formart: v =>  v ? this.dict.getLabel('villagerCircleTopic', v.topic) : '' },
           { prop: 'status', label: '状态', align: 'center', formart: v => this.dict.getLabel('auditStatus', v) },
           { prop: 'auditUserName', label: '审核人', align: 'center' },
           { prop: 'auditTime', label: '审核时间', align: 'center' },
diff --git a/project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue b/project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue
index 95850f88..2e44d29d 100644
--- a/project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue
+++ b/project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue
@@ -43,7 +43,6 @@
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" title="详情" @click="toDetail(row.id)">详情</el-button>
-              <el-button type="text" @click="remove(row.id)">删除</el-button>
             </div>
           </template>
         </el-table-column>