diff --git a/src/apps/AppVillagersCircle/AppVillagersCircle.vue b/src/apps/AppVillagersCircle/AppVillagersCircle.vue
new file mode 100644
index 00000000..1afc8069
--- /dev/null
+++ b/src/apps/AppVillagersCircle/AppVillagersCircle.vue
@@ -0,0 +1,220 @@
+<template>
+  <div class="AppVillagersCircle">
+    <!-- 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 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 v-if="tabIndex == 1">
+      <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>
+    </div>
+
+    <!-- 已审核 -->
+    <div v-if="tabIndex == 2">
+      <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>审核通过</div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty description="暂无数据" class="emptyWrap"></AiEmpty>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AppVillagersCircle',
+  appName: '村民圈',
+  data () {
+    return {
+      tabs: ['全部', '待处理', '已处理'],
+      tabIndex: 0,
+      showType: false,
+      keyword: '',
+      typeList: [],
+
+    }
+  },
+  methods: {
+
+    tabClick(index) {
+      this.tabIndex = index
+    },
+
+    confirmTypeSelect(e) {
+      console.log(e);
+    },
+
+    toDetail() {
+      uni.navigateTo({url: './detail'})
+    }
+  },
+  onShow() {
+    document.title = '村民圈'
+  },
+  onLoad() {
+    // this.$dict.load('yesOrNo')
+  },
+
+}
+</script>
+
+<style lang="scss" scoped>
+.AppVillagersCircle {
+
+  .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 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>
diff --git a/src/apps/AppVillagersCircle/detail.vue b/src/apps/AppVillagersCircle/detail.vue
new file mode 100644
index 00000000..70771791
--- /dev/null
+++ b/src/apps/AppVillagersCircle/detail.vue
@@ -0,0 +1,16 @@
+<template>
+  <div class="detail">
+    <div></div>
+  </div>
+</template>
+
+<script>
+export default {
+
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/apps/AppVillagersCircle/img/tx@2x.png b/src/apps/AppVillagersCircle/img/tx@2x.png
new file mode 100644
index 00000000..61c42ebb
Binary files /dev/null and b/src/apps/AppVillagersCircle/img/tx@2x.png differ
diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue
index f17bede8..090353dd 100644
--- a/src/saas/AppConflictMediation/detail.vue
+++ b/src/saas/AppConflictMediation/detail.vue
@@ -55,9 +55,7 @@
           <div class="cardss">
             <div class="cardss-left">
               <div class="card-img">
-                <!-- <div v-html="transTxt(item.systemExplain)"/> -->
-                <!-- <AiOpenData v-if="item.openId" type="userName" :openid="item.openId" style="display: inline-block; font-size:12px;"/> -->
-                <div v-html="transAvatar(item.systemExplain)"/>
+                <AiOpenData v-if="item.openId" type="userName" :openid="transTxt(item.systemExplain)[1]" style="display: inline-block; font-size:12px;"/>
                 <img src="./components/1.png" class="avatarIcon" alt="" />
               </div>
             </div>
@@ -65,8 +63,8 @@
             <div class="cardss-right">
               <div class="cardsss-right-left">
                 <div class="cardssss-right-left-top">
-                  <!-- <span>{{ item.systemExplain }}</span> -->
-                  <div v-html="transTxt(item.systemExplain)"/>
+                  <AiOpenData type="userName" :openid="transTxt(item.systemExplain)[1]"/>
+                  <div v-html="transTxt(item.systemExplain)[2]"/>
                   <div style="color: #2ea222; font-size: 16px; margin-top: 5px">
                     {{ $dict.getLabel('clapDoStatus', item.doStatus) }}
                   </div>
@@ -136,16 +134,13 @@ export default {
   },
   methods: {
     transTxt(str){
-      return str.replace(/\$(.+)\$/g,'<AiOpenData type="userName" openid="$1"/>')
-    },
-    transAvatar(str){
-      return str.replace(/\$(.+)\$.+/g,'<AiOpenData type="userName" openid="$1"/>')
+      return str.split("$")
     },
+
     getDetail() {
       this.$http.post(`/app/appclapeventinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {
           this.data = res.data
-          console.log(this.data);
           this.showPage = true
         }
       })