From 745a22a8e240687b28040ded7b4dc3e6167f9b4e Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 18 Feb 2022 13:49:02 +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

---
 .../AppVillagersCircle/AppVillagersCircle.vue  |  2 +-
 .../components/CommentsDetail.vue              | 18 +++++-------------
 .../components/CommentsList.vue                |  4 ++--
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/packages/shandong/AppVillagersCircle/AppVillagersCircle.vue b/packages/shandong/AppVillagersCircle/AppVillagersCircle.vue
index dceee1a6..dbaac5d8 100644
--- a/packages/shandong/AppVillagersCircle/AppVillagersCircle.vue
+++ b/packages/shandong/AppVillagersCircle/AppVillagersCircle.vue
@@ -92,7 +92,7 @@
         }
 
         if (data.type === 'CommentsDetail') {
-          this.componentName = 'Statistics'
+          this.componentName = 'CommentsDetail'
           this.isShowDetail = true
           this.params = data.params
         }
diff --git a/packages/shandong/AppVillagersCircle/components/CommentsDetail.vue b/packages/shandong/AppVillagersCircle/components/CommentsDetail.vue
index ce451d74..a158f9a8 100644
--- a/packages/shandong/AppVillagersCircle/components/CommentsDetail.vue
+++ b/packages/shandong/AppVillagersCircle/components/CommentsDetail.vue
@@ -7,19 +7,11 @@
     <template slot="content">
       <ai-card title="基础信息">
         <ai-wrapper slot="content">
-          <ai-info-item label="话题" :value="dict.getLabel('villagerCircleTopic', info.topic)" isLine></ai-info-item>
-          <ai-info-item label="发布人" :value="info.createUserName" isLine></ai-info-item>
+          <ai-info-item label="话题" :value="dict.getLabel('villagerCircleTopic', 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.gpsDesc" isLine></ai-info-item>
+          <ai-info-item label="所在位置" :value="info.villagerCircleInfo.gpsDesc" isLine></ai-info-item>
           <ai-info-item label="内容" :value="info.content" isLine></ai-info-item>
-          <ai-info-item label="图片" isLine>
-            <ai-uploader
-              :instance="instance"
-              disabled
-              v-model="info.pictures"
-              :limit="9">
-            </ai-uploader>
-          </ai-info-item>
         </ai-wrapper>
       </ai-card>
       <ai-card title="处理结果" v-if="info.status > 0">
@@ -97,7 +89,7 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appvillagercircleinfo/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appvillagercirclecomment/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
           }
@@ -113,7 +105,7 @@
       onConfirm() {
         this.$refs.form.validate(v => {
           if (v) {
-            this.instance.post('/app/appvillagercircleinfo/examine', null, {
+            this.instance.post('/app/appvillagercirclecomment/examine', null, {
               params: {
                 ...this.form,
                 id: this.params.id
diff --git a/packages/shandong/AppVillagersCircle/components/CommentsList.vue b/packages/shandong/AppVillagersCircle/components/CommentsList.vue
index c47712e8..d7108046 100644
--- a/packages/shandong/AppVillagersCircle/components/CommentsList.vue
+++ b/packages/shandong/AppVillagersCircle/components/CommentsList.vue
@@ -74,10 +74,10 @@
         },
         total: 0,
         colConfigs: [
-          { prop: 'createUserName',  label: '发布人', align: 'left' },
+          { prop: 'replyUserName',  label: '发布人', align: 'left' },
           { prop: 'createTime', label: '发布时间', align: 'center' },
           { prop: 'content', label: '发布内容', align: 'center' },
-          { prop: 'topic', label: '话题类型', align: 'center', formart: v => this.dict.getLabel('villagerCircleTopic', v) },
+          { prop: 'villagerCircleInfo', label: '话题类型', align: 'center', formart: 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' },