jf

src/apps/AppVillagersCircle/AppVillagersCircle.vue

@@ -7,28 +7,27 @@
 
     <!-- 全部 -->
     <div v-if="tabIndex == 0">
-      <div class="search-box">
-        <div class="integral-types" @click="showType = true">话题类型<u-icon name="arrow-down"></u-icon></div>
-        <u-search placeholder="请输入关键字" v-model="keyword" :show-action="false"></u-search>
+      <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>
       </div>
 
-      <div class="card-list">
-        <div class="card-item" @click="toDetail">
-          <div class="card-title">阳光美丽，空气格外清新</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-name">
             <div class="name">发布信息</div>
-            <div class="name">美丽庭院</div>
-            <div class="time">2021-12-06</div>
+            <div class="name">{{$dict.getLabel('villagerCircleTopic',item.topic)}}</div>
+            <div class="time">{{ item.createTime }}</div>
           </div>
           <div class="card-type">
-            <div class="type">审核通过</div>
+            <div class="type">{{$dict.getLabel('auditStatus',item.auditType)}}</div>
           </div>
         </div>
       </div>
-      <AiEmpty description="暂无数据" class="emptyWrap"></AiEmpty>
+      <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
 
-      <!-- $dict.getDict('yesOrNo') -->
-      <u-select v-model="showType" :list="typeList" label-name="dictName" value-name="dictValue"
+      <u-select v-model="showType" :list="$dict.getDict('villagerCircleTopic')" label-name="dictName" value-name="dictValue"
               @confirm="confirmTypeSelect"/>
     </div>
   </div>
@@ -41,34 +40,56 @@ export default {
   data () {
     return {
       tabs: ['全部', '待处理', '已处理'],
-      tabIndex: 0,
+      tabIndex: '',
       showType: false,
-      keyword: '',
+      content: '',
       typeList: [],
-
+      villagerList: [],
+      current: 1,
+      topic: '',
+      topicType: '',
     }
   },
+  onLoad() {
+    this.$dict.load('villagerCircleTopic','auditStatus').then(()=>{
+      this.getList()
+    })
+  },
   methods: {
-
     tabClick(index) {
       this.tabIndex = index
     },
-
-    confirmTypeSelect(e) {
-      console.log(e);
+    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':'',
+          topic: this.topic,
+          content: this.content
+        }
+      }).then(res=>{
+        if(res?.data) {
+          this.villagerList = this.current >1 ? [...this.villagerList,...res.data.records] : res.data.records
+        }
+      })
     },
 
-    toDetail() {
-      uni.navigateTo({url: './detail'})
+    confirmTypeSelect(e) {
+      this.topic = e[0].value,
+      this.topicType = e[0].label
+      this.current = 1,
+      this.villagerList = []
+      this.getList()
+    },
+
+    toDetail(item) {
+      uni.navigateTo({url: `./detail?id=${item.id}`})
     }
   },
   onShow() {
     document.title = '村民圈'
   },
-  onLoad() {
-    // this.$dict.load('yesOrNo')
-  },
-
 }
 </script>
 
@@ -153,7 +174,7 @@ export default {
         color: #999999;
 
         .name {
-          padding: 0 30px;
+          padding: 0 15px;
           background: #EEEEEE;
           border-radius: 24px;
           margin-right: 20px;

src/apps/AppVillagersCircle/Reject.vue

@@ -2,7 +2,7 @@
   <div class="Reject">
     <div class="text-area">
       <div class="title">不通过理由</div>
-      <textarea placeholder="请输入" maxlength="200"></textarea>
+      <textarea placeholder="请输入" maxlength="200" v-model="value"></textarea>
     </div>
     <div class="footer" @click="submit">
       <div class="btn">保存</div>
@@ -16,17 +16,26 @@ export default {
   data() {
     return {
       value: '',
+      id: ''
     };
   },
   onShow() {
     document.title = '村民圈审核'
   },
-  onLoad(option) {
-    // this.id = option.id
+  onLoad(o) {
+    this.id = o.id
   },
   methods: {
     submit() {
-
+      this.$http.post('/app/appvillagercircleinfo/examine',null, {
+        params: {
+          id: this.id,
+          pass: 0,
+          opinion: this.value
+        }
+      }).then(res => {
+        console.log(res);
+      })
     }
   },
 };

src/apps/AppVillagersCircle/detail.vue

@@ -3,24 +3,26 @@
     <div class="avatar-info">
       <div class="avatar-img">
         <img src="./img/tx@2x.png" alt="">
-        <!-- <img src="./img/tx@2x.png" alt=""> -->
       </div>
       <div class="avatar-title">
-        <div class="name">雷洋</div>
+        <div class="name">
+          <!-- <AiOpenData  type="userName" :openid="data.id" style="display: inline-block;"/> -->
+          {{ data.id }}
+        </div>
         <div class="time">
-          <span>美丽庭院</span>
-          <span>2020-10-28 12:30</span>
+          <span>{{ $dict.getLabel('villagerCircleTopic',data.topic) }}</span>
+          <span>{{ data.createTime }}</span>
         </div>
       </div>
     </div>
-    <div class="textarea">⾦秋穿上⽑⾐，漫步森林，在阳光下呼吸伸展，⾃在安逸的天⼈。也许是兰天名字的由来吧。</div>
-    <div>
-      <img :src="item.url" alt="" v-for="(item, i) in files" :key="i" @click="previewImage(files, item.url)" />
+    <div class="textarea">{{ data.content }}</div>
+    <div style="background: #FFFFFF; padding:0 30px; box-sizing: border-box;">
+      <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">
+    <div class="address" v-if="data.gpsDesc">
       <span class="addr-bg">
         <img src="./img/address.png" alt="">
-        <span>东湖生态旅游风景区听涛景区</span>
+        <span>{{ data.gpsDesc }}</span>
       </span>
     </div>
     <div class="comment">
@@ -67,29 +69,51 @@ export default {
   data() {
     return {
       files: [],
-      status: 1,
-
+      status: 0,
+      id: '',
+      data: {},
     }
   },
+  onLoad(o) {
+    this.$dict.load('villagerCircleTopic').then(()=>{
+      this.id = o.id
+      this.getDetail()
+      this.getComment()
+    })
+  },
   methods: {
-    previewImage() {},
+     previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
+    getDetail() {
+      this.$http.post(`/app/appvillagercircleinfo/queryDetailById?id=${this.id}`).then(res => {
+        // console.log(res);
+        if(res.code==0){
+          this.data = res.data
+        }
+      })
+    },
+    getComment() {
+      this.$http.post('/app/appvillagercirclecomment/list').then((res)=>{
+        console.log(res);
+      })
+    },
     toReject() {
-      uni.navigateTo({url: './Reject'})
+      uni.navigateTo({url: `./Reject?id=${data.id}`})
     },
     agree() {}
   },
   onShow() {
     document.title = "村民圈审核"
   },
-  onLoad() {},
-
-
 }
 </script>
 
 <style lang="scss" scoped>
 .detail {
-  
   .avatar-info {
     display: flex;
     padding: 0 32px;
@@ -124,6 +148,7 @@ export default {
     box-sizing: border-box;
     font-size: 32px;
     background: #FFFFFF;
+    padding-bottom: 40px;
   }
   .address {
     background: #FFFFFF;
@@ -185,6 +210,7 @@ export default {
         width: 100%;
         padding: 30px 0 0 0 ;
         color: #999999;
+        margin-bottom: 20px;
       }
     }
     .nopass {
@@ -195,6 +221,14 @@ export default {
       border-bottom: none;
     }
   }
+  .upLoadPic {
+    width: 220px;
+    height:220px;
+    margin-right: 8px;
+  }
+  .upLoadPic:nth-child(3n) {
+    margin-right: 0;
+  }
   .btn {
     display: flex;
     position: fixed;
@@ -215,6 +249,5 @@ export default {
       text-align: center;
     }
   }
-
 }
 </style>