From 89d641181538b89d8037b32978e43d68476cb4b2 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 18 Feb 2022 17:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=91=E6=B0=91=E5=9C=88=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppVillagersCircle/Reject.vue        | 46 +++++++++----
 src/apps/AppVillagersCircle/commentDetail.vue | 54 ++++++++++------
 src/apps/AppVillagersCircle/commentList.vue   | 64 ++++++++++---------
 src/apps/AppVillagersCircle/infoDetail.vue    | 12 +---
 src/apps/AppVillagersCircle/infoList.vue      |  3 +-
 5 files changed, 109 insertions(+), 70 deletions(-)

diff --git a/src/apps/AppVillagersCircle/Reject.vue b/src/apps/AppVillagersCircle/Reject.vue
index c05b83a9..63097ff8 100644
--- a/src/apps/AppVillagersCircle/Reject.vue
+++ b/src/apps/AppVillagersCircle/Reject.vue
@@ -18,30 +18,52 @@ export default {
       value: '',
       id: '',
       pass: '',
+      flag: '',  // 0 驳回信息  1 驳回评论
     };
   },
   onShow() {
     document.title = '村民圈审核'
   },
   onLoad(o) {
+    console.log(o);
     this.id = o.id
     this.pass = o.pass
+    this.flag = o.flag
   },
   methods: {
     submit() {
-      this.$http.post('/app/appvillagercircleinfo/examine',null, {
-        params: {
-          id: this.id,
-          pass: this.pass,
-          opinion: this.value
-        }
-      }).then(() => {
-        this.$u.toast('保存成功')
-        uni.$emit('update')
-        setTimeout(()=>{
-          uni.navigateBack()
+
+      if(this.flag == 0) {
+        this.$http.post('/app/appvillagercircleinfo/examine',null, {
+          params: {
+            id: this.id,
+            pass: this.pass,
+            opinion: this.value
+          }
+          }).then(() => {
+          this.$u.toast('保存成功')
+          uni.$emit('update')
+          setTimeout(()=>{
+            uni.navigateBack({delta: 2})
+          },600)
         })
-      })
+      }
+      if(this.flag == 1) {
+        this.$http.post('/app/appvillagercirclecomment/examine',null, {
+          params: {
+            id: this.id,
+            pass: this.pass,
+            opinion: this.value
+          }
+          }).then(() => {
+          this.$u.toast('保存成功')
+          uni.$emit('update')
+          setTimeout(()=>{
+            uni.navigateBack({delta: 2})
+          },600)
+        })
+      }
+      
     }
   },
 };
diff --git a/src/apps/AppVillagersCircle/commentDetail.vue b/src/apps/AppVillagersCircle/commentDetail.vue
index dea3de2a..233f145a 100644
--- a/src/apps/AppVillagersCircle/commentDetail.vue
+++ b/src/apps/AppVillagersCircle/commentDetail.vue
@@ -5,35 +5,52 @@
         <img src="./img/tx@2x.png" alt="">
       </div>
       <div class="avatar-title">
-        <div class="name">
-          {{ data.createUserName }}
+        <div class="name" v-if="data.villagerCircleInfo && data.villagerCircleInfo.createUserName">
+          {{ data.villagerCircleInfo.createUserName }}
         </div>
         <div class="time">
-          <span>{{ $dict.getLabel('villagerCircleTopic',data.topic) }}</span>
-          <span>{{ data.createTime }}</span>
+          <span v-if="data.villagerCircleInfo && data.villagerCircleInfo.topic">{{ $dict.getLabel('villagerCircleTopic',data.villagerCircleInfo.topic) }}</span>
+          <span v-if="data.villagerCircleInfo && data.villagerCircleInfo.createTime">{{ data.villagerCircleInfo.createTime }}</span>
         </div>
       </div>
     </div>
-    <div class="textarea">{{ data.content }}</div>
-    <div style="background: #FFFFFF; padding:0 30px; box-sizing: border-box;padding-bottom: 20px;">
-      <img :src="item.url" alt="" v-for="(item, i) in data.pictures" :key="i"  @click="previewImage(data.pictures, item.url)" class="upLoadPic"/>
+    <div class="textarea" v-if="data.villagerCircleInfo && data.villagerCircleInfo.content">{{ data.villagerCircleInfo.content }}</div>
+    <div style="background: #FFFFFF; padding:0 30px; box-sizing: border-box;padding-bottom: 20px;" v-if="data.villagerCircleInfo && data.villagerCircleInfo.pictures">
+      <img :src="item.url" alt="" v-for="(item, i) in data.villagerCircleInfo.pictures" :key="i"  @click="previewImage(data.villagerCircleInfo.pictures, item.url)" class="upLoadPic" />
     </div>
-    <div class="address" v-if="data.gpsDesc">
+    <div class="address" v-if="data.villagerCircleInfo && data.villagerCircleInfo.gpsDesc">
       <span class="addr-bg">
         <img src="./img/address.png" alt="">
-        <span>{{ data.gpsDesc }}</span>
+        <span v-if="data.villagerCircleInfo && data.villagerCircleInfo.gpsDesc">{{ data.villagerCircleInfo.gpsDesc }}</span>
       </span>
     </div>
-    <div class="comment" v-if="data.comments">
+    <div class="comment" v-if="data.content">
       <div class="comment-list">
         <div class="title">评论:</div>
         <div class="item">
-          <span class="avatar">桃白白:</span>为什么不带上我
+          <span class="avatar">{{ data.replyUserName }}</span><span>:</span><span>{{ data.content }}</span>
         </div>
       </div>
     </div>
 
-    <div class="readOnly" v-if="data.status != 0">
+    <!-- 通过 -->
+    <div class="readOnly" v-if="data.status ==1 ">
+      <div class="item">
+        <div>审核结果</div>
+        <div>通过</div>
+      </div>
+      <div class="item">
+        <div>审核人</div>
+        <div>{{ data.auditUserName }}</div>
+      </div>
+      <div class="item last">
+        <div>审核时间</div>
+        <div>{{ data.auditTime }}</div>
+      </div>
+    </div>
+
+    <!-- 不通过 -->
+    <div class="readOnly" v-if="data.status ==2">
       <div class="item">
         <div>审核结果</div>
         <div>不通过</div>
@@ -71,13 +88,13 @@ export default {
       status: 0,
       id: '',
       data: {},
+      flag: 1
     }
   },
   onLoad(o) {
     this.$dict.load('villagerCircleTopic').then(()=>{
       this.id = o.id
       this.getDetail()
-      // this.getComment()
     })
   },
   methods: {
@@ -88,17 +105,18 @@ export default {
       })
     },
     getDetail() {
-      this.$http.post(`/app/appvillagercircleinfo/queryDetailById?id=${this.id}`).then(res => {
-        if(res.code==0){
+      this.$http.post(`/app/appvillagercirclecomment/queryDetailById?id=${this.id}`).then(res => {
+        if(res?.data){
           this.data = res.data
+          this.$forceUpdate()
         }
       })
     },
     toReject() {
-      uni.navigateTo({url: `./Reject?id=${this.data.id}&pass=0`})
+      uni.navigateTo({url: `./Reject?id=${this.data.id}&pass=0&flag=1`})
     },
     agree() {
-      this.$http.post('/app/appvillagercircleinfo/examine',null, {
+      this.$http.post('/app/appvillagercirclecomment/examine',null, {
         params: {
           id: this.id,
           pass: 1,
@@ -108,7 +126,7 @@ export default {
         uni.$emit('update')
         setTimeout(()=>{
           uni.navigateBack()
-        })
+        },600)
       })
     }
   },
diff --git a/src/apps/AppVillagersCircle/commentList.vue b/src/apps/AppVillagersCircle/commentList.vue
index 28f5e369..d0bcfed2 100644
--- a/src/apps/AppVillagersCircle/commentList.vue
+++ b/src/apps/AppVillagersCircle/commentList.vue
@@ -11,16 +11,18 @@
         <u-search placeholder="请输入关键字" v-model="content" :show-action="false" @search="getList()" @clear="getList()"></u-search>
       </div>
 
-      <div class="card-list" v-if="villagerList.length">
-        <div class="card-item" v-for="(item,index) in villagerList" :key="index" @click="toDetail(item)">
-          <div class="card-title">{{ item.content }}</div>
+      <div class="card-list" v-if="data.length">
+        <div class="card-item" v-for="(item,index) in data" :key="index" @click="toDetail(item)">
+          <div class="card-title" v-if="item.villagerCircleInfo && item.villagerCircleInfo.content">{{ item.villagerCircleInfo.content }}</div>
           <div class="card-name">
-            <div class="name">发布信息</div>
-            <div class="name">{{$dict.getLabel('villagerCircleTopic',item.topic)}}</div>
-            <div class="time">{{ item.createTime }}</div>
+            <div class="name" v-if="item.villagerCircleInfo && item.villagerCircleInfo.topic">{{$dict.getLabel('villagerCircleTopic',item.villagerCircleInfo.topic)}}</div>
+            <div class="time" v-if="item.villagerCircleInfo && item.villagerCircleInfo.createTime">{{ item.villagerCircleInfo.createTime }}</div>
           </div>
           <div class="card-type">
-            <div class="type">{{$dict.getLabel('auditStatus',item.auditType)}}</div>
+            <div class="comment">
+              <span>{{ item.replyUserName}}</span><span>:</span><span>{{ item.content }}</span>
+            </div>
+            <div class="type" :style="{color: item.status==0? '#4181FF':item.status==1? '#07c160' : '#dd5347'}">{{$dict.getLabel('auditStatus',item.status)}}</div>
           </div>
         </div>
       </div>
@@ -42,16 +44,20 @@ export default {
       showType: false,
       content: '',
       typeList: [],
-      villagerList: [],
       current: 1,
       topic: '',
       topicType: '',
+      data: {}
     }
   },
-  onLoad() {
+  created() {
+    this.getList()
     this.$dict.load('villagerCircleTopic','auditStatus').then(()=>{
-      this.current = 1
-      this.getList()
+      this.$on('update',()=>{
+        this.current = 1
+        this.getList()
+      })
+      
     })
   },
   methods: {
@@ -60,26 +66,26 @@ export default {
       this.current = 1,
       this.topic = '',
       this.topicType = '',
-      this.villagerList = [],
+      this.data = [],
       this.getList()
     },
+    
     getList() {
-      this.$http.post('app/appvillagercircleinfo/list',null,{
+      this.$http.post('/app/appvillagercirclecomment/list?current=1&size=10',null,{
         params: {
           current: 1,
           size: 10,
-          auditType: this.tabIndex == 0 ? '': this.tabIndex == 1 ? 0 : 1,
-          topic: this.topic,
-          content: this.content
+          auditType: this.tabIndex==0? '': this.tabIndex==1? 0 : 1
         }
       }).then(res=>{
         if(res?.data) {
-          this.villagerList = this.current >1 ? [...this.villagerList,...res.data.records] : res.data.records
+          this.data = this.current >1 ? [...this.data, ...this.res.data.records] : res.data.records
         }
       })
     },
 
     confirmTypeSelect(e) {
+      console.log(e);
       this.topic = e[0].value,
       this.topicType = e[0].label
       this.current = 1,
@@ -88,11 +94,11 @@ export default {
     },
 
     toDetail(item) {
-      uni.navigateTo({url: `./infoDetail?id=${item.id}`})
+      uni.navigateTo({url: `./commentDetail?id=${item.id}`})
     }
   },
   onShow() {
-    document.title = '发布信息审核'
+    document.title = '发布评论审核'
   },
 }
 </script>
@@ -186,22 +192,22 @@ export default {
       }
 
       .card-type {
+        display: flex;
+        justify-content: space-between;
         margin-top: 30px;
         font-size: 28px;
 
-        .num {
-          font-size: 34px;
-          color: #E6736E;
+        .comment {
+          width: 70%;
+          overflow:hidden;
+          text-overflow:ellipsis;
+          white-space:nowrap;
         }
 
-        .status0 {
-          color: #FF9B2B;
+        .type {
+          width: 20%;
+          text-align: right;
         }
-
-        .status1 {
-          color: #4181FF;
-        }
-
       }
     }
   }
diff --git a/src/apps/AppVillagersCircle/infoDetail.vue b/src/apps/AppVillagersCircle/infoDetail.vue
index 36a429b3..ca8544e5 100644
--- a/src/apps/AppVillagersCircle/infoDetail.vue
+++ b/src/apps/AppVillagersCircle/infoDetail.vue
@@ -24,14 +24,7 @@
         <span>{{ data.gpsDesc }}</span>
       </span>
     </div>
-    <!-- <div class="comment" v-if="data.comments">
-      <div class="comment-list">
-        <div class="title">评论:</div>
-        <div class="item">
-          <span class="avatar">桃白白:</span>为什么不带上我
-        </div>
-      </div>
-    </div> -->
+    
     <div class="readOnly" v-if="data.status != 0">
       <div class="item">
         <div>审核结果</div>
@@ -70,6 +63,7 @@ export default {
       status: 0,
       id: '',
       data: {},
+      flag: 0
     }
   },
   onLoad(o) {
@@ -94,7 +88,7 @@ export default {
       })
     },
     toReject() {
-      uni.navigateTo({url: `./Reject?id=${this.data.id}&pass=0`})
+      uni.navigateTo({url: `./Reject?id=${this.data.id}&pass=0&flag=0`})
     },
     agree() {
       this.$http.post('/app/appvillagercircleinfo/examine',null, {
diff --git a/src/apps/AppVillagersCircle/infoList.vue b/src/apps/AppVillagersCircle/infoList.vue
index d12f13a8..9cae8ab5 100644
--- a/src/apps/AppVillagersCircle/infoList.vue
+++ b/src/apps/AppVillagersCircle/infoList.vue
@@ -16,7 +16,6 @@
         <div class="card-item" v-for="(item,index) in villagerList" :key="index" @click="toDetail(item)">
           <div class="card-title">{{ item.content }}</div>
           <div class="card-name">
-            <!-- <div class="name">发布信息</div> -->
             <div class="name">{{$dict.getLabel('villagerCircleTopic',item.topic)}}</div>
             <div class="time">{{ item.createTime }}</div>
           </div>
@@ -69,7 +68,7 @@ export default {
         params: {
           current: 1,
           size: 10,
-          auditStatus: this.tabIndex == 0 ? '': this.tabIndex == 1 ? 0 : 1,
+          auditType: this.tabIndex == 0 ? '': this.tabIndex == 1 ? 0 : 1,
           topic: this.topic,
           content: this.content
         }