ct

src/apps/AppIntegralAudit/AppIntegralAudit.vue

@@ -4,12 +4,11 @@
     <div class="tab-select">
       <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{item}}<span></span></div>
     </div>
-
     <!-- 列表 -->
     <div>
       <div class="search-box" v-if="tabIndex==0">
         <div class="integral-types" @click="showType = true">{{ type? type : '积分类型' }}<u-icon name="arrow-down"></u-icon></div>
-        <u-search placeholder="请输入关键字" v-model="keyword" :show-action="false" @search="search" />
+        <u-search placeholder="请输入关键字" v-model="keyword" :show-action="false" @search="search" @clear="getList()"/>
       </div>
 
       <div class="card-list"  v-if="integralList.length">
@@ -21,7 +20,7 @@
           </div>
           <div class="card-type">
             <div class="type" :style="{color: item.auditStatus==0? '#4181FF':item.auditStatus==1? '#07c160' : '#dd5347'}">{{ $dict.getLabel('integralDeclareStatus',item.auditStatus) }}</div>
-            <div class="num">＋20</div>
+            <div class="num" v-if="item.auditIntegral">{{ item.auditIntegral }}</div>
           </div>
         </div>
       </div>
@@ -54,11 +53,17 @@ export default {
   created() {   
     this.$dict.load('atWillReportType','integralDeclareStatus').then(()=>{
       this.getList()
+      uni.$on('update',()=>{
+        this.current = 1
+        this.getList()
+      })
     })
   },
   methods: {
     tabClick(index) {
       this.current=1
+      this.type = '',
+      this.applyIntegralType = ''
       this.integralList=[]
       this.tabIndex = index
       this.getList()
@@ -71,10 +76,10 @@ export default {
           size: 10,
           description : this.keyword,
           applyIntegralType: this.applyIntegralType,
-          auditStatus: this.tabIndex== 0 ? "" : this.tabIndex == 1 ? 0 : this.tabIndex == 2 ? "1|2" : ''
+          auditType: this.tabIndex== 0 ? "" : this.tabIndex == 1 ? 0 : 1
         }
       }).then(res => {
-        if(res.code==0){
+        if(res?.data){
           this.integralList = this.current > 1 ? [...this.integralList, ...res.data.records] : res.data.records
           this.$forceUpdate()
         } 
@@ -86,7 +91,6 @@ export default {
     },
 
     confirmTypeSelect(e) {
-      console.log(e);
       this.type = e[0].label
       this.applyIntegralType = e[0].value
       this.current = 1,
@@ -95,13 +99,12 @@ export default {
     },
 
     toDetail(item) {
-      uni.navigateTo({url: `./detail?id=${item.id}`})
+      uni.navigateTo({url: `./detail?id=${item.id}&nopass=${item.auditType}`})
     }
   },
   onShow() {
     document.title = '积分审核'
   },
-
 }
 </script>
 
@@ -180,16 +183,17 @@ export default {
       .card-name {
         margin-top: 30px;
         display: flex;
+        // justify-content: space-between;
         height: 50px;
         line-height: 50px;
         font-size: 28px;
         color: #999999;
 
         .name {
-          padding: 0 30px;
+          padding: 0 20px;
           background: #EEEEEE;
           border-radius: 24px;
-          margin-right: 40px;
+          margin-right: 24px;
         }
       }
 

src/apps/AppIntegralAudit/detail.vue

@@ -2,8 +2,7 @@
   <div class="detail">
     <div class="detail-list">
       <div class="detail-info">
-        <!-- <AiOpenData  type="userName" :openid="form.corpId" style="display: inline-block;"/> -->
+        <div class="detail-name">申请人:<span>{{form.residentName}}</span></div>
-        <div class="detail-name">申请人:<span>{{form.corpId}}</span></div>
         <div class="detail-type">{{ $dict.getLabel('atWillReportType',form.applyIntegralType) }}</div>
       </div>
       <div class="detail-area">
@@ -21,8 +20,8 @@
       </div>
     </div>
 
-    <!-- 审核通过、不通过 -->
+    <!-- 待审核 -->
-    <div class="integral" v-if="admin === 1">
+    <div class="integral" v-if="form.auditStatus == 0">
       <div class="result">
         <div>积分审核结果</div>
         <div class="options">
@@ -63,51 +62,55 @@
       <u-select :list="$dict.getDict('atWillReportType')" value-name="dictValue" label-name="dictName"
               v-model="isShowType" @confirm="integralType"></u-select>
 
-      <u-select :list="typeList" value-name="integral" label-name="ruleName"
+      <u-select :list="typeList" value-name="id" label-name="ruleName"
               v-model="isShowOption" @confirm="typeChange"></u-select>
     </div>
 
 
-    <!-- 只读通过、不通过 -->
+    <!-- 已审核 -->
     <div class="readOnly" v-else>
-      <div class="item">
-        <div>积分审核</div>
-        <div>通过</div>
-      </div>
       <!-- 通过 -->
-      <div v-if="nopass === 0">  
+      <div v-if="nopass == 1">  
+        <div class="item">
+          <div>积分审核</div>
+          <div>通过</div>
+        </div>
         <div class="item">
           <div>积分类别</div>
-          <div>乡村建设类</div>
+          <div>{{ form.auditIntegralType }}</div>
         </div>
         <div class="item">
           <div>积分事项</div>
-          <div>多字段显示</div>
+          <div>{{ form.auditRuleName }}</div>
         </div>
         <div class="item">
           <div>积分方式</div>
-          <div style="color: #E6736E;">+20</div>
+          <div style="color: #E6736E;">{{ form.auditIntegral }}</div>
         </div>
       </div>
       <!-- 不通过 -->
-      <div v-else>
+      <div v-if="nopass==2">
+        <div class="item">
+          <div>积分审核</div>
+          <div>不通过</div>
+        </div>
         <div class="item nopass">
           <div>不通过的理由</div>
-          <div class="textarea">我村赴黎平参加百村杯篮球赛经费分两阶段分发， 第一阶段为小组循环赛，第二阶段为淘汰赛。第一 其中包括队员球服两套，住宿、饮食</div>
+          <div class="textarea">{{ form.auditOpinion }}</div>
         </div>
       </div>
       <div class="item">
         <div>审核人</div>
-        <div>李维民</div>
+        <div>{{ form.auditUserName }}</div>
       </div>
       <div class="item last">
         <div>审核时间</div>
-        <div>2022-02-18 18:16:27</div>
+        <div>{{ form.auditTime }}</div>
       </div>
     </div>
 
     <div style="height: 56px"></div>
-    <div class="saveBtn" v-if="admin === 1" @click="submit">保存</div>
+    <div class="saveBtn" v-if="form.auditStatus == 0" @click="submit">保存</div>
   </div>
 </template>
 
@@ -118,7 +121,7 @@ export default {
     return {
       id: '',
       nopass: 1,
-      admin: 1,
+      auditType: 1,
       opts: 1,
       isShowType: false,
       isShowOption: false,
@@ -128,10 +131,9 @@ export default {
       data: {
         id: '',
         auditIntegralType: '',
-        // auditIntegralName: '',
         auditOpinion: '',   // 不通过理由
         ruleName: '',
-        integral: ''
+        integral: '',
       },
       typeList: [],
     }
@@ -139,11 +141,17 @@ export default {
   onLoad(o) {
     this.$dict.load('atWillReportType','integralDeclareStatus').then(()=>{
       this.id = o.id
+      this.nopass = o.nopass
       this.getDetail()
     })
   },
   methods: {
-    previewImage() {},
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
     getDetail() {
       this.$http.post(`/app/appvillagerintegraldeclare/queryDetailById?id=${this.id}`).then(res => {
         if(res.code==0) {
@@ -156,24 +164,26 @@ export default {
       if(!this.data.auditIntegralType) {
         return this.$u.toast('请选择积分类别')
       } else {
-       
         this.$http.post(`/app/appvillagerintegralrule/list?current=1&size=10&auditIntegralType=${this.data.auditIntegralType}`).then(res=>{
           if(res.code == 0){
             this.typeList = res.data.records
             this.isShowOption=true
-            // this.data.id = res.data.records.id
           }
         })
       }
     },
     typeChange(e) {
       console.log(e);
-      // this.data.id = e[0].id
       this.data.ruleName = e[0].label
+      this.data.id = e[0].value
       this.data.integral = e[0].value
+      this.typeList.map((item) => {
+        if(item.id == e[0].value) {
+          this.data.integral = item.integral
+        }
+      })
     },
     integralType(e) {
-      // this.data.auditIntegralName = e[0].label
       this.data.auditIntegralType = e[0].value
     },
     submit() {
@@ -194,13 +204,18 @@ export default {
         params: {
           id: this.id,
           pass: this.opts,
-          ...this.data
+          auditRuleId: this.data.id,
+          auditIntegralType: this.data.auditIntegralType,
+          auditIntegral: this.data.integral,
+          opinion: this.data.auditOpinion,
+          auditRuleName: this.data.ruleName
         }
-      }).then(res=>{
+      }).then(()=>{
-        console.log(res);
         this.$u.toast('保存成功')
-      }).catch(err=>{
+        uni.$emit('update')
-        console.log(err);
+        setTimeout(()=>{
+          uni.navigateBack()
+        },600)
       })
     }
   },

src/apps/AppVillagersCircle/AppVillagersCircle.vue

@@ -1,35 +1,8 @@
 <template>
   <div class="AppVillagersCircle">
-    <!-- tab栏 -->
+    <div class="banner" v-for="(item, index) in bannerList" :key="index" @click="linkTo(item.linkUrl)">
-    <div class="tab-select">
+      <img :src="item.img" alt="">
-      <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{item}}<span></span></div>
+      <p>{{item.title}}</p>
-    </div>
-
-    <!-- 全部 -->
-    <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>
-
-      <div class="card-list">
-        <div class="card-item" @click="toDetail">
-          <div class="card-title">阳光美丽，空气格外清新</div>
-          <div class="card-name">
-            <div class="name">发布信息</div>
-            <div class="name">美丽庭院</div>
-            <div class="time">2021-12-06</div>
-          </div>
-          <div class="card-type">
-            <div class="type">审核通过</div>
-          </div>
-        </div>
-      </div>
-      <AiEmpty description="暂无数据" class="emptyWrap"></AiEmpty>
-
-      <!-- $dict.getDict('yesOrNo') -->
-      <u-select v-model="showType" :list="typeList" label-name="dictName" value-name="dictValue"
-              @confirm="confirmTypeSelect"/>
     </div>
   </div>
 </template>
@@ -37,148 +10,59 @@
 <script>
 export default {
   name: 'AppVillagersCircle',
-  appName: '村民圈',
+  appName: '村民圈审核',
-  data () {
+  data() {
     return {
-      tabs: ['全部', '待处理', '已处理'],
+      bannerList: [
-      tabIndex: 0,
+        {
-      showType: false,
+          img: require('./img/blue.png'),
-      keyword: '',
+          title: '发布信息审核',
-      typeList: [],
+          linkUrl: './infoList'
-
+        },
-    }
+        {
-  },
+          img: require('./img/green.png'),
-  methods: {
+          title: '评论审核',
-
+          linkUrl: './commentList'
-    tabClick(index) {
+        }
-      this.tabIndex = index
+      ]
-    },
-
-    confirmTypeSelect(e) {
-      console.log(e);
-    },
-
-    toDetail() {
-      uni.navigateTo({url: './detail'})
     }
   },
   onShow() {
-    document.title = '村民圈'
+    document.title = '村民圈审核'
   },
-  onLoad() {
+  methods: {
-    // this.$dict.load('yesOrNo')
+    linkTo(url) {
+      uni.navigateTo({url})
+    }
   },
-
 }
 </script>
 
 <style lang="scss" scoped>
-.AppVillagersCircle {
+uni-page-body {
-
+  height: 100%!important;
-  .tab-select {
+  background-color: #fff!important;
-    width: 100%;
+}
-    height: 96px;
+.AppVillagersCircle{
-    line-height: 96px;
+  height: 100%;
-    background: #3975C6;
+  padding-top: 16px;
-    display: flex;
+  .banner{
-
+    padding: 32px 40px 0;
-    .item{
+    position: relative;
-      flex: 1;
+    img{
-      text-align: center;
+      width: 100%;
-      font-size: 28px;
+      height: 228px;
-      font-family: PingFangSC-Regular, PingFang SC;
-      color: #CDDCF0;
     }
-
+    p{
-    .active{
+      position: absolute;
-      font-family: PingFangSC-Medium, PingFang SC;
+      top: 120px;
-      font-weight: 500;
+      left: 88px;
-      position: relative;
+      font-size: 44px;
-      color: #fff;
+      font-family: PingFang-SC-Heavy, PingFang-SC;
-      span{
+      font-weight: 800;
-        width: 48px;
+      color: #FFF;
-        height: 4px;
+      line-height: 60px;
-        background: #FFF;
-        position: absolute;
-        bottom: 14px;
-        left: 50%;
-        margin-left: -24px;
-      }
-    }
-  }
-
-  .search-box {
-    display: flex;
-    width: 100%;
-    height: 112px;
-    line-height: 112px;
-    background-color: #FFFFFF;
-    padding: 0 32px;
-    box-sizing: border-box;
-
-    .integral-types {
-      width: 30%;
-    }
-  }
-
-  .card-list {
-    width: 100%;
-    padding: 0 32px;
-    box-sizing: border-box;
-
-    .card-item {
-      margin-top: 24px;
-      background-color: #FFFFFF;
-      box-shadow: 0px 0px 8px 8px rgba(0, 0, 0, 0.02);
-      border-radius: 16px;
-      padding: 30px 32px 20px 32px;
-
-      .card-title {
-        height: 60px;
-        line-height: 60px;
-        font-size: 36px;
-        color: #333333;
-        overflow:hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        -o-text-overflow:ellipsis;
-      }
-
-      .card-name {
-        margin-top: 30px;
-        display: flex;
-        height: 50px;
-        line-height: 50px;
-        font-size: 28px;
-        color: #999999;
-
-        .name {
-          padding: 0 30px;
-          background: #EEEEEE;
-          border-radius: 24px;
-          margin-right: 20px;
-        }
-      }
-
-      .card-type {
-        margin-top: 30px;
-        font-size: 28px;
-
-        .num {
-          font-size: 34px;
-          color: #E6736E;
-        }
-
-        .status0 {
-          color: #FF9B2B;
-        }
-
-        .status1 {
-          color: #4181FF;
-        }
-
-      }
     }
   }
 }
-</style>
+</style>

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,32 @@ export default {
   data() {
     return {
       value: '',
+      id: '',
+      pass: '',
     };
   },
   onShow() {
     document.title = '村民圈审核'
   },
-  onLoad(option) {
+  onLoad(o) {
-    // this.id = option.id
+    this.id = o.id
+    this.pass = o.pass
   },
   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()
+        })
+      })
     }
   },
 };

src/apps/AppVillagersCircle/commentDetail.vue

@@ -1,59 +1,60 @@
 <template>
-  <div class="detail">
+  <div class="commentDetail">
     <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">
+          {{ data.createUserName }}
+        </div>
         <div class="time">
-          <span>美丽庭院</span>
+          <span>{{ $dict.getLabel('villagerCircleTopic',data.topic) }}</span>
-          <span>2020-10-28 12:30</span>
+          <span>{{ data.createTime }}</span>
         </div>
       </div>
     </div>
-    <div class="textarea">⾦秋穿上⽑⾐，漫步森林，在阳光下呼吸伸展，⾃在安逸的天⼈。也许是兰天名字的由来吧。</div>
+    <div class="textarea">{{ data.content }}</div>
-    <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 files" :key="i" @click="previewImage(files, item.url)" />
+      <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">
+    <div class="comment" v-if="data.comments">
       <div class="comment-list">
         <div class="title">评论:</div>
         <div class="item">
-          <span class="avatar">桃白白:</span>为什么不带上我呢！为什么不带上我呢！为什么不带上我呢！为什么不带上我呢！为什么不带上我呢！为什么不带上我呢！
+          <span class="avatar">桃白白:</span>为什么不带上我
         </div>
       </div>
     </div>
 
-    <div class="readOnly" v-if="status==1">
+    <div class="readOnly" v-if="data.status != 0">
       <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 == 0">
       <div class="reject" @click="toReject">驳回发布</div>
       <div class="agree" @click="agree">同意发布</div>
     </div>
@@ -63,33 +64,62 @@
 
 <script>
 export default {
-  name: 'detail',
+  name: 'commentDetail',
   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) {
-    toReject() {
+      uni.previewImage({
-      uni.navigateTo({url: './Reject'})
+        urls: images.map(v => v.url),
+        current: img
+      })
     },
-    agree() {}
+    getDetail() {
+      this.$http.post(`/app/appvillagercircleinfo/queryDetailById?id=${this.id}`).then(res => {
+        if(res.code==0){
+          this.data = res.data
+        }
+      })
+    },
+    toReject() {
+      uni.navigateTo({url: `./Reject?id=${this.data.id}&pass=0`})
+    },
+    agree() {
+      this.$http.post('/app/appvillagercircleinfo/examine',null, {
+        params: {
+          id: this.id,
+          pass: 1,
+        }
+      }).then(() => {
+        this.$u.toast('发布成功')
+        uni.$emit('update')
+        setTimeout(()=>{
+          uni.navigateBack()
+        })
+      })
+    }
   },
   onShow() {
-    document.title = "村民圈审核"
+    document.title = "评论审核"
   },
-  onLoad() {},
-
-
 }
 </script>
 
 <style lang="scss" scoped>
-.detail {
+.commentDetail {
-  
   .avatar-info {
     display: flex;
     padding: 0 32px;
@@ -124,6 +154,7 @@ export default {
     box-sizing: border-box;
     font-size: 32px;
     background: #FFFFFF;
+    padding-bottom: 40px;
   }
   .address {
     background: #FFFFFF;
@@ -185,6 +216,7 @@ export default {
         width: 100%;
         padding: 30px 0 0 0 ;
         color: #999999;
+        margin-bottom: 20px;
       }
     }
     .nopass {
@@ -195,6 +227,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 +255,5 @@ export default {
       text-align: center;
     }
   }
-
 }
 </style>

src/apps/AppVillagersCircle/commentList.vue

@@ -0,0 +1,209 @@
+<template>
+  <div class="commentList">
+    <!-- tab栏 -->
+    <div class="tab-select">
+      <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{item}}<span></span></div>
+    </div>
+    <!-- 全部 -->
+    <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>
+      </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">{{$dict.getLabel('villagerCircleTopic',item.topic)}}</div>
+            <div class="time">{{ item.createTime }}</div>
+          </div>
+          <div class="card-type">
+            <div class="type">{{$dict.getLabel('auditStatus',item.auditType)}}</div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+
+      <u-select v-model="showType" :list="$dict.getDict('villagerCircleTopic')" label-name="dictName" value-name="dictValue"
+              @confirm="confirmTypeSelect"/>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'commentList',
+  data () {
+    return {
+      tabs: ['全部', '待处理', '已处理'],
+      tabIndex: '',
+      showType: false,
+      content: '',
+      typeList: [],
+      villagerList: [],
+      current: 1,
+      topic: '',
+      topicType: '',
+    }
+  },
+  onLoad() {
+    this.$dict.load('villagerCircleTopic','auditStatus').then(()=>{
+      this.current = 1
+      this.getList()
+    })
+  },
+  methods: {
+    tabClick(index) {
+      this.tabIndex = index
+      this.current = 1,
+      this.topic = '',
+      this.topicType = '',
+      this.villagerList = [],
+      this.getList()
+    },
+    getList() {
+      this.$http.post('app/appvillagercircleinfo/list',null,{
+        params: {
+          current: 1,
+          size: 10,
+          auditType: this.tabIndex == 0 ? '': this.tabIndex == 1 ? 0 : 1,
+          topic: this.topic,
+          content: this.content
+        }
+      }).then(res=>{
+        if(res?.data) {
+          this.villagerList = this.current >1 ? [...this.villagerList,...res.data.records] : res.data.records
+        }
+      })
+    },
+
+    confirmTypeSelect(e) {
+      this.topic = e[0].value,
+      this.topicType = e[0].label
+      this.current = 1,
+      this.villagerList = []
+      this.getList()
+    },
+
+    toDetail(item) {
+      uni.navigateTo({url: `./infoDetail?id=${item.id}`})
+    }
+  },
+  onShow() {
+    document.title = '发布信息审核'
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.commentList {
+
+  .tab-select {
+    width: 100%;
+    height: 96px;
+    line-height: 96px;
+    background: #3975C6;
+    display: flex;
+
+    .item{
+      flex: 1;
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #CDDCF0;
+    }
+
+    .active{
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      position: relative;
+      color: #fff;
+      span{
+        width: 48px;
+        height: 4px;
+        background: #FFF;
+        position: absolute;
+        bottom: 14px;
+        left: 50%;
+        margin-left: -24px;
+      }
+    }
+  }
+
+  .search-box {
+    display: flex;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background-color: #FFFFFF;
+    padding: 0 32px;
+    box-sizing: border-box;
+
+    .integral-types {
+      width: 30%;
+    }
+  }
+
+  .card-list {
+    width: 100%;
+    padding: 0 32px;
+    box-sizing: border-box;
+
+    .card-item {
+      margin-top: 24px;
+      background-color: #FFFFFF;
+      box-shadow: 0px 0px 8px 8px rgba(0, 0, 0, 0.02);
+      border-radius: 16px;
+      padding: 30px 32px 20px 32px;
+
+      .card-title {
+        height: 60px;
+        line-height: 60px;
+        font-size: 36px;
+        color: #333333;
+        overflow:hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        -o-text-overflow:ellipsis;
+      }
+
+      .card-name {
+        margin-top: 30px;
+        display: flex;
+        height: 50px;
+        line-height: 50px;
+        font-size: 28px;
+        color: #999999;
+
+        .name {
+          padding: 0 15px;
+          background: #EEEEEE;
+          border-radius: 24px;
+          margin-right: 20px;
+        }
+      }
+
+      .card-type {
+        margin-top: 30px;
+        font-size: 28px;
+
+        .num {
+          font-size: 34px;
+          color: #E6736E;
+        }
+
+        .status0 {
+          color: #FF9B2B;
+        }
+
+        .status1 {
+          color: #4181FF;
+        }
+
+      }
+    }
+  }
+}
+</style>

src/apps/AppVillagersCircle/infoDetail.vue

@@ -0,0 +1,258 @@
+<template>
+  <div class="infoDetail">
+    <div class="avatar-info">
+      <div class="avatar-img">
+        <img src="./img/tx@2x.png" alt="">
+      </div>
+      <div class="avatar-title">
+        <div class="name">
+          {{ data.createUserName }}
+        </div>
+        <div class="time">
+          <span>{{ $dict.getLabel('villagerCircleTopic',data.topic) }}</span>
+          <span>{{ data.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>
+    <div class="address" v-if="data.gpsDesc">
+      <span class="addr-bg">
+        <img src="./img/address.png" alt="">
+        <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>
+        <div>不通过</div>
+      </div>
+      <div class="item nopass">
+        <div>不通过理由</div>
+        <div class="textarea">{{ data.auditOpinion }}</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 style="height: 56px;"></div>
+
+    <div class="btn" v-if="data.status == 0">
+      <div class="reject" @click="toReject">驳回发布</div>
+      <div class="agree" @click="agree">同意发布</div>
+    </div>
+    
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'infoDetail',
+  data() {
+    return {
+      files: [],
+      status: 0,
+      id: '',
+      data: {},
+    }
+  },
+  onLoad(o) {
+    this.$dict.load('villagerCircleTopic').then(()=>{
+      this.id = o.id
+      this.getDetail()
+      // this.getComment()
+    })
+  },
+  methods: {
+     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 => {
+        if(res.code==0){
+          this.data = res.data
+        }
+      })
+    },
+    toReject() {
+      uni.navigateTo({url: `./Reject?id=${this.data.id}&pass=0`})
+    },
+    agree() {
+      this.$http.post('/app/appvillagercircleinfo/examine',null, {
+        params: {
+          id: this.id,
+          pass: 1,
+        }
+      }).then(() => {
+        this.$u.toast('发布成功')
+        uni.$emit('update')
+        setTimeout(()=>{
+          uni.navigateBack()
+        })
+      })
+    }
+  },
+  onShow() {
+    document.title = "发布信息审核"
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.infoDetail {
+  .avatar-info {
+    display: flex;
+    padding: 0 32px;
+    box-sizing: border-box;
+    background: #FFFFFF;
+    .avatar-img {
+      margin-right: 20px;
+      img {
+        margin-top: 30px;
+        width: 88px;
+        height: 88px;
+        border-radius: 50%;
+      }
+    }
+    .avatar-title {
+      padding: 30px 32px;
+      box-sizing: border-box;
+      .name {
+        font-size: 32px;
+        color: #333333;
+        font-weight: 600;
+        margin-bottom: 12px;
+      }
+      .time {
+        font-size: 26px;
+        color: #999999;
+      }
+    }
+  }
+  .textarea {
+    padding: 0 32px;
+    box-sizing: border-box;
+    font-size: 32px;
+    background: #FFFFFF;
+    padding-bottom: 40px;
+  }
+  .address {
+    background: #FFFFFF;
+    padding: 20px 32px;
+    box-sizing: border-box;
+
+    .addr-bg {
+      display: inline-block;
+      border-radius: 28px;
+      padding: 6px 20px;
+      background: #EFF1F3;
+      
+      img {
+        padding-top: 5px;
+        width: 32px;
+        height: 32px;
+      }
+
+      span {
+        vertical-align: top;
+      }
+    }
+    
+    
+    
+  }
+  .comment {
+    padding: 0 32px 30px 32px;
+    box-sizing: border-box;
+    background: #FFFFFF;
+
+    .comment-list {
+      padding: 20px 30px;
+      background: #F7F8F9;
+      border-radius: 16px;
+      .title {
+        color: #333333;
+        font-weight: 600;
+      }
+      .item {
+        font-size: 28px;
+        .avatar {
+          color: #576a91;
+        }
+      }
+    }
+  }
+  .readOnly {
+    font-size: 32px;
+    .item {
+      display: flex;
+      justify-content: space-between;
+      background: #FFFFFF;
+      border-bottom: 1px solid #D8DDE6;
+      padding: 30px 30px;
+      box-sizing: border-box;
+
+      .textarea {
+        width: 100%;
+        padding: 30px 0 0 0 ;
+        color: #999999;
+        margin-bottom: 20px;
+      }
+    }
+    .nopass {
+      flex-direction: column;
+      border-bottom: 1px solid #D8DDE6;
+    }
+    .last {
+      border-bottom: none;
+    }
+  }
+  .upLoadPic {
+    width: 220px;
+    height:220px;
+    margin-right: 8px;
+  }
+  .upLoadPic:nth-child(3n) {
+    margin-right: 0;
+  }
+  .btn {
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    .reject {
+      width: 50%;
+      color: #FF4466;
+      background: #FFFFFF;
+      text-align: center;
+    }
+    .agree {
+      width: 50%;
+      color: #FFFFFF;
+      background: #3975C6;
+      text-align: center;
+    }
+  }
+}
+</style>

src/apps/AppVillagersCircle/infoList.vue

@@ -0,0 +1,210 @@
+<template>
+  <div class="infoList">
+    <!-- tab栏 -->
+    <div class="tab-select">
+      <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{item}}<span></span></div>
+    </div>
+
+    <!-- 全部 -->
+    <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>
+      </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">{{$dict.getLabel('villagerCircleTopic',item.topic)}}</div>
+            <div class="time">{{ item.createTime }}</div>
+          </div>
+          <div class="card-type">
+            <div class="type" :style="{color: item.status==0? '#4181FF':item.status==1? '#07c160' : '#dd5347'}">{{$dict.getLabel('auditStatus',item.status)}}</div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+
+      <u-select v-model="showType" :list="$dict.getDict('villagerCircleTopic')" label-name="dictName" value-name="dictValue"
+              @confirm="confirmTypeSelect"/>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'infoList',
+  data () {
+    return {
+      tabs: ['全部', '待处理', '已处理'],
+      tabIndex: '',
+      showType: false,
+      content: '',
+      typeList: [],
+      villagerList: [],
+      current: 1,
+      topic: '',
+      topicType: '',
+    }
+  },
+  onLoad() {
+    this.$dict.load('villagerCircleTopic','auditStatus').then(()=>{
+      this.current = 1
+      this.getList()
+    })
+  },
+  methods: {
+    tabClick(index) {
+      this.tabIndex = index
+      this.current = 1,
+      this.topic = '',
+      this.topicType = '',
+      this.villagerList = [],
+      this.getList()
+    },
+    getList() {
+      this.$http.post('app/appvillagercircleinfo/list',null,{
+        params: {
+          current: 1,
+          size: 10,
+          auditStatus: this.tabIndex == 0 ? '': this.tabIndex == 1 ? 0 : 1,
+          topic: this.topic,
+          content: this.content
+        }
+      }).then(res=>{
+        if(res?.data) {
+          this.villagerList = this.current >1 ? [...this.villagerList,...res.data.records] : res.data.records
+        }
+      })
+    },
+
+    confirmTypeSelect(e) {
+      this.topic = e[0].value,
+      this.topicType = e[0].label
+      this.current = 1,
+      this.villagerList = []
+      this.getList()
+    },
+
+    toDetail(item) {
+      uni.navigateTo({url: `./infoDetail?id=${item.id}`})
+    }
+  },
+  onShow() {
+    document.title = '发布信息审核'
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.infoList {
+
+  .tab-select {
+    width: 100%;
+    height: 96px;
+    line-height: 96px;
+    background: #3975C6;
+    display: flex;
+
+    .item{
+      flex: 1;
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #CDDCF0;
+    }
+
+    .active{
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      position: relative;
+      color: #fff;
+      span{
+        width: 48px;
+        height: 4px;
+        background: #FFF;
+        position: absolute;
+        bottom: 14px;
+        left: 50%;
+        margin-left: -24px;
+      }
+    }
+  }
+
+  .search-box {
+    display: flex;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background-color: #FFFFFF;
+    padding: 0 32px;
+    box-sizing: border-box;
+
+    .integral-types {
+      width: 30%;
+    }
+  }
+
+  .card-list {
+    width: 100%;
+    padding: 0 32px;
+    box-sizing: border-box;
+
+    .card-item {
+      margin-top: 24px;
+      background-color: #FFFFFF;
+      box-shadow: 0px 0px 8px 8px rgba(0, 0, 0, 0.02);
+      border-radius: 16px;
+      padding: 30px 32px 20px 32px;
+
+      .card-title {
+        height: 60px;
+        line-height: 60px;
+        font-size: 36px;
+        color: #333333;
+        overflow:hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        -o-text-overflow:ellipsis;
+      }
+
+      .card-name {
+        margin-top: 30px;
+        display: flex;
+        height: 50px;
+        line-height: 50px;
+        font-size: 28px;
+        color: #999999;
+
+        .name {
+          padding: 0 15px;
+          background: #EEEEEE;
+          border-radius: 24px;
+          margin-right: 20px;
+        }
+      }
+
+      .card-type {
+        margin-top: 30px;
+        font-size: 28px;
+
+        .num {
+          font-size: 34px;
+          color: #E6736E;
+        }
+
+        .status0 {
+          color: #FF9B2B;
+        }
+
+        .status1 {
+          color: #4181FF;
+        }
+
+      }
+    }
+  }
+}
+</style>