diff --git a/components/Tabs/index.wxss b/components/Tabs/index.wxss index 1eab926..a12f9a1 100644 --- a/components/Tabs/index.wxss +++ b/components/Tabs/index.wxss @@ -8,7 +8,6 @@ flex: 1; padding: 25rpx 20rpx; font-size: 30rpx; - font-weight: 500; color: #999999; margin: 0 15rpx 30rpx; display: flex; diff --git a/images/xuncha.png b/images/xuncha.png index e86c61c..b1b78d5 100644 Binary files a/images/xuncha.png and b/images/xuncha.png differ diff --git a/pages/index/index.wxss b/pages/index/index.wxss index ca53af2..160aa4e 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -358,6 +358,7 @@ page { white-space: nowrap; line-height: 36rpx; margin-top: 14rpx; + font-weight: 300; } .text-group_5 { position: absolute; @@ -388,6 +389,7 @@ page { white-space: nowrap; line-height: 36rpx; margin-top: 12rpx; + font-weight: 300; } .group_4 { @@ -433,6 +435,7 @@ page { white-space: nowrap; line-height: 36rpx; text-align: right;margin-top: 20rpx; + font-weight: 300; } .text-group_7 { @@ -469,6 +472,7 @@ page { line-height: 36rpx; text-align: right; margin-top: 15rpx; + font-weight: 300; } @@ -766,6 +770,7 @@ page { .more{ font-size: 28rpx; color: #B4B4B4; + font-weight: 300; line-height: 36rpx; } .Information{ @@ -796,6 +801,7 @@ page { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + font-weight: 300; } .Information_test2{ width: 60rpx; @@ -803,6 +809,7 @@ page { font-size: 26rpx; color: #666666; line-height: 40rpx; + font-weight: 300; } .Information_two{ display: flex; @@ -815,7 +822,6 @@ height: auto; font-size: 28rpx; color: #999999; line-height: 40rpx; -margin-left: 20rpx; } .Information_test4{ width: auto; @@ -857,7 +863,7 @@ line-height: 40rpx; } .right{ - margin-right: 30rpx; + } .bg_new_box{ background: #F9FBFE; @@ -896,9 +902,10 @@ line-height: 40rpx; .new_h2{ margin-top: 30rpx; margin-left: 30rpx; - font-size: 34rpx; + font-size: 32rpx; color: #333333; line-height: 52rpx; + font-weight: 300; } .new_submitt{ margin-top: 20rpx; @@ -946,9 +953,10 @@ line-height: 40rpx; } .new_hh{ margin-bottom: 12rpx; -font-size: 34rpx; +font-size: 32rpx; color: #333333; line-height: 52rpx; +font-weight: 300; } .new_submit{ margin-top: 30rpx; @@ -1030,4 +1038,5 @@ line-height: 52rpx; .card_text{ margin-left: 20rpx; font-size: 32rpx; + font-weight: 300; } \ No newline at end of file diff --git a/pages/resiAndHouse/resiAndHouse.wxml b/pages/resiAndHouse/resiAndHouse.wxml index cbb964b..29d6e3e 100644 --- a/pages/resiAndHouse/resiAndHouse.wxml +++ b/pages/resiAndHouse/resiAndHouse.wxml @@ -50,7 +50,7 @@ - + @@ -82,7 +82,8 @@ 地址: {{item.agencyName || ''}} {{item.homeName || ''}} - + + diff --git a/pages/resiAndHouse/resiAndHouse.wxss b/pages/resiAndHouse/resiAndHouse.wxss index 951e54d..2a12609 100644 --- a/pages/resiAndHouse/resiAndHouse.wxss +++ b/pages/resiAndHouse/resiAndHouse.wxss @@ -510,20 +510,21 @@ page { .text-wrapper_9 { display: flex; - width: 243rpx; + width: 300rpx; overflow-wrap: break-word; - font-family: PingFang-SC-Medium; - font-weight: 500; - text-align: left; + text-align: right; white-space: nowrap; line-height: 40rpx; margin: 4rpx 0 0 0; + flex-direction: row; } .text-wrapper_9 .label{ color: #999999; + width: 235rpx; } .text-wrapper_9 .value{ color: #04b8ad; + width: 50rpx; } .text_19 { width: 243rpx; @@ -642,7 +643,7 @@ page { overflow-wrap: break-word; font-size: 0rpx; font-family: PingFang-SC-Medium; - font-weight: 500; + font-weight: 350; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -678,7 +679,7 @@ page { overflow-wrap: break-word; font-size: 0rpx; font-family: PingFang-SC-Medium; - font-weight: 500; + font-weight: 350; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -718,9 +719,7 @@ page { width: 639rpx; height: 28rpx; overflow-wrap: break-word; - font-size: 0rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; + font-size: 30rpx; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -1243,7 +1242,8 @@ page { .scroll { height: calc(100vh - 687rpx); -} + width: 700rpx; + } .text_61 { width: 639rpx; @@ -1387,11 +1387,17 @@ page { } .form_item { margin-top: 10rpx; - padding: 0 30rpx 30rpx; + padding: 0 10rpx 0rpx 30rpx; box-sizing: border-box; - border-bottom: 1rpx #EAEAEA solid; -} +} +.updata1{ + margin-top: 10rpx; + box-sizing: border-box; + border-bottom: 1rpx #EAEAEA solid; + height: 210rpx; + +} .scroll_fw { height: calc(100vh - 750rpx); } diff --git a/pages/statistics/modules/ProblemList/ProblemList.wxss b/pages/statistics/modules/ProblemList/ProblemList.wxss index a8b62f5..11868eb 100644 --- a/pages/statistics/modules/ProblemList/ProblemList.wxss +++ b/pages/statistics/modules/ProblemList/ProblemList.wxss @@ -42,12 +42,10 @@ .frequency .num { font-size: 40rpx; - font-weight: bold; } .frequency .txt { font-size: 20rpx; - font-weight: 500; } .frequency.orange { background: #FFEBE2; @@ -69,8 +67,7 @@ } .right-con .right-con-txt { - font-size: 32rpx; - font-weight: 500; + font-size: 30rpx; color: #333333; line-height: 42rpx; overflow: hidden; diff --git a/pages/statistics/modules/StayList/StayList.wxss b/pages/statistics/modules/StayList/StayList.wxss index ee33cc3..346ab24 100644 --- a/pages/statistics/modules/StayList/StayList.wxss +++ b/pages/statistics/modules/StayList/StayList.wxss @@ -19,8 +19,7 @@ .tit-text { flex: 0 0 calc(100% - 110rpx); width: calc(100% - 110rpx); - font-size: 32rpx; - font-weight: 500; + font-size: 30rpx; color: #333333; text-overflow: ellipsis; overflow: hidden; diff --git a/pages/statistics/statistics.wxss b/pages/statistics/statistics.wxss index cdbf168..33d0506 100644 --- a/pages/statistics/statistics.wxss +++ b/pages/statistics/statistics.wxss @@ -29,7 +29,7 @@ } .card .title .view { font-size: 28rpx; - font-weight: 400; + font-weight: 300; color: #999999; display: flex; align-items: center; @@ -44,7 +44,7 @@ .title-tab { margin-right: 60rpx; font-size: 32rpx; - font-weight: 500; + font-weight: 300; color: #999999; position: relative; } @@ -76,7 +76,7 @@ page { .sub-tit { font-size: 32rpx; - font-weight: 500; + font-weight: 400; color: #333333; display: flex; align-items: center; diff --git a/project.private.config.json b/project.private.config.json index adf3f3d..3489b1a 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -9,6 +9,24 @@ "condition": { "miniprogram": { "list": [ + { + "name": "subpages/residentCategory/pages/residentCategory/residentCategory", + "pathName": "subpages/residentCategory/pages/residentCategory/residentCategory", + "query": "", + "launchMode": "default", + "scene": null, + "partialCompile": { + "enabled": true, + "pages": [] + } + }, + { + "name": "/subpages/residentCategory/pages/residentCategory", + "pathName": "/subpages/residentCategory/pages/residentCategory", + "query": "", + "launchMode": "default", + "scene": null + }, { "name": "房屋搜索", "pathName": "subpages/searchResult/pages/searchResult/searchResult", @@ -23,17 +41,6 @@ "launchMode": "default", "scene": null }, - { - "name": "subpages/safetyinspection/pages/safetyinspection/safetyinspection", - "pathName": "subpages/safetyinspection/pages/safetyinspection/safetyinspection", - "query": "", - "launchMode": "default", - "scene": null, - "partialCompile": { - "enabled": true, - "pages": [] - } - }, { "name": "subpages/communitySelfInsp/pages/historyQuery/historyQuery", "pathName": "subpages/communitySelfInsp/pages/historyQuery/historyQuery", diff --git a/subpages/businessRecord/businessRecord.wxss b/subpages/businessRecord/businessRecord.wxss index 69086e5..57ed3e4 100644 --- a/subpages/businessRecord/businessRecord.wxss +++ b/subpages/businessRecord/businessRecord.wxss @@ -6,7 +6,7 @@ } .tag-list .tag { padding: 0rpx 20rpx; - font-size: 23rpx; + font-size: 30rpx; margin: 10rpx 8rpx; text-align: center; /* 使标签文本居中 */ } @@ -107,7 +107,7 @@ .cell { flex: 1; padding: 20rpx 0; - font-size: 23rpx; + font-size: 30rpx; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -115,12 +115,12 @@ .cell:nth-child(1) { padding-left: 20rpx; flex-basis: 30%; - font-size: 23rpx; + font-size: 30rpx; } .cell:nth-child(2) { flex-basis: 70%; - font-size: 23rpx; + font-size: 30rpx; } .cell1 { @@ -135,17 +135,17 @@ .cell1:nth-child(1) { padding-left: 20rpx; flex-basis: 18%; - font-size: 23rpx; + font-size: 30rpx; } .cell1:nth-child(2) { flex-basis: 40%; - font-size: 23rpx; + font-size: 30rpx; } .cell1:nth-child(3) { padding-left: 20rpx; flex-basis: 33%; - font-size: 23rpx; + font-size: 30rpx; } .even { diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss index 03efaa8..9e0fd99 100644 --- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss +++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss @@ -225,7 +225,7 @@ page { width: 118rpx; height: 28rpx; font-family: PingFang SC; - font-size: 30rpx; + font-size: 28rpx; color: #333333; line-height: 42rpx; margin-bottom: 10rpx; diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml index 6644358..f3d1d84 100644 --- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml @@ -54,7 +54,7 @@ - + * {{tabVal==='1'?'需求描述':'事件描述'}} @@ -150,7 +150,7 @@ - + diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss index e065d27..69dfb38 100644 --- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss @@ -77,7 +77,6 @@ page { padding: 0rpx 20rpx 45rpx; } .add-issue .issue-content textarea { - margin-top: 15rpx; width: 100%; height: 298rpx; background-color: #f7f7f7; @@ -106,7 +105,7 @@ page { grid-template-rows: 214rpx; grid-gap: 17rpx; height: 188rpx; - margin-top:80rpx ; + margin-top:60rpx ; } .image-list-2 { height: 428rpx !important; @@ -396,7 +395,13 @@ page { line-height: 60rpx; display: flex; } -.item .field { +.item1{ + + padding: 25rpx 0; + line-height: 60rpx; + display: flex; +} +.field { position: relative; box-sizing: border-box; width: 180rpx; @@ -409,10 +414,10 @@ padding-left: 25rpx; .value-d{ width: 450rpx !important; } -.item .field.mobile-field { + .field.mobile-field { width: 250rpx !important; } -.item .field .must { +.field .must { position: absolute; top: 0; left: 0; @@ -420,15 +425,13 @@ margin: 0 auto; color: #F61616; font-size: 30rpx; } - -.item .field .field-text { + .field .field-text { font-size: 32rpx; font-family: Source Han Serif SC; font-weight: 400; color: #333; } - -.item .value { + .value { position: relative; width: 410rpx; display: flex; @@ -438,58 +441,56 @@ color: #333; color: #333; line-height: 60rpx; } - -.item .value-dl { +.value-dl { position: relative; display: flex; font-size: 32rpx; - font-family: Source Han Serif SC; - font-weight: 400; color: #333; line-height: 60rpx; align-items: center; display: flex; justify-content: space-between; + flex: 1; } +.telInput{ + margin-left: 40rpx; +} .di-name{ margin-right: 14rpx; text-align: left; width: calc(100% - 30rpx); + margin-left: 40rpx; } .di-but{ width: 30rpx; height: 34rpx; } - -.item .value input { + .value input { text-align: right; font-size: 34rpx; color: #333; height: 100%; width: 100%; -} -.item .value .picker { +} .value .picker { position: relative; width: 100%; padding-right: 40rpx; text-align: right; } - -.item .value .picker .z-weak { + .value .picker .z-weak { color: #999; } - -.item .value .picker .menu-arrow { +.value .picker .menu-arrow { position: absolute; top: 20rpx; right: 0; width: 16rpx; height: 23rpx; } -.item .value-mobile { +.value-mobile { position: relative; width: 410rpx; display: flex; @@ -501,7 +502,7 @@ line-height: 60rpx; display: flex; justify-content: flex-end; } -.item .value-mobile .get-code { + .value-mobile .get-code { padding: 0 15rpx; height: 60rpx; line-height: 60rpx; @@ -512,10 +513,10 @@ border-radius: 6rpx; margin: 0; margin-left: 25rpx; } -.item .value-mobile .button-hover { + .value-mobile .button-hover { background: rgb(175, 1, 1); } -.item .value-mobile input { +.value-mobile input { text-align: right; font-size: 34rpx; color: #333; diff --git a/subpages/house/pages/housePortrait/housePortrait.wxml b/subpages/house/pages/housePortrait/housePortrait.wxml index 03cb3c4..f08ba6b 100644 --- a/subpages/house/pages/housePortrait/housePortrait.wxml +++ b/subpages/house/pages/housePortrait/housePortrait.wxml @@ -37,7 +37,7 @@ 业务记录 - + diff --git a/subpages/house/pages/housePortrait/housePortrait.wxss b/subpages/house/pages/housePortrait/housePortrait.wxss index 8a4735b..5298c04 100644 --- a/subpages/house/pages/housePortrait/housePortrait.wxss +++ b/subpages/house/pages/housePortrait/housePortrait.wxss @@ -45,9 +45,11 @@ .card .title .view image { width: 24rpx; } +.BusinessRecord{ +} .card .field { - font-size: 24rpx; + font-size: 30rpx; font-weight: 500; color: #999999; margin-top: 20rpx; @@ -56,10 +58,12 @@ .card .line { display: flex; flex-wrap: nowrap; + flex-direction: column; + } .card .line .field { - font-size: 24rpx; + font-size: 30rpx; font-weight: 500; color: #999999; margin-top: 20rpx; diff --git a/subpages/morenews/pages/morenews/morenews.wxml b/subpages/morenews/pages/morenews/morenews.wxml index 493876a..33387d4 100644 --- a/subpages/morenews/pages/morenews/morenews.wxml +++ b/subpages/morenews/pages/morenews/morenews.wxml @@ -5,8 +5,7 @@ {{selectValue == 1?'居民信息采集':selectValue == 2?'房屋信息采集':selectValue == 3?'社区满意度自查':'全部消息'}} - - + 全部已读 diff --git a/subpages/morenews/pages/morenews/morenews.wxss b/subpages/morenews/pages/morenews/morenews.wxss index cb854f3..8ad51e4 100644 --- a/subpages/morenews/pages/morenews/morenews.wxss +++ b/subpages/morenews/pages/morenews/morenews.wxss @@ -57,10 +57,11 @@ page { background-color: #fff; display: flex; height: 168rpx; - padding: 34rpx 30rpx; + padding: 20rpx 30rpx; box-sizing: border-box; overflow: hidden; position: relative; + height: 150rpx; } .content .card::before{ @@ -112,7 +113,7 @@ page { flex-direction: column; justify-content: space-between; overflow: hidden; - margin-left: 24rpx; + } .content .card .right .top{ display: flex; diff --git a/subpages/nohouse/pages/nohouse/nohouse.wxss b/subpages/nohouse/pages/nohouse/nohouse.wxss index 37b4d58..bdbdd08 100644 --- a/subpages/nohouse/pages/nohouse/nohouse.wxss +++ b/subpages/nohouse/pages/nohouse/nohouse.wxss @@ -124,10 +124,8 @@ line-height: 46rpx; } .from_test1{ display: flex; - overflow-wrap: break-word; color: rgba(51,51,51,1); font-size: 33rpx; - font-weight: 500; text-align: left; white-space: nowrap; line-height: 42rpx; diff --git a/subpages/residentCategory/pages/residentCategory/residentCategory.wxml b/subpages/residentCategory/pages/residentCategory/residentCategory.wxml index 96703f9..de389b1 100644 --- a/subpages/residentCategory/pages/residentCategory/residentCategory.wxml +++ b/subpages/residentCategory/pages/residentCategory/residentCategory.wxml @@ -10,9 +10,10 @@ + - - + + @@ -44,7 +45,9 @@ 地址: {{item.agencyName || ''}} {{item.homeName || ''}} - + + + diff --git a/subpages/residentCategory/pages/residentCategory/residentCategory.wxss b/subpages/residentCategory/pages/residentCategory/residentCategory.wxss index 027a5f2..950ba55 100644 --- a/subpages/residentCategory/pages/residentCategory/residentCategory.wxss +++ b/subpages/residentCategory/pages/residentCategory/residentCategory.wxss @@ -20,7 +20,7 @@ page{ } .inout_box { position: relative; - margin: 20rpx 0 20rpx; + margin:0 0 0 20rpx; padding: 0 20rpx; box-sizing: border-box; width: 100%; @@ -499,20 +499,22 @@ page{ .text-wrapper_9 { display: flex; - width: 243rpx; + width: 275rpx; overflow-wrap: break-word; font-family: PingFang-SC-Medium; font-weight: 500; - text-align: left; + text-align: right; white-space: nowrap; line-height: 40rpx; - margin: 4rpx 0 0 0; + margin: 4rpx 0rpx 0 0; } .text-wrapper_9 .label{ color: #999999; + width: 250rpx; } .text-wrapper_9 .value{ color: #04b8ad; + width: 50rpx; } .text_16 { width: fit-content; @@ -529,9 +531,18 @@ page{ .form_item { margin-top: 10rpx; - padding: 0 30rpx 30rpx; + padding: 0 20rpx 0 20rpx; box-sizing: border-box; - border-bottom: 1rpx #EAEAEA solid; + +} +.updata1{ + margin-top: 10rpx; + box-sizing: border-box; + border-bottom: 1rpx #EAEAEA solid; + height: 210rpx; + padding-bottom: 10rpx; + margin-bottom: 20rpx; + } .text_27 { width: 415rpx; diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss index 2156763..a34e3ea 100644 --- a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss +++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss @@ -33,7 +33,7 @@ page{ } .text1{ overflow-wrap: break-word; - color: rgba(57,116,246,1); + color: rgba(193,193,193,1); font-size: 30rpx; font-family: PingFang-SC-Medium; font-weight: 500; @@ -111,6 +111,8 @@ page{ display: flex; flex-direction: column; margin: 20rpx; + border-bottom: 1px solid #ddd; + height: 240rpx; } .line { width: 533rpx; @@ -133,10 +135,10 @@ page{ font-size: 0rpx; font-family: PingFang-SC-Medium; font-weight: 500; -text-align: center; + text-align: center; white-space: nowrap; line-height: 40rpx; - margin-right: 20rpx; + } .lable{ display: block; @@ -144,7 +146,7 @@ text-align: center; height: 35rpx; line-height:35rpx; /* background: #f6f6f6; */ - margin-left: 20rpx; + margin-left: 10rpx; /* color:red; */ } .red-style{ @@ -196,6 +198,7 @@ text-align: center; width: 300rpx; height:50rpx; overflow-x: scroll; + text-align: center; } .information_1 { display: flex;