diff --git a/images/morenews/clearnews.png b/images/morenews/clearnews.png
new file mode 100644
index 0000000..42301f0
Binary files /dev/null and b/images/morenews/clearnews.png differ
diff --git a/images/morenews/read.png b/images/morenews/read.png
new file mode 100644
index 0000000..df9fd65
Binary files /dev/null and b/images/morenews/read.png differ
diff --git a/pages/index/index.js b/pages/index/index.js
index 95fb7a2..cda29c3 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,11 +1,10 @@
 // index.js
 // 获取应用实例
 const app = getApp()
-import api, {getIntelligentMessage,getToken,getStaffbasicinfo,clearMessage,getSituation} from "../../utils/api"
+import api, {getIntelligentMessage,getToken,getStaffbasicinfo,clearMessage,getSituation,overView} from "../../utils/api"
 import config from "../../utils/config"
 Page({
   data: {
-    
     topDisplay:false,
     selectList:['全部消息','居民信息采集','房屋信息采集','社区满意度自查'],
     selectValue:0,
@@ -15,7 +14,11 @@ Page({
     lowerThreshold:'20',
     loadMoreVisible:false,
     loadMoreType: "none",
-    nodata:false
+    nodata:false,
+    emptyHouseNum:'',
+    catesNonIntResiNum:'',
+    readFlag:'0'
+
   },
   // 事件处理函数
   onLoad: async function () {
@@ -62,13 +65,20 @@ onScrollToLower(e){
         type:this.data.selectValue == 0? null :this.data.selectValue - 1,
         limit:this.data.pageSize,
         page:this.data.pageNo,
+        readFlag:this.data.readFlag
     }
     if(!parm.type) delete parm.type
     if(this.data.tableData.length !==0){
         return
     }
     getIntelligentMessage(parm).then(res=>{
-      
+        res.data.list.forEach(item => {
+          if (item.msgType === 'resident_base_info') {
+              item.category = '居民信息采集'
+          } else if (item.categoryName === 'community_house') {
+              item.category = '房屋信息采集'
+          } 
+      })
       // res.data.list = res.data.list.map(item => {
       //   if (item.createdByName && item.createdByName.length >= 3) {
       //     item.createdByName = item.createdByName.slice(1,3);
@@ -80,12 +90,17 @@ onScrollToLower(e){
         loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
         tableData: this.data.tableData.concat(res.data.list),
       })
+    
       if (this.data.tableData.length == 0) {
             this.setData({
               loadMoreVisible: false,
               nodata: true,
             })
+
       }
+
+     
+  
    
         
    
@@ -96,7 +111,11 @@ onScrollToLower(e){
             nodata: true,
           })
     })
-
+  },
+  moreNews(){
+    wx.navigateTo({
+      url: '../../subpages/morenews/pages/morenews/morenews',
+    })
   },
   getToken(){
        const parm = {
@@ -112,7 +131,6 @@ onScrollToLower(e){
      success: (res) => {
         parm.wxCode = res.code
         getToken(parm).then(res=>{
-            console.log(res);
             wx.hideLoading()
             if(res.code === 0){
                 wx.setStorageSync('token', res.data.token)
@@ -156,7 +174,6 @@ onScrollToLower(e){
     })
   },
   toDetail(e){
-    console.log(e);
    this.clearOneMessage(e.currentTarget.dataset.item.id)
     if(e.currentTarget.dataset.item.msgType == 'resident_base_info'){
       wx.navigateTo({
@@ -188,7 +205,6 @@ onScrollToLower(e){
         title: '加载中',
       })
     getSituation().then(res=>{
-      console.log('123',res)
         this.setData({
             collectedHouseCount:res.data.collectedHouseCount,
             collectedPopulationCount:res.data.collectedPopulationCount,
@@ -202,6 +218,17 @@ onScrollToLower(e){
         wx.hideLoading()
         console.log(err);
     })
+    overView().then(res=>{
+      console.log('123',res)
+        this.setData({
+              emptyHouseNum: res.data.emptyHouseNum,
+              catesNonIntResiNum: res.data.catesNonIntResiNum,
+        })
+         wx.hideLoading()
+    }).catch(err=>{
+        wx.hideLoading()
+        console.log(err);
+    })
 },  
 onAddResident(){
   wx.navigateTo({
diff --git a/pages/index/index.json b/pages/index/index.json
index 209ab28..7d390a9 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -1,7 +1,6 @@
 {
   "navigationStyle": "custom",
    "usingComponents": {
-   
       "load-more": "../../components/loadMore/loadMore",
       "no-data": "../../components/noData/nodata",
       "custom-tab-bar":"../../components/custom-tab-bar"
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 4f2ded6..64f812c 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -52,7 +52,7 @@
             <text lines="1" class="text_9">录入房屋</text>
           </view>
           <view class="text-group_5" bind:tap="noHouse">
-            <text lines="1" class="text_10">{{pendingHouseCount?pendingHouseCount:'--'}}</text>
+            <text lines="1" class="text_10">{{emptyHouseNum?emptyHouseNum:'--'}}</text>
             <text lines="1" class="text_11">未采集居民房屋</text>
           </view>
         </view>
@@ -62,7 +62,7 @@
             <text lines="1" class="text_13">录入居民</text>
           </view>
           <view class="text-group_7" bind:tap="onresno">
-            <text lines="1" class="text_14">{{pendingPopulationCount?pendingPopulationCount:'--'}}</text>
+            <text lines="1" class="text_14">{{catesNonIntResiNum?catesNonIntResiNum:'--'}}</text>
             <text lines="1" class="text_15">居民信息不完整</text>
           </view>
         </view>
@@ -71,20 +71,20 @@
     <view class="content">
       <view class="hd_news">
       <text class="news_remind">消息提醒</text>
-      <text class="more">更多</text>
+      <text class="more" bind:tap="moreNews">更多</text>
       </view>
       <view class="card">
       <view class="Information" wx:for="{{tableData}}" wx:key="index" data-item="{{item}}" data-index="{{index}}" bind:tap="toDetail">
         <view class="Information_one">
           <view class="one_one">
-            <image src="../../images/index/Topping.png" class="Information_image" wx:if="{{index === 0}}"></image>
+            <image src="../../images/index/Topping.png" class="Information_image" wx:if="{{item.msgType==resident_categiry}}"></image>
             <text class="Information_test">{{item.content}}</text>
           </view>
        
         <text class="Information_test2">{{item.readFlag != '1'?'未读':'已读'}}</text>
         </view>
         <view class="Information_two">
-          <text class="Information_test3">房屋信息采集</text>
+          <text class="Information_test3">{{item.category}}</text>
           <text class="Information_test4">{{item.createdTime}}</text>
         </view>
       </view>
diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js
index 46fe908..a710f59 100644
--- a/pages/resiAndHouse/resiAndHouse.js
+++ b/pages/resiAndHouse/resiAndHouse.js
@@ -374,6 +374,7 @@ Page({
         })
     },
     onClickJump(e) {
+      console.log(e)
         wx.navigateTo({
             url: `/subpages/house/pages/housePortrait/housePortrait?resiId=${e.currentTarget.dataset.resiid}`,
         })
@@ -457,6 +458,7 @@ Page({
                 loadMoreType: 'none'
             })
         }
+
     },
     getTableFwData: async function () {
         this.setData({
@@ -473,6 +475,7 @@ Page({
                     data.push({ ...item, value });
                     num = num + parseInt(item.num);
                 }
+       
             })
             const arr = [{ name: '房屋', num, value: '' }, ...data];
             this.setData({
diff --git a/subpages/morenews/pages/morenews/morenews.js b/subpages/morenews/pages/morenews/morenews.js
new file mode 100644
index 0000000..9d77d98
--- /dev/null
+++ b/subpages/morenews/pages/morenews/morenews.js
@@ -0,0 +1,173 @@
+const app = getApp()
+import api, {getIntelligentMessage,getToken,getStaffbasicinfo,clearMessage} from "../../../../utils/api"
+Page({
+  data: {
+    selectList:['全部消息','居民信息采集','房屋信息采集','社区满意度自查'],
+    selectValue:0,
+    pageSize:10,
+    pageNo:1,
+    tableData:[],
+    lowerThreshold:'5',
+    loadMoreVisible:false,
+    loadMoreType: "none",
+    nodata:false
+  },
+  // 事件处理函数
+  onLoad: async function () {
+    this.setData({
+        statusHeight: app.globalData.deviceInfo.statusHeight,
+        navigationHeight: app.globalData.deviceInfo.navigationHeight,
+        share:app.globalData.share
+      })
+     await this.getToken()
+    //  await this.getIntelligentMessage()
+     await this.getStaffbasicinfo()
+  },
+ onShow(){
+  
+  this.getIntelligentMessage()
+},
+ onPullDownRefresh() {
+   this.setData({
+     pageNo:1,
+     tableData:[]
+   })
+   this.getIntelligentMessage()
+   this.getStaffbasicinfo()
+},
+
+onScrollToLower(e){
+    if (this.data.loadMoreType === 'more') {
+        this.setData({
+          loadMoreVisible: true,
+        })
+        this.data.pageNo += 1
+        this.getIntelligentMessage()
+      }
+},
+  getIntelligentMessage(){
+    this.setData({
+        loadMoreVisible: true,
+        nodata: false,
+        loadMoreType: "more",
+      })
+    const parm = {
+        type:this.data.selectValue == 0? null :this.data.selectValue - 1,
+        limit:this.data.pageSize,
+        page:this.data.pageNo
+    }
+    if(!parm.type) delete parm.type
+    getIntelligentMessage(parm).then(res=>{
+      console.log(res)
+      res.data.list = res.data.list.map(item => {
+        if (item.createdByName && item.createdByName.length >= 3) {
+          item.createdByName = item.createdByName.slice(1,3);
+        }
+        return item;
+      });
+        
+      this.setData({
+        loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
+        tableData: this.data.tableData.concat(res.data.list),
+      })
+        if (this.data.tableData.length == 0) {
+            this.setData({
+              loadMoreVisible: false,
+              nodata: true
+            })
+          }
+    }).catch(err=>{
+        console.log(err);
+        this.setData({
+            loadMoreVisible: false,
+            nodata: true,
+          })
+    })
+  },
+  getToken(){
+       const parm = {
+        wxCode:'',
+        app:'gov',
+        client:'wxmp', 
+        appId:'wxaf87b420b87e2d79'   
+    }
+    wx.showLoading({
+      title: '加载中...',
+    })
+   wx.login({
+     success: (res) => {
+        parm.wxCode = res.code
+        getToken(parm).then(res=>{
+            console.log(res);
+            wx.hideLoading()
+            if(res.code === 0){
+                wx.setStorageSync('token', res.data.token)
+            }else{
+                wx.reLaunch({
+                  url: '/pages/login/login',
+                })
+            }
+        }).catch(err=>{
+            console.log(err);
+        })
+     },
+   })
+  },
+  getStaffbasicinfo(){
+    getStaffbasicinfo().then(res=>{
+        app.globalData.user = res.data
+    }).catch(err=>{
+        console.log(err);
+            wx.redirectTo({
+              url: '/pages/login/login',
+            })
+    })
+  },
+  handleChangeFilter(e){
+    this.setData({
+        selectValue:e.detail.value,
+        tableData:[],
+    })
+    console.log(this.data.selectValue)
+    this.getIntelligentMessage()
+  },
+  handelClickClear(){
+    clearMessage().then(res=>{
+        this.setData({
+            tableData:[],
+            pageNo:1
+        })
+        this.getIntelligentMessage()
+    }).catch(err=>{
+        console.log(err);
+    })
+  },
+  toDetail(e){
+    console.log(e);
+   this.clearOneMessage(e.currentTarget.dataset.item.id)
+    if(e.currentTarget.dataset.item.msgType == 'resident_base_info'){
+      wx.navigateTo({
+        url: `/subpages/addResi/pages/editResi/editResi?type=edit&resiId=${e.currentTarget.dataset.item.targetId}`,
+      })
+    }else{
+      wx.navigateTo({
+        url: `/subpages/addhouse/pages/addhouse/addhouse?type=edit&houseId=${e.currentTarget.dataset.item.targetId}`,
+      })
+    }
+    this.setData({
+      [`tableData[${e.currentTarget.dataset.index}].readFlag`]:'1'
+   })
+  },
+  clearOneMessage(id){
+    let parm= {
+      msgId:id
+    }
+    api.clearOneMessage(parm).then(res=>{
+      console.log(res);
+    }).catch(err=>{
+      console.log(err);
+    })
+  }
+})
+
+
diff --git a/subpages/morenews/pages/morenews/morenews.json b/subpages/morenews/pages/morenews/morenews.json
new file mode 100644
index 0000000..df0b266
--- /dev/null
+++ b/subpages/morenews/pages/morenews/morenews.json
@@ -0,0 +1,11 @@
+{
+  "usingComponents": {
+     "load-more": "../../components/loadMore/loadMore",
+     "no-data": "../../components/noData/nodata",
+     "custom-tab-bar":"../../components/custom-tab-bar"
+  },
+  "navigationBarTitleText": "消息",
+     "enablePullDownRefresh": true,
+    "backgroundColor": "#f8f8f8",
+    "backgroundTextStyle": "dark"
+}
diff --git a/subpages/morenews/pages/morenews/morenews.wxml b/subpages/morenews/pages/morenews/morenews.wxml
new file mode 100644
index 0000000..e78f098
--- /dev/null
+++ b/subpages/morenews/pages/morenews/morenews.wxml
@@ -0,0 +1,33 @@
+<official-account></official-account>
+
+<view class="select">
+    <view class="bgBule">
+    <picker mode="selector" style="display: inline-block;" range="{{selectList}}" value="{{selectValue}}" bindchange="handleChangeFilter" >
+    <view>{{selectValue == 1?'居民信息采集':selectValue == 2?'房屋信息采集':selectValue == 3?'社区满意度自查':'全部消息'}}</view>
+    </picker>
+
+    <image src="../../images/select.png" mode=""/></view>
+    <view class="delete" bind:tap="handelClickClear"> <image src="../../images/delete.png" mode="" /> 全部已读</view>
+</view>
+<view class="content">
+    <scroll-view class="scroll" scroll-y="{{true}}" lower-threshold="{{ lowerThreshold }}" bindscrolltolower="onScrollToLower">
+      <view class="box">
+        <view class="card" wx:for="{{tableData}}" wx:key="index" data-item="{{item}}" data-index="{{index}}" bind:tap="toDetail">
+            <view class="left">{{item.createdByName}}</view>
+            <view class="right">
+                <view class="top"><text class="title" >{{item.content}}</text>  <text class="{{item.readFlag != '1'?'':'gray'}}" style="font-size: 26rpx;">{{item.readFlag != '1'?'未读':'已读'}}</text></view>
+                <view class="bottom">
+                    <view class="flex_box">
+                        <view wx:if="{{item.msgType == '2'}}">测评打分:</view><view class="{{item.msgType == '2'?'blue':''}}" class="textOver">{{item.deptName || '--'}}</view><view wx:if="{{item.msgType == '2'}}">分</view>
+                    </view> 
+                    <text>{{item.createdTime}}</text>
+                </view>
+            </view>
+    </view>
+      </view>
+    <load-more loadVisible="{{loadMoreVisible}}" loadType="{{loadMoreType}}" ></load-more>
+    <no-data isShow="{{nodata}}" wx:if="{{nodata}}"></no-data>
+    </scroll-view>
+</view>
+<custom-tab-bar></custom-tab-bar>
+
diff --git a/subpages/morenews/pages/morenews/morenews.wxss b/subpages/morenews/pages/morenews/morenews.wxss
new file mode 100644
index 0000000..cb854f3
--- /dev/null
+++ b/subpages/morenews/pages/morenews/morenews.wxss
@@ -0,0 +1,161 @@
+page {
+  width: 100%;
+  min-height: 100vh;
+  overflow: hidden;
+  background-color: #f7f7f7;
+}
+
+.select{
+  width: 100%;
+  height: 90rpx;
+  background-color: #fff;
+  display: flex;
+  justify-content: space-between;
+  box-sizing: border-box;
+  padding: 0 40rpx;
+  align-items: center;
+}
+.select view {
+  display: flex;
+  align-items: center;
+  font-size: 30rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #3A80E7;
+}
+.select view image{
+  width: 16rpx;
+  height: 16rpx;
+  margin: 0 9rpx;
+}
+.select .delete {
+  font-size: 28rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #999999;
+}
+.select .delete image{
+  width: 30rpx;
+  height: 30rpx;
+}
+.content{
+  width: 100%;
+  padding:0 20rpx ;
+  margin-top: 20rpx;
+  box-sizing: border-box;
+}
+.content .scroll {
+  height: calc(100vh - 130rpx);
+}
+
+.content .scroll .box{
+  border-radius: 20rpx;
+  overflow-y: auto;
+}
+.content .card{
+  width: 100%;
+  background-color: #fff;
+  display: flex;
+  height: 168rpx;
+  padding: 34rpx 30rpx;
+  box-sizing: border-box;
+  overflow: hidden;
+  position: relative;
+}
+
+.content .card::before{
+  content: "";
+  position: absolute;
+  left: 30rpx;  /* 调整间距 */
+  right: 30rpx; /* 调整间距 */
+  bottom: 0;
+  border-bottom: 2rpx solid #EAEAEA;
+}
+
+.blue{
+  color:#5693EE;
+}
+.yellow{
+  color:#E2944D;
+}
+.cyan{
+  color: #2EB4F2 ;
+}
+.cyanBg{
+  background: rgba(56,189,253,0.1);
+}
+.yellowBg{
+  background: rgba(248,188,122,0.1);
+}
+.blueBg{
+  background: rgba(86,147,238,0.1);
+}
+.gray{
+  color: #999999 !important;
+}
+.content .card .left{
+  width: 100rpx;
+  height: 100rpx;
+  background: linear-gradient(0deg, #3E8DF8 0%, #68A8FD 100%);
+  border-radius: 20rpx;
+  color:#fff ;
+  font-size: 28rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  text-align: center;
+  line-height: 100rpx;
+}
+.content .card .right{
+  flex: 1;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  overflow: hidden;
+  margin-left: 24rpx;
+}
+.content .card .right .top{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.content .card .right .title{
+  font-size: 32rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: calc(100% - 80rpx);
+}
+
+
+.content .card  .right .bottom{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 28rpx;
+  font-family: PingFang SC;
+  color: #999999;
+}
+.textOver{
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 250rpx;
+}
+.content .card  .right .bottom .flex_box{
+  display: flex;
+  justify-content: left;
+}
+.bgBule{
+  background-color: #dfebfb;
+  border: 1px solid #3A80E7;
+  border-radius: 32rpx;
+  padding:10rpx 20rpx;
+  box-sizing: border-box;
+}
+.bgBule image{
+  margin-left: 50rpx !important;
+}
diff --git a/subpages/nohouse/pages/nohouse/nohouse.js b/subpages/nohouse/pages/nohouse/nohouse.js
index 5e3de79..8607d38 100644
--- a/subpages/nohouse/pages/nohouse/nohouse.js
+++ b/subpages/nohouse/pages/nohouse/nohouse.js
@@ -23,12 +23,12 @@ Page({
     showStreet:false,
     level:'',
 //查询参数
-lowerThreshold:8,//
+lowerThreshold:20,//
 pageNo: 1,//当前页码
 loadMoreType: "more",//more的出发加载更多数据
 waitList:[],//数据列表
 category:null,
-pageSize: 11,//每页的条数
+pageSize: 20,//每页的条数
 loadMoreVisible:false,//显示更多
 nodata:false,
 orgId:''
@@ -176,8 +176,6 @@ this.setData({
 });
 },
 onFinish(e) {
-  // 从e中获取selectedOptions的值
-  console.log(e.detail)
   
   const { selectedOptions, value } = e.detail;
   const level = selectedOptions[selectedOptions.length - 1].level
@@ -200,9 +198,6 @@ onFinish(e) {
         });
     }
 });
-  console.log(this.data.orgId)
-  console.log(level)
-  console.log(this.data.params)
 
   if(this.data.cascaderName.length>=this.data.maxLength){
     this.setData({
@@ -221,7 +216,6 @@ onScreen(){
 },
 //未采集信息获得api
 waitCollectHouseList(){
-  console.log(this.data.loadMoreType)
   if (this.data.loadMoreType === 'none') {
     // 如果已经没有更多数据可以加载，则直接返回
     return;
@@ -233,7 +227,6 @@ waitCollectHouseList(){
     orgType:this.data.level
   }
   api.waitCollectHouseList(parm).then(res => {
-   console.log(res)
     const { data, code } = res;
     if(code===0){
       const newList =data.list;
@@ -285,8 +278,8 @@ getTableData: async function () {
       let parm = {
           pageSize: this.data.pageSize,
           pageNo: this.data.pageNo,
-          orgId:this.data.params.orgId,
-          orgType:this.data.params.label
+          orgId:this.data.orgId,
+          orgType:this.data.level
       }
       // 从waitCollectHouseList取返回的值
       let {
@@ -323,5 +316,10 @@ getTableData: async function () {
       })
   }
 },
-
+// 跳转
+toDetail(e){
+  wx.navigateTo({
+    url: `/subpages/house/pages/housePortrait/housePortrait?resiId=${e.currentTarget.dataset.item.houseId}`,
+})
+}
 })
\ No newline at end of file
diff --git a/subpages/nohouse/pages/nohouse/nohouse.wxss b/subpages/nohouse/pages/nohouse/nohouse.wxss
index dd79bed..3300689 100644
--- a/subpages/nohouse/pages/nohouse/nohouse.wxss
+++ b/subpages/nohouse/pages/nohouse/nohouse.wxss
@@ -91,8 +91,7 @@ line-height: 46rpx;
 }
 .content{
   display: flex;
-  overflow: hidden;
-  height: 1000rpx;
+  height: auto;
   background: #FFFFFF;
   margin: 20rpx 20rpx 197rpx 20rpx;
   flex-direction: column;
@@ -103,7 +102,7 @@ line-height: 46rpx;
 }
 .form_item {
   width: 100%;
-  height: 1000rpx;
+  height: 1300rpx;
   display: flex;
   flex-wrap: wrap;
   flex-direction: row;
diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.js b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.js
index f4115ad..b753cd5 100644
--- a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.js
+++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.js
@@ -46,6 +46,7 @@ Page({
    orgId:'',
    resiCategory:'',
    resiCategories: [],
+   resultScopeType:'nonIntegrity'
     },
     
     
@@ -61,7 +62,6 @@ Page({
 // 进行树状懒加载
 getTopTreeData() {
   getTopTree().then(res => {   
-    console.log(res)
     // 用map获取子节点的值,并返回给arr,并让children: []为空
       const arr = res.data.children.map(item => {
      
@@ -136,7 +136,6 @@ getTreeFun(id, arr, data) {
   },
   onFinish(e) {
     // 从e中获取selectedOptions的值
-    console.log(e.detail)
     const { selectedOptions, value } = e.detail;
     const level = selectedOptions[selectedOptions.length - 1].level
     this.setData({
@@ -158,9 +157,6 @@ getTreeFun(id, arr, data) {
           });
       }
   });
-    console.log(this.data.orgId)
-    console.log(level)
-    console.log(this.data.params)
   
     if(this.data.cascaderName.length>=this.data.maxLength){
       this.setData({
@@ -194,7 +190,6 @@ async getDicts() {
           }),
         ];
         const result = await http.post("sys/dict/data/dictlist", { dictType: "attention_crowd" });
-         console.log(result)
           if (result.code === 0) {
             this.setData({
               "dicts.attentioncrowdList": result.data
@@ -204,8 +199,7 @@ async getDicts() {
           }
       } catch (error) {
         console.log("获取字典失败: ", error);
-      }
-      console.log()
+      }   
     },
 // 获取字典的索引显示到页面上
 onAttentionCrowdChange(event) {
@@ -219,7 +213,7 @@ onAttentionCrowdChange(event) {
     },
 //查询居民信息不完整列表
 WaitResidentsList(){
-  console.log(this.data.loadMoreType)
+
   if (this.data.loadMoreType === 'none') {
     // 如果已经没有更多数据可以加载，则直接返回
     return;
@@ -230,10 +224,11 @@ WaitResidentsList(){
     pageNo: this.data.pageNo,
     orgType:this.data.level,
     resiCategory:this.data.specialValue,
-    updateId:''
+    updateId:'',
+    resultScopeType:this.data.resultScopeType
   }
   api.nonIntResiList(parm).then(res => {
-   console.log(res.data)
+
     const { data, code } = res;
     if(code===0){
       const newList =data.list;
@@ -266,7 +261,7 @@ WaitResidentsList(){
 },
 // 当到达底部时,触发事件
 onScrollToLower(e) {
-  console.log(this.data.loadMoreType)
+
   if (this.data.loadMoreType === 'more') {
       this.setData({
         // 显示更多加载
@@ -275,11 +270,10 @@ onScrollToLower(e) {
       this.data.pageNo += 1
       this.getTableData()
   }
-  console.log(this.data.pageNo, this.data.loadMoreType)
+
 },
 // 向下分页下来
 getTableData: async function () {
-  console.log('方法执行了')
   try {
       this.setData({
           loadMoreVisible: true,
@@ -287,8 +281,13 @@ getTableData: async function () {
           loadMoreType: "more",
       })
       let parm = {
-          pageSize: this.data.pageSize,
-          pageNo: this.data.pageNo,
+        orgId:this.data.orgId,
+        pageSize: this.data.pageSize,
+        pageNo: this.data.pageNo,
+        orgType:this.data.level,
+        resiCategory:this.data.specialValue,
+        updateId:'',
+        resultScopeType:this.data.resultScopeType
           
       }
       // 从waitCollectHouseList取返回的值
@@ -334,5 +333,10 @@ onScreen(){
     loadMoreType:'more'
   })
   this.WaitResidentsList()
+},
+toResiDetail(e) {
+  wx.navigateTo({
+      url: `/subpages/searchResult/pages/resiInfo/resiInfo?resiId=${e.currentTarget.dataset.resiid}`,
+  })
 }
 })
\ No newline at end of file
diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml
index 6eb381b..d99f54b 100644
--- a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml
+++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml
@@ -25,9 +25,12 @@
         <view class="name">
           <text lines="1" class="text_1">{{item.resiName}}</text>
         </view>
-        <view class="lable" wx:for="{{item.resiCategories}}" wx:for-item="itemNR" wx:for-index="index" wx:key="index">
+        <view class="hd_lable"> 
+        <view class="lable"  wx:for="{{item.resiCategories}}" wx:for-item="itemNR" wx:for-index="index" wx:key="index" bind:tap="toResiDetail">
           <text class="text_2" >{{itemNR.categoryName}}</text>
         </view>
+        </view>
+       
       </view>
       <view class="information_1">
         <text lines="1" class="text_3">信息完整度：</text>
diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss
index 5f7b143..caaf22b 100644
--- a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss
+++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss
@@ -98,14 +98,14 @@ page{
 }
 .context{
   width: auto;
-  height:1000rpx ;
+  height:auto ;
   display: flex;
   flex-direction: column;  
   background: rgb(255, 255, 255);
   margin: 25rpx;
 }
 .scroll {
-  height: 1000rpx;
+  height: 1300rpx;
 }
 .card_top{
   display: flex;
@@ -136,34 +136,31 @@ text-align: center;
   white-space: nowrap;
   line-height: 40rpx;
   margin-right: 20rpx;
-  
 }
 .lable{
-  display: flex;
-  width: 120rpx;
+  display: block;
+  width:auto;
   height: 40rpx;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  margin-right: 20rpx;
   background: #f6f6f6;
+  margin-left: 20rpx;
+
+ 
 }
 .text_2{
+  display: table;
   width: 45rpx;
-  height: 23rpx;
+  height: 30rpx;
   overflow-wrap: break-word;
   color: rgba(153,153,153,1);
   font-size: 24rpx;
   font-family: PingFang-SC-Medium;
   font-weight: 500;
-  text-align: left;
+  text-align: center;
   white-space: nowrap;
   line-height: 42rpx;
-  margin-bottom: 10rpx;
   margin-right: 20rpx;
-   
-  margin-bottom: 20rpx;
-   
+  
+
 }
 .text_1 {
   width: 83rpx;
@@ -178,6 +175,12 @@ text-align: center;
   line-height: 41rpx;
   margin-top: 2rpx;
 }
+.hd_lable{
+  display: flex;
+  width: 300rpx;
+  height:50rpx;
+  overflow-x: scroll;
+}
 .text_2{
   width: 45rpx;
   height: 23rpx;
@@ -186,9 +189,11 @@ text-align: center;
   font-size: 24rpx;
   font-family: PingFang-SC-Medium;
   font-weight: 500;
-  text-align: left;
+  text-align: center;
   white-space: nowrap;
   line-height: 42rpx;
+  margin-left: 10rpx;
+  
  
 }
 .information_1 {
diff --git a/utils/api.js b/utils/api.js
index 409e39c..f64f956 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -75,7 +75,8 @@ module.exports = {
   getResiList,
   houseResidentChangeRecord,
   waitCollectHouseList,
-  nonIntResiList
+  nonIntResiList,
+  overView
 }
 
 // 获取公钥
@@ -396,5 +397,10 @@ function waitCollectHouseList(parm){
 function nonIntResiList(parm){
   return fly.get(`actual/base/residentIntegrity/resiCategoryStats/nonIntResiList`,parm)
 }
+//
+function overView(parm){
+  return fly.get(`actual/base/communityHouse/resiAndHouseCollect/overview`,parm)
+}
+