diff --git a/src/mods/AppVillager/AppVillager.vue b/src/mods/AppVillager/AppVillager.vue
index 0c65479..589465b 100644
--- a/src/mods/AppVillager/AppVillager.vue
+++ b/src/mods/AppVillager/AppVillager.vue
@@ -4,7 +4,9 @@
 
     <div class="top">
       <div class="tabIndex012" v-if="tabIndex0 != 3">
-        <div class="tags" v-for="(items, i) in $dict.getDict('villagerCircleTopic')" :key="i">{{ items.dictName }}</div>
+        <div class="tags" @click="show = true">{{ TopicName }}</div>
+
+        <u-select v-model="show" :list="$dict.getDict('villagerCircleTopic')" value-name="dictValue" label-name="dictName" @confirm="conTopic"></u-select>
       </div>
 
       <u-tabs class="u-tabs2" :list="tabList" :is-scroll="false" :current="tabCurrent1" @change="changetabIndex" bg-color="#fff" active-color="#333;" inactive-color="#999" v-if="tabIndex0 == 3"></u-tabs>
@@ -16,20 +18,19 @@
 
     <div class="middle">
       <div class="datas" v-if="data.length">
-        <div class="card" v-for="(item, index) in 3" :key="index" @click="toDetail(item)">
+        <div class="card" v-for="(item, index) in data" :key="index" @click="toDetail(item)">
           <div class="cardTop">
-            <img src="../../static/workOnline/icon3@2x.png" alt="" />
+            <img :src="item.avatarUrl" alt="" />
 
             <div class="rightTop">
               <div class="leftStaus">
-                <span class="names">雷洋</span>
+                <span class="names">{{ item.createUserName }}</span>
 
-                <span class="titless">美丽庭院 | 2020-10-28 12</span>
+                <span class="titless">{{ $dict.getLabel('villagerCircleTopic', item.topic) }} | {{ item.createTime }}</span>
               </div>
 
-              <!-- :style="{ class: item.auditStatus == 0 ? 'status0' : item.auditStatus == 1 ? 'status1' : 'status2' }"  -->
               <div class="statusDele">
-                <div class="status status0" v-if="tabIndex0 == 3">审核中</div>
+                <div class="status status0" :class="item.auditStatus == 0 ? 'status0' : item.auditStatus == 1 ? 'status1' : 'status2'" v-if="tabIndex0 == 3">{{ $dict.getLabel('auditStatus', item.status) }}</div>
 
                 <div class="dels" @click.stop="toAdd(item)">编辑</div>
                 <div class="dels" @click.stop=";(delShow = true), (deleId = item.id)">删除</div>
@@ -38,17 +39,17 @@
             </div>
           </div>
 
-          <div class="tabCurrent0" v-if="tabIndex0 != 3 || tabCurrent1 == 0">
-            <div class="cardConts">⾦秋穿上⽑⾐，漫步森林，在阳光下呼吸伸展，⾃在安逸的天⼈。也许是兰天名字的由来吧。</div>
+          <div class="tabCurrent0" v-if="tabIndex0 != 3">
+            <div class="cardConts">{{ item.content }}</div>
 
-            <div class="cardImg">
-              <img src="../../static/workOnline/icon3@2x.png" alt="" v-for="(items, i) in 4" :key="i" />
+            <div class="cardImg" v-if="item.pictures">
+              <img :src="item.url" alt="" v-for="(items, i) in item.pictures" :key="i" @click.stop="previewImage(item.pictures, item.url)" />
             </div>
 
             <div class="cardBot">
               <div class="icons">
                 <u-icon name="map-fill"></u-icon>
-                <span>东湖生态旅游风景区听涛景区</span>
+                <span>{{ item.gpsDesc }}</span>
               </div>
 
               <div class="icones" v-if="tabIndex0 != 3">
@@ -79,7 +80,8 @@
           </div>
         </div>
       </div>
-      <AiEmpty description="暂无数据" class="emptyWrap"></AiEmpty>
+
+      <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
     </div>
 
     <!-- <AiFixedBtn v-if="tabIndex0 == 3 && tabCurrent1 == 1" @click.native="toAdd()">
@@ -92,6 +94,8 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   name: 'AppVillager',
   appName: '村民圈',
@@ -145,13 +149,16 @@ export default {
       indexTab2: 0,
       delShow: false,
       current: 1,
+      show: false,
+      TopicValue: '0',
+      TopicName: '美丽庭院',
     }
   },
-  computed: {},
+  computed: { ...mapState(['user']) },
   watch: {},
   onLoad() {
-    this.$dict.load('villagerCircleTopic').then(() => {
-      // this.getList()
+    this.$dict.load('villagerCircleTopic', 'auditStatus').then(() => {
+      this.getList()
     })
   },
   onShow() {
@@ -162,11 +169,14 @@ export default {
   methods: {
     getList() {
       this.$instance
-        .post('/app/appvillagerintegraldeclare/list', null, {
+        .post(this.tabIndex0 == 3 ? '/app/appvillagercircleinfo/list-xcxme' : '/app/appvillagercircleinfo/list-xcx', null, {
           params: {
             size: 6,
             current: this.current,
-            residentId: this.user.residentId,
+            topic: this.tabIndex0 != 3 ? this.TopicValue : '',
+            areaId: this.tabIndex0 != 3 ? this.user.areaId : '',
+            residentId: this.tabIndex0 != 3 ? this.user.residentId : '',
+            listType: this.tabIndex0 == 3 && this.tabCurrent1 == 0 ? '0' : this.tabIndex0 == 3 && this.tabCurrent1 == 1 ? '1' : this.tabIndex0 == 0 ? '0' : this.tabIndex0 == 1 ? '1' : this.tabIndex0 == 2 ? '2' : '',
           },
         })
         .then((res) => {
@@ -177,10 +187,10 @@ export default {
     },
 
     change(index) {
-      // this.data = []
+      this.data = []
       this.tabIndex0 = index
       this.current = 1
-      // this.getList()
+      this.getList()
     },
 
     changetabIndex(e) {
@@ -192,7 +202,7 @@ export default {
     },
 
     toDetail(item) {
-      this.$linkTo(`./detail?id=${item.id}`)
+      this.$linkTo(`./detail?id=${item.id}&avatarUrl=${item.avatarUrl}`)
     },
 
     toAdd(item) {
@@ -219,6 +229,18 @@ export default {
           this.$u.toast(e)
         })
     },
+
+    conTopic(e) {
+      this.TopicValue = e[0].value
+      this.TopicName = e[0].label
+    },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1
@@ -229,6 +251,8 @@ export default {
 
 <style scoped lang="scss">
 .Page {
+  height: 100%;
+  background: #fff;
   .active {
     color: #4181ff !important;
     border: 1px solid #4181ff !important;
diff --git a/src/mods/AppVillager/add.vue b/src/mods/AppVillager/add.vue
index 918ac1e..3831875 100644
--- a/src/mods/AppVillager/add.vue
+++ b/src/mods/AppVillager/add.vue
@@ -53,11 +53,14 @@ export default {
       },
       showStstus: false,
       flag: false,
+      id: '',
     }
   },
   computed: { ...mapState(['user']) },
-  onLoad() {
-    this.$dict.load('villagerCircleTopic').then(() => {})
+  onLoad(o) {
+    this.$dict.load('villagerCircleTopic').then(() => {
+      this.id = o.id
+    })
   },
   onShow() {},
   methods: {
@@ -115,6 +118,16 @@ export default {
       })
     },
 
+    getDetail() {
+      if (this.id) {
+        this.$instance.post(`/app/appvillagercircleinfo/queryDetailById?id=${this.id}`).then((res) => {
+          if (res.code == 0) {
+            // this.forms = res.data
+          }
+        })
+      }
+    },
+
     selectStatus(e) {
       this.forms.topic = e[0].label
       this.forms.topicValue = e[0].value
diff --git a/src/mods/AppVillager/detail.vue b/src/mods/AppVillager/detail.vue
index 4690376..4ae5002 100644
--- a/src/mods/AppVillager/detail.vue
+++ b/src/mods/AppVillager/detail.vue
@@ -1,36 +1,39 @@
 <template>
   <div class="Page">
-    <div class="top">
-      <div class="tops">未通过原因：请勿带情绪进行评论请勿带情绪进行评论请勿带情绪进行评论</div>
+    <div class="top" v-if="detail.status == 2">
+      <div class="tops">{{ detail.auditOpinion }}</div>
     </div>
 
     <div class="middle">
       <div class="cardTop">
-        <img src="../../static/workOnline/icon3@2x.png" alt="" />
+        <img :src="avatarUrl" alt="" />
 
         <div class="rightTop">
           <div class="leftStaus">
-            <span class="names">雷洋</span>
+            <span class="names">{{ detail.createUserName }}</span>
 
-            <span class="titless">美丽庭院 | 2020-10-28 12</span>
+            <span class="titless">{{ $dict.getLabel('villagerCircleTopic', detail.topic) }} | {{ detail.status }}</span>
           </div>
 
-          <!-- :style="{ class: item.auditStatus == 0 ? 'status0' : item.auditStatus == 1 ? 'status1' : 'status2' }"  -->
+          <div class="statusDele">
+            <div class="status status0" :class="detail.auditStatus == 0 ? 'status0' : detail.auditStatus == 1 ? 'status1' : 'status2'">{{ $dict.getLabel('auditStatus', detail.status) }}</div>
 
-          <div class="status status0">审核中</div>
+            <div class="dels" @click.stop=";(modalShow = true), (deleId = detail.id)">删除</div>
+            <!-- <img src="../../static/AppVillager/4.png" alt="" @click.stop="delShow = true" class="dels" /> -->
+          </div>
         </div>
       </div>
 
-      <div class="cardConts">⾦秋穿上⽑⾐，漫步森林，在阳光下呼吸伸展，⾃在安逸的天⼈。也许是兰天名字的由来吧。</div>
+      <div class="cardConts">{{ detail.content }}</div>
 
       <div class="cardImg">
-        <img src="../../static/workOnline/icon3@2x.png" alt="" v-for="(items, i) in 4" :key="i" />
+        <img :src="item.url" alt="" v-for="(items, i) in detail.pictures" :key="i" @click.stop="previewImage(detail.pictures, item.url)" />
       </div>
 
       <div class="cardBot">
         <div class="icons">
           <u-icon name="map-fill"></u-icon>
-          <span>东湖生态旅游风景区听涛景区</span>
+          <span>{{ detail.gpsDesc }}</span>
         </div>
 
         <div class="icones">
@@ -96,7 +99,8 @@ export default {
   props: {},
   data() {
     return {
-      id: '888',
+      id: '',
+      avatarUrl: '',
       data: {},
       poupShow: false,
       content: '',
@@ -110,8 +114,9 @@ export default {
   computed: { ...mapState(['user']) },
   watch: {},
   onLoad(o) {
-    this.$dict.load('atWillReportType').then(() => {
-      // this.id = o.id
+    this.$dict.load('villagerCircleTopic').then(() => {
+      this.id = o.id
+      this.avatarUrl = o.avatarUrl
       this.getDetail()
     })
   },
@@ -121,6 +126,15 @@ export default {
       this.$instance.post(`/app/appvillagercircleinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
           this.detail = res.data
+          this.getReplyList()
+        }
+      })
+    },
+
+    getReplyList() {
+      this.$instance.post(`/app/appvillagercirclecomment/list?id=${detail.id}&size=999`).then((res) => {
+        if (res.code == 0) {
+          this.replylist = res.data.records
         }
       })
     },
@@ -188,6 +202,13 @@ export default {
       this.deleId = '999'
       this.deleShow = true
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onShareAppMessage() {
     return {
@@ -243,18 +264,26 @@ export default {
           }
         }
 
-        .status {
-          font-size: 28px;
-          margin-right: 10px;
-        }
-        .status0 {
-          color: #42d784;
-        }
-        .status1 {
-          color: #ff4466;
-        }
-        .status2 {
-          color: #ff883c;
+        .statusDele {
+          display: flex;
+          align-items: center;
+          .status {
+            font-size: 28px;
+          }
+          .status0 {
+            color: #42d784;
+          }
+          .status1 {
+            color: #ff4466;
+          }
+          .status2 {
+            color: #ff883c;
+          }
+          .dels {
+            margin-left: 20px;
+            width: 68px;
+            height: 68px;
+          }
         }
       }
     }