diff --git a/src/apps/AppIntegralAudit/AppIntegralAudit.vue b/src/apps/AppIntegralAudit/AppIntegralAudit.vue
index ecc0d481..5f8a8d70 100644
--- a/src/apps/AppIntegralAudit/AppIntegralAudit.vue
+++ b/src/apps/AppIntegralAudit/AppIntegralAudit.vue
@@ -6,69 +6,31 @@
     </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="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" />
       </div>
 
-      <div class="card-list">
-        <div class="card-item" @click="toDetail">
-          <div class="card-title">本人于12月6日在中医院接种第二针…</div>
+      <div class="card-list"  v-if="integralList.length">
+        <div class="card-item" @click="toDetail(item)" v-for="(item,index) in integralList" :key="index">
+          <div class="card-title">{{ item.description }}</div>
           <div class="card-name">
-            <div class="name">新冠疫苗接种</div>
-            <div class="time">2021-12-06</div>
+            <div class="name">{{ $dict.getLabel('atWillReportType',item.applyIntegralType) }}</div>
+            <div class="time">{{ item.createTime }}</div>
           </div>
           <div class="card-type">
-            <div class="type">审核通过</div>
+            <div class="type">{{ $dict.getLabel('integralDeclareStatus',item.auditStatus) }}</div>
             <div class="num">＋20</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('atWillReportType')" 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">本人于12月6日在中医院接种第二针…</div>
-          <div class="card-name">
-            <div class="name">新冠疫苗接种</div>
-            <div class="time">2021-12-06</div>
-          </div>
-          <div class="card-type">
-            <div class="type">审核通过</div>
-            <div class="num">＋20</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">本人于12月6日在中医院接种第二针…</div>
-          <div class="card-name">
-            <div class="name">新冠疫苗接种</div>
-            <div class="time">2021-12-06</div>
-          </div>
-          <div class="card-type">
-            <div class="type">审核通过</div>
-            <div class="num">＋20</div>
-          </div>
-        </div>
-      </div>
-      <AiEmpty description="暂无数据" class="emptyWrap"></AiEmpty>
-    </div>
   </div>
 </template>
 
@@ -83,29 +45,60 @@ export default {
       showType: false,
       keyword: '',
       typeList: [],
-
+      current: 1,
+      integralList: [],
+      type: '',
+      applyIntegralType: '',  // 积分类型
     }
   },
+  created() {   
+    this.$dict.load('atWillReportType','integralDeclareStatus').then(()=>{
+      this.getList()
+    })
+  },
   methods: {
-
     tabClick(index) {
+      this.current=1
+      this.integralList=[]
       this.tabIndex = index
+      this.getList()
+    },
+
+    getList() {
+      this.$http.post('/app/appvillagerintegraldeclare/list',null,{
+        params: {
+          current: 1,
+          description : this.keyword,
+          auditStatus: this.tabIndex== 0 ? "" : this.tabIndex == 1 ? 0 : this.tabIndex == 2 ? "1|2" : ''
+        }
+      }).then(res => {
+        if(res.code==0){
+          this.integralList = res.data.records
+          this.$forceUpdate()
+        } 
+      })
+    },
+    search() {
+      this.current = 1,
+      this.getList()
     },
 
     confirmTypeSelect(e) {
       console.log(e);
+      this.type = e[0].label
+      this.applyIntegralType = e[0].value
+      this.current = 1,
+      this.integralList = []
+      this.getList()
     },
 
-    toDetail() {
-      uni.navigateTo({url: './detail'})
+    toDetail(item) {
+      uni.navigateTo({url: `./detail?id=${item.id}`})
     }
   },
   onShow() {
     document.title = '积分审核'
   },
-  onLoad() {
-    // this.$dict.load('yesOrNo')
-  },
 
 }
 </script>
@@ -155,7 +148,7 @@ export default {
     box-sizing: border-box;
 
     .integral-types {
-      width: 30%;
+      width: 45%;
     }
   }
 
diff --git a/src/apps/AppIntegralAudit/detail.vue b/src/apps/AppIntegralAudit/detail.vue
index f327b9c0..8e75a6c8 100644
--- a/src/apps/AppIntegralAudit/detail.vue
+++ b/src/apps/AppIntegralAudit/detail.vue
@@ -2,22 +2,22 @@
   <div class="detail">
     <div class="detail-list">
       <div class="detail-info">
-        <div class="detail-name">申请人:<span>李毅</span></div>
-        <div class="detail-type">新冠疫苗接种</div>
+        <!-- <AiOpenData  type="userName" :openid="form.corpId" style="display: inline-block;"/> -->
+        <div class="detail-name">申请人:<span>{{form.corpId}}</span></div>
+        <div class="detail-type">{{ $dict.getLabel('atWillReportType',form.applyIntegralType) }}</div>
       </div>
       <div class="detail-area">
-        <div class="time">2020-05-06 13:45</div>
+        <div class="time">{{ form.createTime }}</div>
         <div class="address">
           <img src="./img/address.png" alt="">
-          <span>新港镇三联村</span>
+          <span>{{ form.areaId }}</span>
         </div>
       </div>
       <div class="detail-text">
-        经村两委及村篮球队青年商讨决定，我村赴黎平参加百村杯篮球赛经费分两阶段分发，第一阶段为小组循环赛，第二阶段为淘汰赛。
-        第一阶段费用预计一万元整，其中包括队员球服两套，住宿、饮食
+        {{ form.description }}
       </div>
       <div class="detail-img">
-        <img :src="item.url" alt="" v-for="(item, i) in data.files" :key="i" @click="previewImage(data.files, item.url)" />
+        <img :src="item.url" alt="" v-for="(item, i) in form.applyFiles" :key="i" @click="previewImage(form.applyFiles, item.url)" />
       </div>
     </div>
 
@@ -115,6 +115,7 @@ export default {
   name: 'detail',
   data () {
     return {
+      id: '',
       data: {
         files: [],
       },
@@ -124,18 +125,56 @@ export default {
       isShowType: false,
       isShowOption: false,
       getList: [],
-      reason: ''
+      reason: '',
+      form: {
+        uploadUserName: '',
+        applyIntegralType: '',
+        areaId: "",
+        auditIntegral: null,
+        auditIntegralType: null,
+        auditOpinion: null,
+        auditRuleId: null,
+        auditRuleName: null,
+        auditStatus: "0",
+        auditTime: null,
+        auditUserId: null,
+        auditUserName: null,
+        corpId: '',
+        createTime: "2022-02-16 17:16:18",
+        createTimeEnd: null,
+        createTimeStart: null,
+        description: "是的1",
+        familyId: null,
+        familyName: null,
+        id: "dedaae6e992c4f4c9670a88a726939be",
+        residentId: "fba455ddf8e9494da93a533e8da57989",
+        residentName: "陶瑞武",
+        residentPhone: "15802784240",
+      }
+      
     }
   },
+  onLoad(o) {
+    this.$dict.load('atWillReportType','integralDeclareStatus').then(()=>{
+      this.id = o.id
+      this.getDetail()
+    })
+  },
   methods: {
-    previewImage() {}
+    previewImage() {},
+    getDetail() {
+      this.$http.post(`/app/appvillagerintegraldeclare/queryDetailById?id=${this.id}`).then(res => {
+        console.log(res);
+        if(res.code==0) {
+          this.form = res.data
+        }
+      })
+    }
   },
   onShow() {
     document.title = '积分审核'
   },
-  onLoad() {
-    // this.$dict.load('yesOrNo')
-  },
+  
 
 }
 </script>
@@ -192,6 +231,7 @@ export default {
     .detail-text {
       color: #333333;
       font-size: 30px;
+      margin-bottom: 30px;
     }
 
     .detail-img {
diff --git a/src/apps/AppVillagersCircle/AppVillagersCircle.vue b/src/apps/AppVillagersCircle/AppVillagersCircle.vue
index 1afc8069..cfc2c2e5 100644
--- a/src/apps/AppVillagersCircle/AppVillagersCircle.vue
+++ b/src/apps/AppVillagersCircle/AppVillagersCircle.vue
@@ -31,42 +31,6 @@
       <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>
 
diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue
index 78d1a2fd..dd9e54ec 100644
--- a/src/saas/AppConflictMediation/detail.vue
+++ b/src/saas/AppConflictMediation/detail.vue
@@ -139,7 +139,6 @@ export default {
   },
   methods: {
     transTxt(str){
-      console.log(str.split("$"));
       return str.split("$")
     },