diff --git a/images/xuncha.png b/images/xuncha.png deleted file mode 100644 index b1b78d5..0000000 Binary files a/images/xuncha.png and /dev/null differ diff --git a/images/xuncha3.png b/images/xuncha3.png new file mode 100644 index 0000000..5f97809 Binary files /dev/null and b/images/xuncha3.png differ diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 160aa4e..35575c9 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -441,7 +441,7 @@ page { .text-group_7 { box-sizing: border-box; position: absolute; - bottom: 78rpx; + bottom:75rpx; display: flex; flex-direction: column; margin-left: 80rpx; @@ -900,8 +900,8 @@ line-height: 40rpx; margin-top: 20rpx; } .new_h2{ - margin-top: 30rpx; - margin-left: 30rpx; + margin-top: 40rpx; + margin-left: 40rpx; font-size: 32rpx; color: #333333; line-height: 52rpx; @@ -1018,6 +1018,7 @@ font-weight: 300; justify-content: space-between; font-size: 32rpx; margin-left: 20rpx; + font-weight: 300; } .img_door{ diff --git a/pages/resiAndHouse/resiAndHouse.wxss b/pages/resiAndHouse/resiAndHouse.wxss index 2a12609..0a9fe63 100644 --- a/pages/resiAndHouse/resiAndHouse.wxss +++ b/pages/resiAndHouse/resiAndHouse.wxss @@ -464,7 +464,8 @@ page { align-items: center; justify-content: space-between; display: flex; - margin: 20rpx 0 0 0; + margin: 40rpx 0 0 0; + height: 30rpx; } .text_16 { @@ -521,6 +522,7 @@ page { .text-wrapper_9 .label{ color: #999999; width: 235rpx; + font-weight: 300; } .text-wrapper_9 .value{ color: #04b8ad; @@ -643,7 +645,7 @@ page { overflow-wrap: break-word; font-size: 0rpx; font-family: PingFang-SC-Medium; - font-weight: 350; + font-weight: 300; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -675,11 +677,11 @@ page { .text-wrapper_13 { width: 415rpx; - height: 28rpx; + height: 30rpx; overflow-wrap: break-word; font-size: 0rpx; font-family: PingFang-SC-Medium; - font-weight: 350; + font-weight: 300; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -717,13 +719,14 @@ page { .text-wrapper_14 { width: 639rpx; - height: 28rpx; + height: 30rpx; overflow-wrap: break-word; font-size: 30rpx; text-align: left; white-space: nowrap; line-height: 40rpx; margin: 20rpx 0 0 0; + font-weight: 300; } .text_30 { diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss index 835531d..e76c44e 100644 --- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss +++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss @@ -1,38 +1,39 @@ page { - width: 100%; + width: 750rpx; min-height: 100vh; overflow-y: auto; background-color: #f7f7f7; } .from{ - width: 100%; - height: 100%; + width: 710rpx; + height: 1320rpx; display: flex; flex-direction: column; border-radius: 15rpx; background-color: rgb(255, 255, 255); - margin: 30rpx; + margin: 20rpx; } .prosecutors{ display: flex; flex-direction:row; align-items: center; - margin: 20rpx; - height: 80rpx; - + margin: 0 20rpx; + height: 90rpx; } .nes{ width: 630rpx; display: flex; flex-direction:row; align-items: center; - margin: 20rpx; + margin: 0 20rpx; justify-content: space-between; height: 80rpx; border-bottom: 1px solid #EAEAEA; + text-align: center; } .conclusion{ + height: 50rpx; display: flex; flex-direction: row; } @@ -67,7 +68,7 @@ page { text-align: left; white-space: nowrap; line-height: 42rpx; - margin-left: 60rpx; + margin-left: 70rpx; } .prosecutors_img{ width: 40rpx; @@ -119,7 +120,7 @@ page { } .image-box .image-list-label { position: absolute; - top: 35rpx; + top: 5rpx; } .field-text{ width: 61rpx; @@ -149,7 +150,7 @@ page { .textarea1{ margin-top: 20rpx; background-color:#f7f7f7 ; - width: 650rpx; + width: 600rpx; height: 200rpx; margin-left: 40rpx; } @@ -306,7 +307,7 @@ height: 60rpx; margin-top: 20rpx; } .input1{ - width: 650rpx; + width: 600rpx; height: 90rpx; background-color: #F7F7F7; border-radius: 10rpx; @@ -369,7 +370,7 @@ margin-bottom: 20rpx; border-radius: 16rpx; background: #fff; box-sizing: border-box; - padding: 34rpx 40rpx; + padding: 0rpx 40rpx; position: relative; display: flex; /* display: flex; @@ -382,7 +383,7 @@ margin-bottom: 20rpx; grid-template-rows: 214rpx; grid-gap: 17rpx; height: 188rpx; - margin-top:50rpx ; + margin-top:70rpx ; } .image-list-2 { height: 428rpx !important; @@ -512,4 +513,5 @@ margin-bottom: 20rpx; text-align: left; white-space: nowrap; line-height: 42rpx; + margin-top: 10rpx; } \ No newline at end of file diff --git a/subpages/addhouse/pages/addhouse/addhouse.wxss b/subpages/addhouse/pages/addhouse/addhouse.wxss index 2525c76..3e0015f 100644 --- a/subpages/addhouse/pages/addhouse/addhouse.wxss +++ b/subpages/addhouse/pages/addhouse/addhouse.wxss @@ -131,13 +131,13 @@ page { line-height: 100rpx; font-size: 32rpx; font-family: PingFang SC; - font-weight: 500; + font-weight: 300; color: #666666; position: relative; } .form_card .form_item .label .must{ font-size: 32rpx; - font-weight: 500; + font-weight: 300; color: #FF2A00; position: absolute; left: -18rpx; diff --git a/subpages/businessRecord/businessRecord.wxss b/subpages/businessRecord/businessRecord.wxss index 57ed3e4..82a72ec 100644 --- a/subpages/businessRecord/businessRecord.wxss +++ b/subpages/businessRecord/businessRecord.wxss @@ -1,7 +1,7 @@ .tag-list { display: flex; flex-wrap: wrap; /* 使得元素可以换行显示 */ - margin: 0 -8rpx; + margin: 20rpx 0 0 -8rpx; /* margin-bottom: 15px; */ } .tag-list .tag { @@ -140,12 +140,12 @@ .cell1:nth-child(2) { flex-basis: 40%; - font-size: 30rpx; + font-size: 23rpx; } .cell1:nth-child(3) { padding-left: 20rpx; flex-basis: 33%; - font-size: 30rpx; + font-size: 23rpx; } .even { diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml index d620d8b..cf64c87 100644 --- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml +++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml @@ -8,8 +8,8 @@ 已提交人数:{{item.personQty}} - - + + diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss index 9e0fd99..5d8ac65 100644 --- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss +++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss @@ -237,12 +237,10 @@ page { color: rgba(255,255,255,1); font-size: 30rpx; font-family: PingFang-SC-Medium; - font-weight: 500; + font-weight: 300; white-space: nowrap; line-height: 42rpx; - margin-bottom: 10rpx; - margin-left: 5rpx; - + text-align: center; } diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss index 69dfb38..3af962e 100644 --- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss @@ -455,6 +455,7 @@ color: #333; } .telInput{ margin-left: 40rpx; + font-weight: 300 } .di-name{ @@ -462,6 +463,7 @@ color: #333; text-align: left; width: calc(100% - 30rpx); margin-left: 40rpx; + font-weight: 300; } .di-but{ @@ -568,6 +570,7 @@ background: rgb(175, 1, 1); align-items: center; color: #999; font-size: 28rpx; + font-weight: 300; } .radio-group radio + radio { margin-left: 20rpx; diff --git a/subpages/house/pages/housePortrait/housePortrait.wxss b/subpages/house/pages/housePortrait/housePortrait.wxss index 5298c04..7a8f19e 100644 --- a/subpages/house/pages/housePortrait/housePortrait.wxss +++ b/subpages/house/pages/housePortrait/housePortrait.wxss @@ -49,8 +49,8 @@ } .card .field { - font-size: 30rpx; - font-weight: 500; + font-size: 32rpx; + font-weight: 300; color: #999999; margin-top: 20rpx; } @@ -63,8 +63,8 @@ } .card .line .field { - font-size: 30rpx; - font-weight: 500; + font-size: 32rpx; + font-weight: 300; color: #999999; margin-top: 20rpx; flex: 0 0 30%; @@ -87,7 +87,7 @@ .logs-top-title { height: 31rpx; font-family: PingFang SC; - font-weight: 500; + font-weight: 300; font-size: 32rpx; color: #333333; line-height: 41rpx; @@ -96,7 +96,7 @@ .logs-top-time { height: 20rpx; font-family: PingFang SC; - font-weight: 500; + font-weight: 300; font-size: 26rpx; color: #BDBDBD; line-height: 40rpx; @@ -125,6 +125,7 @@ } .logs-content-txt { + font-weight: 300; color: #333333; } diff --git a/subpages/morenews/pages/morenews/morenews.wxml b/subpages/morenews/pages/morenews/morenews.wxml index 33387d4..b9c4cd6 100644 --- a/subpages/morenews/pages/morenews/morenews.wxml +++ b/subpages/morenews/pages/morenews/morenews.wxml @@ -15,7 +15,7 @@ {{item.content}} - {{item.readFlag != '1'?'未读':'已读'}} + {{item.readFlag != '1'?'未读':'已读'}} 测评打分: diff --git a/subpages/morenews/pages/morenews/morenews.wxss b/subpages/morenews/pages/morenews/morenews.wxss index 8ad51e4..af4c707 100644 --- a/subpages/morenews/pages/morenews/morenews.wxss +++ b/subpages/morenews/pages/morenews/morenews.wxss @@ -122,8 +122,7 @@ page { } .content .card .right .title{ font-size: 32rpx; - font-family: PingFang SC; - font-weight: 500; + font-weight: 300; color: #333333; overflow: hidden; text-overflow: ellipsis; @@ -145,6 +144,7 @@ page { text-overflow: ellipsis; white-space: nowrap; max-width: 250rpx; + font-weight: 300; } .content .card .right .bottom .flex_box{ display: flex; diff --git a/subpages/nohouse/pages/nohouse/nohouse.wxss b/subpages/nohouse/pages/nohouse/nohouse.wxss index bdbdd08..b3f9959 100644 --- a/subpages/nohouse/pages/nohouse/nohouse.wxss +++ b/subpages/nohouse/pages/nohouse/nohouse.wxss @@ -129,8 +129,10 @@ line-height: 46rpx; text-align: left; white-space: nowrap; line-height: 42rpx; + font-weight: 300; } .from_test2{ + font-weight: 300; display: flex; overflow-wrap: break-word; color: rgba(51,51,51,1); diff --git a/subpages/residentCategory/pages/residentCategory/residentCategory.wxss b/subpages/residentCategory/pages/residentCategory/residentCategory.wxss index 950ba55..03e6b85 100644 --- a/subpages/residentCategory/pages/residentCategory/residentCategory.wxss +++ b/subpages/residentCategory/pages/residentCategory/residentCategory.wxss @@ -420,7 +420,7 @@ page{ .text-wrapper_12 { width: 263rpx; - height: 28rpx; + height: 30rpx; overflow-wrap: break-word; font-size: 0rpx; font-family: PingFang-SC-Medium; @@ -438,7 +438,7 @@ page{ color: rgba(153, 153, 153, 1); font-size: 30rpx; font-family: PingFang-SC-Medium; - font-weight: 500; + font-weight: 300; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -451,7 +451,7 @@ page{ color: rgba(51, 51, 51, 1); font-size: 30rpx; font-family: PingFang-SC-Medium; - font-weight: 500; + font-weight: 300; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -459,7 +459,7 @@ page{ .text-wrapper_13 { width: 415rpx; - height: 28rpx; + height: 30rpx; overflow-wrap: break-word; font-size: 0rpx; font-family: PingFang-SC-Medium; @@ -539,7 +539,7 @@ page{ margin-top: 10rpx; box-sizing: border-box; border-bottom: 1rpx #EAEAEA solid; - height: 210rpx; + height: 230rpx; padding-bottom: 10rpx; margin-bottom: 20rpx; @@ -577,7 +577,7 @@ page{ color: rgba(51, 51, 51, 1); font-size: 30rpx; font-family: PingFang-SC-Medium; - font-weight: 500; + font-weight: 300; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -603,7 +603,7 @@ page{ color: rgba(153, 153, 153, 1); font-size: 30rpx; font-family: PingFang-SC-Medium; - font-weight: 500; + font-weight: 300; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -616,7 +616,7 @@ page{ color: rgba(51, 51, 51, 1); font-size: 30rpx; font-family: PingFang-SC-Medium; - font-weight: 500; + font-weight: 300; text-align: left; white-space: nowrap; line-height: 40rpx; diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml index 7d2a5be..594f2df 100644 --- a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml +++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxml @@ -1,6 +1,6 @@ - + {{ cascaderName ? cascaderName : '按管辖范围' }} diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss index a34e3ea..5ae0ae2 100644 --- a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss +++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss @@ -31,6 +31,19 @@ page{ display: flex; margin: 16rpx 0 0 20rpx; } +.card_oneupdate{ + display: flex; + align-items: center; + justify-content: center; + border-radius: 28rpx; + width: 273rpx; + height: 57rpx; + border: 1px solid rgba(193,193,193,1); + flex-direction: row; + display: flex; + margin: 16rpx 0 0 20rpx; + background-color: #F5F5F5; +} .text1{ overflow-wrap: break-word; color: rgba(193,193,193,1); @@ -113,6 +126,7 @@ page{ margin: 20rpx; border-bottom: 1px solid #ddd; height: 240rpx; + padding-bottom: 20rpx; } .line { width: 533rpx; @@ -199,6 +213,7 @@ page{ height:50rpx; overflow-x: scroll; text-align: center; + margin-left: 10rpx } .information_1 { display: flex; @@ -217,17 +232,18 @@ page{ height: 28rpx; overflow-wrap: break-word; color: rgba(153, 153, 153, 1); - font-size: 26rpx; + font-size: 30rpx; text-align: left; white-space: nowrap; line-height: 40rpx; + } .text_4{ width: 243rpx; height: 28rpx; overflow-wrap: break-word; color: rgba(4, 184, 173, 1); - font-size: 28rpx; + font-size: 30rpx; font-family: PingFang-SC-Bold; font-weight: 700; text-align: left; @@ -235,6 +251,7 @@ page{ line-height: 40rpx; } .phone{ + padding-top: 5rpx; width: 533rpx; height: 29rpx; flex-direction: row; diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss index 9fbbb06..78036c4 100644 --- a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss +++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss @@ -14,7 +14,7 @@ imageup{ .form_add{ width: 100%; height: 100%; - padding:29rpx; + padding:0rpx; box-sizing: border-box; display: flex; flex-direction: column; @@ -34,23 +34,24 @@ imageup{ margin-top:20rpx ; } .prosecutors{ - width: 650rpx; + width: 670rpx; display: flex; flex-direction:row; align-items: center; - margin: 20rpx; - height: 80rpx; + margin: 0 20rpx; + height: 90rpx; } .conclusion{ display: flex; flex-direction: row; + height: 50rpx; } .nes{ width: 630rpx; display: flex; flex-direction:row; align-items: center; - margin: 20rpx; + margin: 10rpx 20rpx; justify-content: space-between; height: 80rpx; border-bottom: 1px solid #EAEAEA; @@ -83,7 +84,7 @@ imageup{ text-align: left; white-space: nowrap; line-height: 42rpx; - margin-left: 20rpx; + margin-left: 40rpx; } .prosecutors_name{ width: 150px; @@ -162,7 +163,7 @@ imageup{ .textarea1{ margin-top: 20rpx; background-color:#f7f7f7 ; - width: 100%; + width: 600rpx; height: 200rpx; } .text2{ @@ -297,11 +298,11 @@ imageup{ .checkbox1{ display: flex; flex-direction:column; - margin-left: 50rpx; + margin-left: 60rpx; margin-bottom: 20rpx; } .input1{ - width: 650rpx; + width: 600rpx; height: 90rpx; background-color: #F7F7F7; border-radius: 10rpx; @@ -360,13 +361,13 @@ margin-bottom: 20rpx; z-index: 2; } .image-box { - width: 100%; + width: 650rpx; height: auto; border-radius: 16rpx; background: #fff; margin-top: 20rpx; box-sizing: border-box; - padding: 34rpx 60rpx; + padding: 10rpx 60rpx; position: relative; } .group{ @@ -375,7 +376,7 @@ margin-bottom: 20rpx; .image-box .image-list-label { position: absolute; - top: 35rpx; + top: 0rpx; } .image-box .add-icon { /* margin-top: 40rpx; */ @@ -390,7 +391,7 @@ margin-bottom: 20rpx; grid-template-rows: 214rpx; grid-gap: 17rpx; height: 188rpx; - margin-top:80rpx ; + margin-top:60rpx ; } .image-list-2 { height: 428rpx !important; diff --git a/subpages/searchResult/pages/resiInfo/resiInfo.wxss b/subpages/searchResult/pages/resiInfo/resiInfo.wxss index f072bde..8a11467 100644 --- a/subpages/searchResult/pages/resiInfo/resiInfo.wxss +++ b/subpages/searchResult/pages/resiInfo/resiInfo.wxss @@ -311,8 +311,7 @@ page { .logs-top-title { height: 31rpx; - font-family: PingFang SC; - font-weight: 500; + font-weight: 300; font-size: 32rpx; color: #333333; line-height: 41rpx; @@ -320,8 +319,7 @@ page { .logs-top-time { height: 20rpx; - font-family: PingFang SC; - font-weight: 500; + font-weight: 300; font-size: 26rpx; color: #BDBDBD; line-height: 40rpx; @@ -351,6 +349,8 @@ page { .logs-content-txt { color: #333333; + font-weight: 300; + font-size: 28rpx; } .item-dian { diff --git a/subpages/securityCheck/pages/securityCheck.wxml b/subpages/securityCheck/pages/securityCheck.wxml index c3a83c6..ee3388a 100644 --- a/subpages/securityCheck/pages/securityCheck.wxml +++ b/subpages/securityCheck/pages/securityCheck.wxml @@ -1,12 +1,14 @@ - + + 待复核 已合格 - + + @@ -35,7 +37,7 @@ - + diff --git a/subpages/securityCheck/pages/securityCheck.wxss b/subpages/securityCheck/pages/securityCheck.wxss index 4782762..259b177 100644 --- a/subpages/securityCheck/pages/securityCheck.wxss +++ b/subpages/securityCheck/pages/securityCheck.wxss @@ -20,10 +20,17 @@ page{ /* justify-content: space-between; */ padding-top: 20rpx; box-sizing: border-box; + justify-content: center; } .filter{ - margin-left: 10rpx; - margin-right: 40rpx; + + margin-left: 50rpx; + margin-right: 60rpx; +} +.row1{ + display: flex; + flex-direction: row; + font-size: 30rpx } .box_2 { background-color: rgba(247,247,247,1.000000); @@ -177,8 +184,8 @@ margin-left: 30rpx; } .image-wrapper{ - width: 200rpx; - height: 200rpx; + width: 190rpx; + height: 190rpx; } diff --git a/utils/config.js b/utils/config.js index a32a3d6..882d6cc 100644 --- a/utils/config.js +++ b/utils/config.js @@ -5,8 +5,8 @@ module.exports = { }; function BASEURL() { - return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 - // return 'http://192.168.1.144/api/' //测试环境 + // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 + return 'http://192.168.1.144/api/' //测试环境 // return 'http://219.146.91.110:30801/api/' // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 // return 'http://192.168.1.144/api/' //测试环境