diff --git a/app.json b/app.json index bc882ce..811cd8c 100644 --- a/app.json +++ b/app.json @@ -55,6 +55,13 @@ "pages/checkLog/checkLog" ] }, + { + "root": "subpages/residentCategory", + "name": "residentCategory", + "pages": [ + "pages/residentCategory/residentCategory" + ] + }, { "root": "subpages/addResi", "name": "addResi", diff --git a/images/index/JM.png b/images/index/JM.png index 8b34311..1c0388a 100644 Binary files a/images/index/JM.png and b/images/index/JM.png differ diff --git a/images/index/house.png b/images/index/house.png index 76c2adb..9365059 100644 Binary files a/images/index/house.png and b/images/index/house.png differ diff --git a/images/mine/lz.png b/images/mine/lz.png deleted file mode 100644 index 0369c25..0000000 Binary files a/images/mine/lz.png and /dev/null differ diff --git a/images/mine/wgz.png b/images/mine/wgz.png deleted file mode 100644 index 43416ff..0000000 Binary files a/images/mine/wgz.png and /dev/null differ diff --git a/images/work/header_left.png b/images/work/header_left.png deleted file mode 100644 index 6614f44..0000000 Binary files a/images/work/header_left.png and /dev/null differ diff --git a/images/work/house.png b/images/work/house.png deleted file mode 100644 index b69927a..0000000 Binary files a/images/work/house.png and /dev/null differ diff --git a/images/work2/footer.png b/images/work2/footer.png deleted file mode 100644 index 8c8afee..0000000 Binary files a/images/work2/footer.png and /dev/null differ diff --git a/pages/index/index.js b/pages/index/index.js index c58aaab..0daa42c 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -77,19 +77,12 @@ onScrollToLower(e){ res.data.list.forEach(item => { if (item.msgType === 'resident_base_info') { item.typeName = '居民信息采集' - } else if (item.categoryName === 'community_house') { + } else if (item.msgType === 'community_house') { item.typeName = '房屋信息采集' - } else if (item.categoryName === 'resident_categiry') { + } else if (item.msgType === 'resident_categiry') { item.typeName='数据更新提醒' - } }) - // 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', @@ -185,12 +178,16 @@ onScrollToLower(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}`, + url: `/subpages/addResi/pages/addResi/addResi?type=edit&resiId=${e.currentTarget.dataset.item.targetId}`, }) - }else{ + }else if(e.currentTarget.dataset.item.msgType == 'community_house'){ wx.navigateTo({ url: `/subpages/addhouse/pages/addhouse/addhouse?type=edit&houseId=${e.currentTarget.dataset.item.targetId}`, }) + }else if(e.currentTarget.dataset.item.msgType == 'resident_category'){ + wx.navigateTo({ + url: `/subpages/residentCategory/pages/residentCategory/residentCategory?category=${e.currentTarget.dataset.item.category}`, + }) } this.setData({ [`tableData[${e.currentTarget.dataset.index}].readFlag`]:'1' diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml index 089968c..cd82e9f 100644 --- a/pages/resiAndHouse/resiAndHouse.wxml +++ b/pages/resiAndHouse/resiAndHouse.wxml @@ -51,6 +51,7 @@ + @@ -64,8 +65,9 @@ {{itemC}} + - + 信息完整度:{{item.synthesizeScore}} diff --git a/pages/resiAndHouse/resiAndHouse.wxss b/pages/resiAndHouse/resiAndHouse.wxss index dae2555..410fb18 100644 --- a/pages/resiAndHouse/resiAndHouse.wxss +++ b/pages/resiAndHouse/resiAndHouse.wxss @@ -462,7 +462,7 @@ page { /* height: 36rpx; */ flex-direction: row; align-items: center; - justify-content: start; + justify-content: space-between; display: flex; margin: 20rpx 0 0 0; } @@ -1387,7 +1387,7 @@ page { /* justify-content: start; */ /* max-width: 302rpx; */ overflow-x: scroll; - padding: 10rpx 0; + padding: 10rpx 0 0; box-sizing: border-box; margin-left: 16rpx; font-size: 24rpx; diff --git a/pages/work1/work1.js b/pages/work1/work1.js deleted file mode 100644 index 52b44f1..0000000 --- a/pages/work1/work1.js +++ /dev/null @@ -1,66 +0,0 @@ -// pages/work1/work1.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/pages/work1/work1.wxml b/pages/work1/work1.wxml deleted file mode 100644 index 6656f01..0000000 --- a/pages/work1/work1.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/work1/work1.wxml \ No newline at end of file