diff --git a/images/index/Topping.png b/images/index/Topping.png
new file mode 100644
index 0000000..2c3e741
Binary files /dev/null and b/images/index/Topping.png differ
diff --git a/images/index/appeal.png b/images/index/appeal.png
new file mode 100644
index 0000000..765071d
Binary files /dev/null and b/images/index/appeal.png differ
diff --git a/images/index/bg_center.png b/images/index/bg_center.png
new file mode 100644
index 0000000..c009e59
Binary files /dev/null and b/images/index/bg_center.png differ
diff --git a/images/index/houses.png b/images/index/houses.png
new file mode 100644
index 0000000..98f1863
Binary files /dev/null and b/images/index/houses.png differ
diff --git a/images/index/register.png b/images/index/register.png
new file mode 100644
index 0000000..fc86e68
Binary files /dev/null and b/images/index/register.png differ
diff --git a/pages/index/index.js b/pages/index/index.js
index 6c1d703..3fae5a0 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,13 +1,14 @@
// index.js
// 获取应用实例
const app = getApp()
-import api, {getIntelligentMessage,getToken,getStaffbasicinfo,clearMessage} from "../../utils/api"
+import api, {getIntelligentMessage,getToken,getStaffbasicinfo,clearMessage,getSituation} from "../../utils/api"
+import config from "../../utils/config"
Page({
data: {
selectList:['全部消息','居民信息采集','房屋信息采集','社区满意度自查'],
selectValue:0,
- pageSize:10,
+ pageSize:5,
pageNo:1,
tableData:[],
lowerThreshold:'20',
@@ -25,10 +26,12 @@ Page({
await this.getToken()
// await this.getIntelligentMessage()
await this.getStaffbasicinfo()
+
},
onShow(){
this.getIntelligentMessage()
+ this.getSituation()
},
onPullDownRefresh() {
this.setData({
@@ -168,5 +171,27 @@ onScrollToLower(e){
}).catch(err=>{
console.log(err);
})
- }
+ },
+ // 人房信息采集
+ getSituation(){
+
+ wx.showLoading({
+ title: '加载中',
+ })
+ getSituation().then(res=>{
+ console.log('123',res)
+ this.setData({
+ collectedHouseCount:res.data.collectedHouseCount,
+ collectedPopulationCount:res.data.collectedPopulationCount,
+ pendingHouseCount:res.data.pendingHouseCount,
+ pendingPopulationCount:res.data.pendingPopulationCount,
+ populationCount:res.data.populationCount,
+ realEstateCount:res.data.realEstateCount,
+ })
+ wx.hideLoading()
+ }).catch(err=>{
+ wx.hideLoading()
+ console.log(err);
+ })
+},
})
diff --git a/pages/index/index.json b/pages/index/index.json
index 87ed097..209ab28 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -1,5 +1,5 @@
{
-
+ "navigationStyle": "custom",
"usingComponents": {
"load-more": "../../components/loadMore/loadMore",
@@ -7,9 +7,9 @@
"custom-tab-bar":"../../components/custom-tab-bar"
},
- "navigationBarTitleText": "消息",
-
- "enablePullDownRefresh": true,
+ "navigationBarTitleText": " ",
+ "navigationBarBackgroundColor": "#1673ee",
+ "enablePullDownRefresh": true,
"backgroundColor": "#f8f8f8",
"backgroundTextStyle": "dark"
}
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 0dc6fa0..20b0737 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,32 +1,96 @@
+
+
+
+
+ 数字化社区平台
+ 打造社区工作新模式
用数据提升基层治理与服务水平
-
-
-
- {{selectValue == 1?'居民信息采集':selectValue == 2?'房屋信息采集':selectValue == 3?'社区满意度自查':'全部消息'}}
-
+
+
+
+
+
+ 房屋登记
+ 登记房屋数据
+
+
+
+
+
+
+
+ 居民登记
+ 登记居民数据
+
+
+
+
+
+
+
+ 诉求上报
+ 登记居民诉求
+
+
+
+
+
+
+
+ 人房信息采集
+
+
+
+
+ {{collectedHouseCount?collectedHouseCount:'--'}}
+ 录入房屋
+
+
+ {{pendingHouseCount?pendingHouseCount:'--'}}
+ 未采集居民房屋
+
+
+
+
+ {{collectedPopulationCount?collectedPopulationCount:'--'}}
+ 录入居民
+
+
+ {{pendingPopulationCount?pendingPopulationCount:'--'}}
+ 居民信息不完整
+
+
+
+
-
- 全部已读
-
-
-
-
-
- {{item.createdByName}}
-
- {{item.content}} {{item.readFlag != '1'?'未读':'已读'}}
-
-
- 测评打分:{{item.deptName || '--'}}分
-
- {{item.createdTime}}
+
+
+
+ 消息提醒
+ 更多
+
+
+
+
+ {{item.content}}
+ {{item.readFlag != '1'?'未读':'已读'}}
+
+
+
+
+ {{item.content}}
+ {{item.readFlag != '1'?'未读':'已读'}}
+
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 3f7f731..6e641a0 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,11 +1,4 @@
/**index.wxss**/
-page {
- width: 100%;
- min-height: 100vh;
- overflow: hidden;
- background-color: #f7f7f7;
- }
-
.select{
width: 100%;
height: 90rpx;
@@ -42,26 +35,47 @@ page {
.content{
width: 100%;
padding:0 20rpx ;
- margin-top: 20rpx;
box-sizing: border-box;
+ margin: 20rpx 0 0 10rpx;
+
}
-.content .scroll {
- height: calc(100vh - 130rpx);
+/* .content .scroll {
+ height: calc(100vh - 130rpx);
+*/
+
+.box{
+ display: flex;
+ flex-direction: column;
+ background-color: #fff;
+}
+.hd_news{
+ display: flex;
+ flex-direction:row;
+ justify-content: space-between;
+ margin: 20rpx 20rpx 0 30rpx
}
+.hd_news .reminder{
+ width: 134rpx;
+ height: 33rpx;
+ overflow-wrap: break-word;
+ color: rgba(51,51,51,1);
+ font-size: 34rpx;
+ font-family: PingFang-SC-Bold;
+ font-weight: 700;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 52rpx;
-.content .scroll .box{
- border-radius: 20rpx;
- overflow-y: auto;
}
-.content .card{
+ .card{
width: 100%;
- background-color: #fff;
display: flex;
height: 168rpx;
- padding: 34rpx 30rpx;
+ margin: 20rpx 0 0 10rpx;
box-sizing: border-box;
overflow: hidden;
position: relative;
+ flex-direction: column;
}
.content .card::before{
@@ -159,4 +173,734 @@ page {
}
.bgBule image{
margin-left: 50rpx !important;
+}
+.page {
+ overflow: hidden;
+ position: relative;
+ width: 750rpx;
+ height: auto;
+ display: flex;
+ flex-direction: column;
+ background-color: rgba(247,247,247,1.000000);
+ z-index: -9999;
+}
+.header {
+ display: flex;
+ background: #1673ee;
+ width: 100%;
+ height: 300rpx;
+ flex-direction: column;
+ border-radius: 0 0 40rpx 40rpx;
+}
+.header .header_addre{
+ display: flex;
+ width: 100%;
+ height: 40rpx;
+ align-items: center;
+ align-content: center;
+ margin:80rpx 0 0 20rpx;
+ z-index:1;
+}
+.header_image {
+ width: 34rpx;
+ height: 31rpx;
+}
+.header_text_1 {
+ /* width: 157rpx;
+ height: 30rpx; */
+ overflow-wrap: break-word;
+ color: rgba(255,255,255,1);
+ font-size: 32rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 42rpx;
+ margin-left: 15rpx;
+}
+.text-wrapper_8 {
+ position: relative;
+ left: 30rpx;
+ top: -150rpx;
+ width: 690rpx;
+ height: 300rpx;
+ background-size: 100% 100%;
+ display: flex;
+ flex-direction: column;
+ z-index: 1000;
+}
+.bg-image{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ z-index: -1; /* 使图片位于文本内容之后 */
+}
+.text_30 {
+ text-shadow: 0px 2px 10px rgba(85,91,132,0.330000);
+ width: 333rpx;
+ height: 44rpx;
+ overflow-wrap: break-word;
+ color: rgba(255,255,255,1);
+ font-size: 46rpx;
+ font-family: PingFang-SC-Heavy;
+ font-weight: 900;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 46rpx;
+ margin: 68rpx 0 0 49rpx;
+}
+.paragraph_1 {
+ text-shadow: 0px 2px 5px rgba(101,103,114,0.360000);
+ width: 400rpx;
+ height: 65rpx;
+ overflow-wrap: break-word;
+ color: rgba(255,255,255,1);
+ font-size: 28rpx;
+ font-family: PingFang-SC-Bold;
+ font-weight: 700;
+ text-align: left;
+ line-height: 38rpx;
+ margin: 40rpx 0 0rpx 49rpx;
+}
+.group_1 {
+ position: relative;
+ width: 689rpx;
+ height: 124rpx;
+ flex-direction: row;
+ display: flex;
+ justify-content: space-between;
+ margin: -100rpx 0 0 30rpx;
+
+
+}
+.section_1 {
+ box-shadow: 0px 2px 20px 0px rgba(53,100,158,0.200000);
+ background-image: linear-gradient(-90deg, rgba(188,217,255,1.000000) 0, rgba(188,217,255,1.000000) 0, rgba(207,228,255,1.000000) 100.000000%, rgba(207,228,255,1.000000) 100.000000%);
+ border-radius: 16rpx;
+ width: 216rpx;
+ height: 124rpx;
+ display: flex;
+ flex-direction: row;
+}
+.image-text_1 {
+ width: 188rpx;
+ height: 89rpx;
+ flex-direction: row;
+ display: flex;
+ margin: 11rpx 0 0 20rpx;
+}
+.text-group_1 {
+ width: 131rpx;
+ height: 71rpx;
+ margin-top: 18rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+}
+.text_1 {
+ width: 111rpx;
+ height: 28rpx;
+ overflow-wrap: break-word;
+ color: rgba(55,129,199,1);
+ font-size: 28rpx;
+ font-family: PingFang-SC-Heavy;
+ font-weight: 900;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 28rpx;
+}
+.text_2 {
+ width: 131rpx;
+ height: 22rpx;
+ overflow-wrap: break-word;
+ color: rgba(81,150,214,1);
+ font-size: 22rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+ margin-top: 21rpx;
+}
+.image_1 {
+ width: 70rpx;
+ height: 70rpx;
+ margin-left: -13rpx;
+}
+.section_2 {
+ box-shadow: 0px 2px 20px 0px rgba(160,183,185,0.290000);
+ background-image: linear-gradient(-90deg, rgba(166,224,231,1.000000) 0, rgba(166,224,231,1.000000) 0, rgba(198,238,243,1.000000) 100.000000%, rgba(198,238,243,1.000000) 100.000000%);
+ border-radius: 16rpx;
+ width: 216rpx;
+ height: 124rpx;
+ margin-left: 21rpx;
+ display: flex;
+ flex-direction: column;
+}
+.image-text_2 {
+ width: 190rpx;
+ height: 89rpx;
+ flex-direction: row;
+ display: flex;
+ margin: 11rpx 0 0 19rpx;
+}
+.text-group_2 {
+ width: 132rpx;
+ height: 68rpx;
+ margin-top: 21rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+}
+.text_3 {
+ width: 112rpx;
+ height: 26rpx;
+ overflow-wrap: break-word;
+ color: rgba(53,147,139,1);
+ font-size: 28rpx;
+ font-family: PingFang-SC-Heavy;
+ font-weight: 900;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 28rpx;
+}
+.text_4 {
+ width: 131rpx;
+ height: 22rpx;
+ overflow-wrap: break-word;
+ color: rgba(83,166,159,1);
+ font-size: 22rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+ margin: 20rpx 0 0 1rpx;
+}
+.image_2 {
+ width: 70rpx;
+ height: 70rpx;
+ margin-left: -12rpx;
+}
+.section_3 {
+ box-shadow: 0px 2px 20px 0px rgba(199,172,165,0.340000);
+ background-image: linear-gradient(-90deg, rgba(247,210,200,1.000000) 0, rgba(247,210,200,1.000000) 0, rgba(255,230,221,1.000000) 100.000000%, rgba(255,230,221,1.000000) 100.000000%);
+ border-radius: 16rpx;
+ width: 216rpx;
+ height: 124rpx;
+ margin-left: 20rpx;
+ display: flex;
+ flex-direction: column;
+}
+.image-text_3 {
+ width: 188rpx;
+ height: 87rpx;
+ flex-direction: row;
+ display: flex;
+ margin: 13rpx 0 0 20rpx;
+}
+.text-group_3 {
+ width: 130rpx;
+ height: 68rpx;
+ margin-top: 19rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+}
+.text_5 {
+ width: 110rpx;
+ height: 26rpx;
+ overflow-wrap: break-word;
+ color: rgba(204,136,74,1);
+ font-size: 28rpx;
+ font-family: PingFang-SC-Heavy;
+ font-weight: 900;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 28rpx;
+}
+.text_6 {
+ width: 130rpx;
+ height: 22rpx;
+ overflow-wrap: break-word;
+ color: rgba(199,149,104,1);
+ font-size: 22rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+ margin-top: 20rpx;
+}
+.image_3 {
+ width: 70rpx;
+ height: 70rpx;
+ margin-left: -12rpx;
+}
+.group_2 {
+ position: relative;
+ background-color: rgba(255,255,255,1.000000);
+ border-radius: 20rpx;
+ width: 710rpx;
+ height: 412rpx;
+ display: flex;
+ flex-direction: column;
+ margin: 36rpx 0 0 30rpx;
+}
+.text-wrapper_1 {
+ background-color: rgba(255,255,255,1.000000);
+ border-radius: 20rpx;
+ height: 90rpx;
+ display: flex;
+ flex-direction: column;
+ width: 710rpx;
+}
+.text_7 {
+ width: 202rpx;
+ height: 33rpx;
+ overflow-wrap: break-word;
+ color: rgba(51,51,51,1);
+ font-size: 34rpx;
+ font-family: PingFang-SC-Bold;
+ font-weight: 700;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 52rpx;
+ margin: 30rpx 0 0 29rpx;
+}
+.block_1 {
+ width: 650rpx;
+ height: 290rpx;
+ flex-direction: row;
+ display: flex;
+ justify-content: space-between;
+ margin: 2rpx 0 30rpx 30rpx;
+}
+.group_3 {
+ width: 310rpx;
+ height: 290rpx;
+ background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/ps82ewzf7rt4xi1ybsycqaxm2mffxacf314bf1b64-1799-409e-a8d3-54344bd32244) 100% no-repeat;
+ background-size: 100% 100%;
+ display: flex;
+ flex-direction: column;
+}
+.text-group_4 {
+ width: 114rpx;
+ height: 80rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ margin: 38rpx 0 0 57rpx;
+}
+.text_8 {
+ width: 114rpx;
+ height: 41rpx;
+ overflow-wrap: break-word;
+ color: rgba(58,128,231,1);
+ font-size: 44rpx;
+ font-family: PingFang-SC-Heavy;
+ font-weight: 900;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+}
+.text_9 {
+ width: 102rpx;
+ height: 25rpx;
+ overflow-wrap: break-word;
+ color: rgba(102,102,102,1);
+ font-size: 26rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+ margin-top: 14rpx;
+}
+.text-group_5 {
+ width: 180rpx;
+ height: 78rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ margin: 53rpx 0 41rpx 57rpx;
+}
+.text_10 {
+ width: 112rpx;
+ height: 41rpx;
+ overflow-wrap: break-word;
+ color: rgba(255,76,28,1);
+ font-size: 44rpx;
+ font-family: PingFang-SC-Heavy;
+ font-weight: 900;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+}
+.text_11 {
+ width: 180rpx;
+ height: 25rpx;
+ overflow-wrap: break-word;
+ color: rgba(102,102,102,1);
+ font-size: 26rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+ margin-top: 12rpx;
+}
+.group_4 {
+ width: 309rpx;
+ height: 290rpx;
+ background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/psq0fabgccqbd5mjs6z8p0rt7df5pv3uen565b4a611-6a0e-4fbc-a572-28bc912d91b5) 100% no-repeat;
+ background-size: 100% 100%;
+ display: flex;
+ flex-direction: column;
+}
+.text-group_6 {
+ width: 114rpx;
+ height: 80rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ margin: 40rpx 0 0 140rpx;
+}
+.text_12 {
+ width: 114rpx;
+ height: 41rpx;
+ overflow-wrap: break-word;
+ color: rgba(58,128,231,1);
+ font-size: 44rpx;
+ font-family: PingFang-SC-Heavy;
+ font-weight: 900;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+}
+.text_13 {
+ width: 102rpx;
+ height: 25rpx;
+ overflow-wrap: break-word;
+ color: rgba(102,102,102,1);
+ font-size: 26rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+ margin: 14rpx 0 0 12rpx;
+}
+.text-group_7 {
+ width: 180rpx;
+ height: 80rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ margin: 49rpx 0 41rpx 74rpx;
+}
+.text_14 {
+ width: 113rpx;
+ height: 41rpx;
+ overflow-wrap: break-word;
+ color: rgba(255,76,28,1);
+ font-size: 44rpx;
+ font-family: PingFang-SC-Heavy;
+ font-weight: 900;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+ margin-left: 67rpx;
+}
+.text_15 {
+ width: 180rpx;
+ height: 25rpx;
+ overflow-wrap: break-word;
+ color: rgba(102,102,102,1);
+ font-size: 26rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+ margin-top: 14rpx;
+}
+.group_5 {
+ background-color: rgba(255,255,255,1.000000);
+ border-radius: 20rpx;
+ width: 710rpx;
+ height: 502rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-center;
+ margin: 20rpx 0 0 20rpx;
+}
+.text-wrapper_2 {
+ width: 649rpx;
+ height: 33rpx;
+ flex-direction: row;
+ display: flex;
+ justify-content: space-between;
+ margin: 30rpx 0 0 29rpx;
+}
+.text_16 {
+ width: 134rpx;
+ height: 33rpx;
+ overflow-wrap: break-word;
+ color: rgba(51,51,51,1);
+ font-size: 34rpx;
+ font-family: PingFang-SC-Bold;
+ font-weight: 700;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 52rpx;
+}
+.text_17 {
+ width: 53rpx;
+ height: 26rpx;
+ overflow-wrap: break-word;
+ color: rgba(180,180,180,1);
+ font-size: 28rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+ margin-top: 6rpx;
+}
+.box_2 {
+ width: 648rpx;
+ height: 31rpx;
+ flex-direction: row;
+ display: flex;
+ justify-content: space-between;
+ margin: 45rpx 0 0 30rpx;
+}
+.image-text_4 {
+ width: 535rpx;
+ height: 31rpx;
+ flex-direction: row;
+ display: flex;
+ justify-content: space-between;
+}
+.label_1 {
+ width: 30rpx;
+ height: 30rpx;
+}
+.text-group_8 {
+ width: 490rpx;
+ height: 31rpx;
+ 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: 32rpx;
+}
+.text_18 {
+ width: 51rpx;
+ height: 25rpx;
+ overflow-wrap: break-word;
+ color: rgba(102,102,102,1);
+ font-size: 26rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 40rpx;
+ margin-top: 1rpx;
+}
+.text-wrapper_3 {
+ width: 648rpx;
+ height: 27rpx;
+ flex-direction: row;
+ display: flex;
+ justify-content: space-between;
+ margin: 23rpx 0 0 30rpx;
+}
+.text_19 {
+ width: 169rpx;
+ height: 27rpx;
+ overflow-wrap: break-word;
+ color: rgba(153,153,153,1);
+ font-size: 28rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 40rpx;
+}
+.text_20 {
+ width: 228rpx;
+ height: 20rpx;
+ overflow-wrap: break-word;
+ color: rgba(193,193,193,1);
+ font-size: 26rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 40rpx;
+ margin-top: 4rpx;
+}
+.image_4 {
+ width: 650rpx;
+ height: 1rpx;
+ margin: 30rpx 0 0 31rpx;
+}
+.text-wrapper_4 {
+ width: 650rpx;
+ height: 31rpx;
+ flex-direction: row;
+ display: flex;
+ justify-content: space-between;
+ margin: 30rpx 0 0 30rpx;
+}
+.text_21 {
+ width: 554rpx;
+ height: 31rpx;
+ 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;
+}
+.text_22 {
+ width: 51rpx;
+ height: 25rpx;
+ overflow-wrap: break-word;
+ color: rgba(102,102,102,1);
+ font-size: 26rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 40rpx;
+ margin-top: 1rpx;
+}
+.text-wrapper_5 {
+ width: 648rpx;
+ height: 26rpx;
+ flex-direction: row;
+ display: flex;
+ justify-content: space-between;
+ margin: 24rpx 0 0 30rpx;
+}
+.text_23 {
+ width: 168rpx;
+ height: 26rpx;
+ overflow-wrap: break-word;
+ color: rgba(153,153,153,1);
+ font-size: 28rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 40rpx;
+}
+.text_24 {
+ width: 228rpx;
+ height: 20rpx;
+ overflow-wrap: break-word;
+ color: rgba(193,193,193,1);
+ font-size: 26rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 40rpx;
+ margin-top: 3rpx;
+}
+.image_5 {
+ width: 650rpx;
+ height: 1rpx;
+ margin: 30rpx 0 0 31rpx;
+}
+.text-wrapper_6 {
+ width: 649rpx;
+ height: 31rpx;
+ flex-direction: row;
+ display: flex;
+ justify-content: space-between;
+ margin: 29rpx 0 0 30rpx;
+}
+.text_25 {
+ width: 546rpx;
+ height: 31rpx;
+ 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;
+}
+.text_26 {
+ width: 51rpx;
+ height: 25rpx;
+ overflow-wrap: break-word;
+ color: rgba(102,102,102,1);
+ font-size: 26rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 40rpx;
+ margin-top: 5rpx;
+}
+.text-wrapper_7 {
+ width: 648rpx;
+ height: 27rpx;
+ flex-direction: row;
+ display: flex;
+ justify-content: space-between;
+ margin: 23rpx 0 30rpx 30rpx;
+}
+.text_27 {
+ width: 168rpx;
+ height: 27rpx;
+ overflow-wrap: break-word;
+ color: rgba(153,153,153,1);
+ font-size: 28rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 40rpx;
+}
+.text_28 {
+ width: 228rpx;
+ height: 20rpx;
+ overflow-wrap: break-word;
+ color: rgba(193,193,193,1);
+ font-size: 26rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 40rpx;
+ margin-top: 4rpx;
+}
+.information{
+ display: flex;
+ flex-direction: column;
+}
+.more_more{
+ width: 53rpx;
+ height: 26rpx;
+ overflow-wrap: break-word;
+ color: rgba(180,180,180,1);
+ font-size: 28rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 36rpx;
+ margin-top: 6rpx;
}
\ No newline at end of file
diff --git a/pages/work/work.js b/pages/work/work.js
index 127e930..90e215b 100644
--- a/pages/work/work.js
+++ b/pages/work/work.js
@@ -37,7 +37,9 @@ Page({
title: '加载中',
})
getSituation().then(res=>{
+ console.log(res)
this.setData({
+
collectedHouseCount:res.data.collectedHouseCount,
collectedPopulationCount:res.data.collectedPopulationCount,
pendingHouseCount:res.data.pendingHouseCount,
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.js b/subpages/searchResult/pages/resiInfo/resiInfo.js
new file mode 100644
index 0000000..5d13698
--- /dev/null
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.js
@@ -0,0 +1,66 @@
+// subpages/searchResult/pages/resiInfo/resiInfo.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.wxml b/subpages/searchResult/pages/resiInfo/resiInfo.wxml
new file mode 100644
index 0000000..2a2a0a9
--- /dev/null
+++ b/subpages/searchResult/pages/resiInfo/resiInfo.wxml
@@ -0,0 +1,2 @@
+
+subpages/searchResult/pages/resiInfo/resiInfo.wxml
\ No newline at end of file