From 7eb1acb1298c4e34bb1d161a2b19b186b686b1c9 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, 3 Apr 2024 18:03:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=9F=BA=E6=9C=AC=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=EF=BC=8C=E6=9C=AA=E9=87=87=E9=9B=86=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=92=8C=E4=BA=BA=E9=98=B2=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 18 +- pages/index/index.js | 49 ++- pages/index/index.wxml | 18 +- pages/index/index.wxss | 17 +- pages/work/work.js | 5 + subpages/nohouse/pages/nohouse/nohouse.js | 81 +++++ subpages/nohouse/pages/nohouse/nohouse.json | 4 + subpages/nohouse/pages/nohouse/nohouse.wxml | 21 ++ subpages/nohouse/pages/nohouse/nohouse.wxss | 86 +++++ .../resnoinformation/resnoinformation.js | 66 ++++ .../resnoinformation/resnoinformation.json | 4 + .../resnoinformation/resnoinformation.wxml | 54 +++ .../resnoinformation/resnoinformation.wxss | 343 ++++++++++++++++++ 13 files changed, 743 insertions(+), 23 deletions(-) create mode 100644 subpages/nohouse/pages/nohouse/nohouse.js create mode 100644 subpages/nohouse/pages/nohouse/nohouse.json create mode 100644 subpages/nohouse/pages/nohouse/nohouse.wxml create mode 100644 subpages/nohouse/pages/nohouse/nohouse.wxss create mode 100644 subpages/resnoinformation/pages/resnoinformation/resnoinformation.js create mode 100644 subpages/resnoinformation/pages/resnoinformation/resnoinformation.json create mode 100644 subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml create mode 100644 subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss diff --git a/app.json b/app.json index bda8c20..709855f 100644 --- a/app.json +++ b/app.json @@ -22,7 +22,21 @@ "pages/addhouse/addhouse" ] }, - + { + "root": "subpages/nohouse", + "name": "nohouse", + "pages": [ + "pages/nohouse/nohouse" + ] + }, + { + "root": "subpages/resnoinformation", + "name": "resnoinformation", + "pages": [ + "pages/resnoinformation/resnoinformation" + ] + }, + { "root": "subpages/searchResult", @@ -155,6 +169,8 @@ "iconPath": "images/home/mine.png", "selectedIconPath": "images/home/mineSelected.png" } + + ] }, "permission": { diff --git a/pages/index/index.js b/pages/index/index.js index 6a84e8c..b47e3b6 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -6,6 +6,7 @@ import config from "../../utils/config" Page({ data: { + topDisplay:false, selectList:['全部消息','居民信息采集','房屋信息采集','社区满意度自查'], selectValue:0, pageSize:5, @@ -60,28 +61,33 @@ onScrollToLower(e){ const parm = { type:this.data.selectValue == 0? null :this.data.selectValue - 1, limit:this.data.pageSize, - page:this.data.pageNo + page:this.data.pageNo, } if(!parm.type) delete parm.type + if(this.data.tableData.length !==0){ + return + } getIntelligentMessage(parm).then(res=>{ - console.log('1234',parm) - res.data.list = res.data.list.map(item => { - if (item.createdByName && item.createdByName.length >= 3) { - item.createdByName = item.createdByName.slice(1,3); - } - return item; - }); + // 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) { + if (this.data.tableData.length == 0) { this.setData({ loadMoreVisible: false, - nodata: true + nodata: true, }) - } + } + + + }).catch(err=>{ console.log(err); this.setData({ @@ -89,6 +95,7 @@ onScrollToLower(e){ nodata: true, }) }) + }, getToken(){ const parm = { @@ -195,4 +202,24 @@ onScrollToLower(e){ console.log(err); }) }, +onAddResident(){ + wx.navigateTo({ + url: '../../subpages/addResi/pages/addResi/addResi', + }) +}, +onAddHouseLL(){ + wx.navigateTo({ + url: '../../subpages/addhouse/pages/addhouse/addhouse', + }) +}, +noHouse(){ + wx.navigateTo({ + url: '../../subpages/nohouse/pages/nohouse/nohouse', + }) +}, +onresno(){ + wx.navigateTo({ + url: '../../subpages/resnoinformation/pages/resnoinformation/resnoinformation', + }) +} }) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 75944a3..1456085 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -14,7 +14,7 @@ - + 房屋登记 登记房屋数据 @@ -23,7 +23,7 @@ - + 居民登记 登记居民数据 @@ -33,7 +33,7 @@ - + 诉求上报 登记居民诉求 @@ -51,7 +51,7 @@ {{collectedHouseCount?collectedHouseCount:'--'}} 录入房屋 - + {{pendingHouseCount?pendingHouseCount:'--'}} 未采集居民房屋 @@ -61,7 +61,7 @@ {{collectedPopulationCount?collectedPopulationCount:'--'}} 录入居民 - + {{pendingPopulationCount?pendingPopulationCount:'--'}} 居民信息不完整 @@ -75,8 +75,12 @@ - - {{item.content}} + + + + {{item.content}} + + {{item.readFlag != '1'?'未读':'已读'}} diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 81c1424..5528e8a 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -183,7 +183,7 @@ display: flex; flex-direction: column; background-color: #F7F7F7; - z-index: -9999; + /* z-index: -9999; */ } .header { display: flex; @@ -943,7 +943,7 @@ white-space: nowrap; } .Information_test2{ width: 60rpx; - height: 25rpx; + height: auto; font-family: PingFang SC; font-weight: 500; font-size: 26rpx; @@ -956,7 +956,7 @@ white-space: nowrap; } .Information_test3{ width: 169rpx; -height: 27rpx; +height: auto; font-family: PingFang SC; font-weight: 500; font-size: 28rpx; @@ -965,10 +965,19 @@ line-height: 40rpx; } .Information_test4{ width: 228rpx; - height: 20rpx; + height: auto; font-family: PingFang SC; font-weight: 500; font-size: 26rpx; color: #C1C1C1; line-height: 40rpx; } +.one_one{ + display: flex; + flex-direction: row; +} +.Information_image{ + width: 30rpx; + height: 30rpx; + margin-right: 10rpx; +} \ No newline at end of file diff --git a/pages/work/work.js b/pages/work/work.js index 90e215b..83d8f36 100644 --- a/pages/work/work.js +++ b/pages/work/work.js @@ -267,6 +267,11 @@ Page({ url: '/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck', }) }, + toDemandCheck(){ + wx.navigateTo({ + url: '/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck', + }) + }, toOCRCard(){ wx.navigateTo({ url: '/subpages/OCRCard/pages/index/index', diff --git a/subpages/nohouse/pages/nohouse/nohouse.js b/subpages/nohouse/pages/nohouse/nohouse.js new file mode 100644 index 0000000..2207e16 --- /dev/null +++ b/subpages/nohouse/pages/nohouse/nohouse.js @@ -0,0 +1,81 @@ +// subpages/nohouse/pages/nohouse/nohouse.js +Page({ + + /** + * 页面的初始数据 + */ + + visible: false, + data: { + selectedItem:'', + itemList : [ + { value: '1', label: '选项一' }, + { value: '2', label: '选项二' }, + { value: '3', label: '选项三' } + ], + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + handelShow(){ + this.setData({ + visible:true + }) + }, + bindPickerChange(){ + + } +}) \ No newline at end of file diff --git a/subpages/nohouse/pages/nohouse/nohouse.json b/subpages/nohouse/pages/nohouse/nohouse.json new file mode 100644 index 0000000..e38ce48 --- /dev/null +++ b/subpages/nohouse/pages/nohouse/nohouse.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "待采集居民房屋列表" +} \ No newline at end of file diff --git a/subpages/nohouse/pages/nohouse/nohouse.wxml b/subpages/nohouse/pages/nohouse/nohouse.wxml new file mode 100644 index 0000000..3d2ad9f --- /dev/null +++ b/subpages/nohouse/pages/nohouse/nohouse.wxml @@ -0,0 +1,21 @@ + + + + + + + {{serviceIndex >= 0 ? serviceOptions[serviceIndex].label : '按管辖范围'}} + + + + + + + 筛选 + + + + 123 + > + + \ No newline at end of file diff --git a/subpages/nohouse/pages/nohouse/nohouse.wxss b/subpages/nohouse/pages/nohouse/nohouse.wxss new file mode 100644 index 0000000..dd57321 --- /dev/null +++ b/subpages/nohouse/pages/nohouse/nohouse.wxss @@ -0,0 +1,86 @@ +/* subpages/nohouse/pages/nohouse/nohouse.wxss */ +page{ + width: 100%; + min-height: 100vh; + overflow-y: auto; + overflow-x: hidden; + background: #F7F7F7; +} +.header{ + display: flex; + flex-direction: row; + width: 100%; + height: 90rpx; + background-color: #FFFFFF; +} +.input{ + background-color: rgba(193,193,193,0.160000); + border-radius: 28rpx; + width: 559rpx; + height: 57rpx; + border: 1px solid rgba(219,219,219,1); + flex-direction: row; + display: flex; + margin: 17rpx 0 0 19rpx; +} +.gray{ + color: #C1C1C1; + padding-left: 30rpx; +} +.button{ + width: 120rpx; + height: 56rpx; + background: #3974F6; + border-radius: 28rpx; + margin: 17rpx 0 0 19rpx; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} +.button_text{ + font-family: PingFang SC; +font-weight: 500; +font-size: 28rpx; +color: #FFFFFF; +line-height: 46rpx; + +} +.content{ + display: flex; + overflow: hidden; + height: 1000rpx; + background: #FFFFFF; + margin: 20rpx 20rpx 197rpx 20rpx; + flex-direction: column; + border-radius: 30rpx; +} +.form{ + display: flex; + flex-direction: row; + justify-content: space-between; + padding: 30rpx; + border-bottom: 2rpx solid #EAEAEA; +} +.from_test1{ + display: flex; + overflow-wrap: break-word; + color: rgba(51,51,51,1); + font-size: 32rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 42rpx; +} +.from_test2{ + display: flex; + overflow-wrap: break-word; + color: rgba(51,51,51,1); + font-size: 32rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 42rpx; +} \ No newline at end of file diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.js b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.js new file mode 100644 index 0000000..66b749e --- /dev/null +++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.js @@ -0,0 +1,66 @@ +// subpages/resnoinformation/pages/resnoinformation/resnoinformation.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.json b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.json new file mode 100644 index 0000000..330a943 --- /dev/null +++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "居民信息不完整列表" +} \ No newline at end of file diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml new file mode 100644 index 0000000..a98fa6f --- /dev/null +++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml @@ -0,0 +1,54 @@ + + + + + + 海伦路街道 + + + + + + 按照居民分类 + + + + + 筛选 + + + + + + + + + + 国籍： + {{item.nationalityName || "--"}} + + + 民族： + {{item.nationName || '--'}} + + + + 电话： + {{item.mobile}} + + + 证件号 + ： + {{item.idNum}} + + + 地址： + {{item.agencyName || ''}} {{item.homeName || ''}} + + + 最新更新时间： + {{item.updatedTime|| '--'}} + + + + \ No newline at end of file diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss new file mode 100644 index 0000000..f4e3466 --- /dev/null +++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss @@ -0,0 +1,343 @@ +/* subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss */ +page{ + width: 100%; + min-height: 100vh; + overflow-y: auto; + overflow-x: hidden; + background: #F7F7F7; +} +.header{ + display: flex; + flex-direction: row; + + width: 100%; + height: 90rpx; + background-color: #FFFFFF; +} +.card{ + display: flex; + align-items: center; + justify-content: center; +} +.card_one{ + display: flex; + align-items: center; + justify-content: center; + background-color: rgba(57,116,246,0.160000); + border-radius: 28rpx; + width: 273rpx; + height: 57rpx; + border: 1px solid rgba(57,116,246,1); + flex-direction: row; + display: flex; + margin: 16rpx 0 0 20rpx; +} +.text1{ + overflow-wrap: break-word; + color: rgba(57,116,246,1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 52rpx; +} +.card_two{ + display: flex; + align-items: center; + justify-content: center; + background-color: #F5F5F5; + border-radius: 28rpx; + width: 273rpx; + height: 57rpx; + border: 1px solid #C1C1C1; + flex-direction: row; + display: flex; + margin: 16rpx 0 0 20rpx; +} +.text2{ + overflow-wrap: break-word; + color: rgba(193,193,193,1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 46rpx; +} +.card_three{ + background-color: rgba(57,116,246,1.000000); + border-radius: 28rpx; + height: 56rpx; + display: flex; + flex-direction: column; + width: 120rpx; + margin: 18rpx 22rpx 0 28rpx; + align-items: center; + justify-content: center; +} +.test3{ + overflow-wrap: break-word; + color: rgba(255,255,255,1); + font-size: 28rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 46rpx; + +} +.context{ + width: auto; + height: auto; + display: flex; + flex-direction: column; + background: white; + margin: 20rpx; + +} +. +.box_19 { + width: 533rpx; + height: 29rpx; + flex-direction: row; + display: flex; + justify-content: space-between; + margin: 27rpx 0 0 0; +} + +.text-wrapper_10 { + width: 146rpx; + height: 29rpx; + overflow-wrap: break-word; + font-size: 0rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text_21 { + width: 146rpx; + height: 29rpx; + overflow-wrap: break-word; + color: rgba(153, 153, 153, 1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text_22 { + width: 146rpx; + height: 29rpx; + overflow-wrap: break-word; + color: rgba(51, 51, 51, 1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text-wrapper_11 { + width: 145rpx; + height: 28rpx; + overflow-wrap: break-word; + font-size: 0rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text_23 { + width: 145rpx; + height: 28rpx; + overflow-wrap: break-word; + color: rgba(153, 153, 153, 1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text_24 { + width: 145rpx; + height: 28rpx; + overflow-wrap: break-word; + color: rgba(51, 51, 51, 1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text-wrapper_12 { + width: 263rpx; + height: 28rpx; + overflow-wrap: break-word; + font-size: 0rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; + margin: 19rpx 0 0 0; +} + +.text_25 { + width: 263rpx; + height: 28rpx; + overflow-wrap: break-word; + color: rgba(153, 153, 153, 1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text_26 { + width: 263rpx; + height: 28rpx; + overflow-wrap: break-word; + color: rgba(51, 51, 51, 1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text-wrapper_13 { + width: 415rpx; + height: 28rpx; + overflow-wrap: break-word; + font-size: 0rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; + margin: 20rpx 0 0 0; +} + +.text_27 { + width: 415rpx; + height: 28rpx; + overflow-wrap: break-word; + color: rgba(153, 153, 153, 1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text_28 { + width: 415rpx; + height: 28rpx; + overflow-wrap: break-word; + color: rgba(153, 153, 153, 1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text_29 { + width: 415rpx; + height: 28rpx; + overflow-wrap: break-word; + color: rgba(51, 51, 51, 1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text-wrapper_14 { + width: 639rpx; + height: 28rpx; + overflow-wrap: break-word; + font-size: 0rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; + margin: 20rpx 0 0 0; +} + +.text_30 { + width: 639rpx; + height: 28rpx; + overflow-wrap: break-word; + color: rgba(153, 153, 153, 1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text_31 { + width: 639rpx; + height: 28rpx; + overflow-wrap: break-word; + color: rgba(51, 51, 51, 1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} + +.text-wrapper_15 { + width: 537rpx; + height: 28rpx; + overflow-wrap: break-word; + font-size: 0rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; + margin: 20rpx 0 0 0; +} + +.text_32 { + width: 537rpx; + height: 28rpx; + overflow-wrap: break-word; + color: rgba(153, 153, 153, 1); + font-size: 30rpx; + font-family: PingFang-SC-Medium; + font-weight: 500; + text-align: left; + white-space: nowrap; + line-height: 40rpx; +} +.card_top{ + display: flex; + +}