From 7c295176fa4357f2e41a731500a76986a4e041e4 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 17 Feb 2022 21:10:48 +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  |  7 +++++--
 src/apps/AppVillagersCircle/Reject.vue         | 14 ++++++++++----
 src/apps/AppVillagersCircle/detail.vue         | 18 ++++++++----------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/apps/AppVillagersCircle/AppVillagersCircle.vue b/src/apps/AppVillagersCircle/AppVillagersCircle.vue
index a4822cd6..11231bdd 100644
--- a/src/apps/AppVillagersCircle/AppVillagersCircle.vue
+++ b/src/apps/AppVillagersCircle/AppVillagersCircle.vue
@@ -6,7 +6,7 @@
     </div>
 
     <!-- 全部 -->
-    <div v-if="tabIndex == 0">
+    <div>
       <div class="search-box" v-if="tabIndex==0">
         <div class="integral-types" @click="showType = true">{{ topicType? topicType:'话题类型' }}<u-icon name="arrow-down"></u-icon></div>
         <u-search placeholder="请输入关键字" v-model="content" :show-action="false" @search="getList()" @clear="getList()"></u-search>
@@ -58,13 +58,16 @@ export default {
   methods: {
     tabClick(index) {
       this.tabIndex = index
+      this.current = 1,
+      this.villagerList = [],
+      this.getList()
     },
     getList() {
       this.$http.post('app/appvillagercircleinfo/list',null,{
         params: {
           current: 1,
           size: 10,
-          status: this.tabIndex==0? '':this.tabIndex==1?'0': this.tabIndex==2?'1|2':'',
+          auditType: this.tabIndex == 0 ? '': this.tabIndex == 1 ? 0 : 1,
           topic: this.topic,
           content: this.content
         }
diff --git a/src/apps/AppVillagersCircle/Reject.vue b/src/apps/AppVillagersCircle/Reject.vue
index 459116b2..909f7209 100644
--- a/src/apps/AppVillagersCircle/Reject.vue
+++ b/src/apps/AppVillagersCircle/Reject.vue
@@ -16,7 +16,8 @@ export default {
   data() {
     return {
       value: '',
-      id: ''
+      id: '',
+      pass: '',
     };
   },
   onShow() {
@@ -24,17 +25,22 @@ export default {
   },
   onLoad(o) {
     this.id = o.id
+    this.pass = o.pass
+    // console.log(o);
   },
   methods: {
     submit() {
       this.$http.post('/app/appvillagercircleinfo/examine',null, {
         params: {
           id: this.id,
-          pass: 0,
+          pass: this.pass,
           opinion: this.value
         }
-      }).then(res => {
-        console.log(res);
+      }).then(() => {
+        uni.$emit('update')
+        setTimeout(()=>{
+          uni.navigateBack()
+        })
       })
     }
   },
diff --git a/src/apps/AppVillagersCircle/detail.vue b/src/apps/AppVillagersCircle/detail.vue
index 7f4f791d..55180be5 100644
--- a/src/apps/AppVillagersCircle/detail.vue
+++ b/src/apps/AppVillagersCircle/detail.vue
@@ -6,8 +6,7 @@
       </div>
       <div class="avatar-title">
         <div class="name">
-          <!-- <AiOpenData  type="userName" :openid="data.id" style="display: inline-block;"/> -->
-          {{ data.id }}
+          {{ data.createUserName }}
         </div>
         <div class="time">
           <span>{{ $dict.getLabel('villagerCircleTopic',data.topic) }}</span>
@@ -16,7 +15,7 @@
       </div>
     </div>
     <div class="textarea">{{ data.content }}</div>
-    <div style="background: #FFFFFF; padding:0 30px; box-sizing: border-box;">
+    <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>
     <div class="address" v-if="data.gpsDesc">
@@ -34,28 +33,28 @@
       </div>
     </div>
 
-    <div class="readOnly" v-if="status==1">
+    <div class="readOnly" v-if="data.status==2">
       <div class="item">
         <div>审核结果</div>
         <div>不通过</div>
       </div>
       <div class="item nopass">
         <div>不通过理由</div>
-        <div class="textarea">我村赴黎平参加百村杯篮球赛经费分两阶段分发， 第一阶段为小组循环赛，第二阶段为淘汰赛。第一 其中包括队员球服两套，住宿、饮食</div>
+        <div class="textarea">{{ data.auditOpinion }}</div>
       </div>
       <div class="item">
         <div>审核人</div>
-        <div>李世民</div>
+        <div>{{ data.auditUserName }}</div>
       </div>
       <div class="item last">
         <div>审核时间</div>
-        <div>2022-02-18 18:16:27</div>
+        <div>{{ data.auditTime }}</div>
       </div>
     </div>
 
     <div style="height: 56px;"></div>
 
-    <div class="btn" v-if="status == 0">
+    <div class="btn" v-if="data.status != 2">
       <div class="reject" @click="toReject">驳回发布</div>
       <div class="agree" @click="agree">同意发布</div>
     </div>
@@ -90,7 +89,6 @@ export default {
     },
     getDetail() {
       this.$http.post(`/app/appvillagercircleinfo/queryDetailById?id=${this.id}`).then(res => {
-        // console.log(res);
         if(res.code==0){
           this.data = res.data
         }
@@ -102,7 +100,7 @@ export default {
       })
     },
     toReject() {
-      uni.navigateTo({url: `./Reject?id=${data.id}`})
+      uni.navigateTo({url: `./Reject?id=${this.data.id}&pass=0`})
     },
     agree() {}
   },