From c27cca556c4a06b41f6641a42bb5e111bc0755b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Wed, 29 May 2024 17:45:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E6=9F=A5=E6=97=B6=E9=97=B4=E6=9C=89?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js                           | 18 ++++++++----------
 pages/index/index.wxml                         |  2 +-
 .../pages/safetyinspection/safetyinspection.js |  2 +-
 .../safetyinspection/safetyinspection.wxml     |  1 +
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 146a499..f402041 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -26,6 +26,7 @@ Page({
   // 事件处理函数
   onLoad: async function () {
      await this.getToken()
+     this.getIntelligentMessage()
     //  await this.getIntelligentMessage()
      await this.getStaffbasicinfo()
      this.setData({
@@ -44,11 +45,11 @@ Page({
       }
 },
  onShow(){
-  this.getIntelligentMessage()
+
   this.getSituation()
     this.getInspRecord()
 },
- onPullDownRefresh() {
+onPullDownRefresh() {
    this.setData({
      pageNo:1,
      tableData:[]
@@ -127,14 +128,16 @@ onScrollToLower(e){
               item.typeName = '房屋信息采集'
           } else if (item.msgType === 'resident_categiry') {
               item.typeName='数据更新提醒'
-          }
+          }else if (item.msgType === 'srap_confirm') {
+            item.typeName='服务更新提醒'
+        }
       })
-        
+console.log( res.data.list);
       this.setData({
         loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
         tableData: this.data.tableData.concat(res.data.list),
       })
-    
+      console.log(this.data.tableData)
       if (this.data.tableData.length == 0) {
             this.setData({
               loadMoreVisible: false,
@@ -143,11 +146,6 @@ onScrollToLower(e){
 
       }
 
-     
-  
-   
-        
-   
     }).catch(err=>{
         console.log(err);
         this.setData({
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 8afb9dd..2e4558e 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -144,7 +144,7 @@
         <text class="Information_test2">{{item.readFlag != '1'?'未读':'已读'}}</text>
         </view>
         <view class="Information_two">
-          <text class="Information_test3">{{item.typeName}}</text>
+          <text class="Information_test3">{{item.msgType}}</text>
           <text class="Information_test4">{{item.createdTime}}</text>
         </view>
       </view>
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
index 15dd7b2..fc37d66 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
@@ -328,7 +328,7 @@ handelClickSave(){
     })
     return false
   }
-  if(this.data.checkResultFlag == 0 && !this.data.currentDate){
+  if(this.data.checkResultFlag == 0 && !this.data.currentDateShow){
     wx.showToast({
       title: '请选择拟复查时间',
       icon:'none'
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
index 9d25236..30b61a4 100644
--- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
@@ -186,5 +186,6 @@
   max-date="{{ maxDate }}"
   bind:confirm="handelConfirmDate"
   bind:input="onInput"
+  bind:cancel="onCancel"
 />
 </van-popup>
\ No newline at end of file