Browse Source

复查时间有误

v4.3.1_xiaowang_bug
是小王呀\24601 1 year ago
parent
commit
c27cca556c
  1. 18
      pages/index/index.js
  2. 2
      pages/index/index.wxml
  3. 2
      subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
  4. 1
      subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml

18
pages/index/index.js

@ -26,6 +26,7 @@ Page({
// 事件处理函数 // 事件处理函数
onLoad: async function () { onLoad: async function () {
await this.getToken() await this.getToken()
this.getIntelligentMessage()
// await this.getIntelligentMessage() // await this.getIntelligentMessage()
await this.getStaffbasicinfo() await this.getStaffbasicinfo()
this.setData({ this.setData({
@ -44,11 +45,11 @@ Page({
} }
}, },
onShow(){ onShow(){
this.getIntelligentMessage()
this.getSituation() this.getSituation()
this.getInspRecord() this.getInspRecord()
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.setData({ this.setData({
pageNo:1, pageNo:1,
tableData:[] tableData:[]
@ -127,14 +128,16 @@ onScrollToLower(e){
item.typeName = '房屋信息采集' item.typeName = '房屋信息采集'
} else if (item.msgType === 'resident_categiry') { } else if (item.msgType === 'resident_categiry') {
item.typeName='数据更新提醒' item.typeName='数据更新提醒'
} }else if (item.msgType === 'srap_confirm') {
item.typeName='服务更新提醒'
}
}) })
console.log( res.data.list);
this.setData({ this.setData({
loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none', loadMoreType: res.data.list.length === this.data.pageSize ? 'more' : 'none',
tableData: this.data.tableData.concat(res.data.list), tableData: this.data.tableData.concat(res.data.list),
}) })
console.log(this.data.tableData)
if (this.data.tableData.length == 0) { if (this.data.tableData.length == 0) {
this.setData({ this.setData({
loadMoreVisible: false, loadMoreVisible: false,
@ -143,11 +146,6 @@ onScrollToLower(e){
} }
}).catch(err=>{ }).catch(err=>{
console.log(err); console.log(err);
this.setData({ this.setData({

2
pages/index/index.wxml

@ -144,7 +144,7 @@
<text class="Information_test2">{{item.readFlag != '1'?'未读':'已读'}}</text> <text class="Information_test2">{{item.readFlag != '1'?'未读':'已读'}}</text>
</view> </view>
<view class="Information_two"> <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> <text class="Information_test4">{{item.createdTime}}</text>
</view> </view>
</view> </view>

2
subpages/safetyinspection/pages/safetyinspection/safetyinspection.js

@ -328,7 +328,7 @@ handelClickSave(){
}) })
return false return false
} }
if(this.data.checkResultFlag == 0 && !this.data.currentDate){ if(this.data.checkResultFlag == 0 && !this.data.currentDateShow){
wx.showToast({ wx.showToast({
title: '请选择拟复查时间', title: '请选择拟复查时间',
icon:'none' icon:'none'

1
subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml

@ -186,5 +186,6 @@
max-date="{{ maxDate }}" max-date="{{ maxDate }}"
bind:confirm="handelConfirmDate" bind:confirm="handelConfirmDate"
bind:input="onInput" bind:input="onInput"
bind:cancel="onCancel"
/> />
</van-popup> </van-popup>
Loading…
Cancel
Save