diff --git a/app.wxss b/app.wxss index c5c0fdc..4d49b2e 100644 --- a/app.wxss +++ b/app.wxss @@ -7,12 +7,19 @@ justify-content: space-between; padding: 200rpx 0; box-sizing: border-box; + font-family: "PingFangSC-Regular", sans-serif; } + page { --calendar-range-edge-background-color: #3E92FF; --calendar-range-middle-color: #81B5FB; --button-danger-background-color: linear-gradient(87deg, #81B5FB 0%, #3E92FF 100%); --button-danger-border-color: 'none'; --calendar-selected-day-background-color: #3E92FF; - + font-family: "PingFangSC-Regular", sans-serif; + } +@font-face { + font-family: "PingFangSC-Regular"; + src: url(/images/pingfangheiti.ttf) format('truetype'); +} \ No newline at end of file diff --git a/images/pingfangheiti.ttf b/images/pingfangheiti.ttf new file mode 100644 index 0000000..1166983 Binary files /dev/null and b/images/pingfangheiti.ttf differ diff --git a/pages/index/index.js b/pages/index/index.js index 2836a0f..89d75e7 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -35,7 +35,19 @@ Page({ share:app.globalData.share, }) this.getInspRecord() - + wx.loadFontFace({ + family: 'PingFangSC-regular', + source: 'url("https://www.your-server.com/PingFangSC-Medium.ttf")', + success: function() { + console.log('Font loaded successfully'); + }, + fail: function(error) { + console.error('Font loading failed', error); + }, + complete: function() { + console.log('Font loading process complete'); + } + }); }, onShareAppMessage() { return{ diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 35575c9..549e208 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -7,6 +7,7 @@ page { flex-direction: column; background-color: #f7f7f7; /* z-index: -9999; */ + font-family: 'PingFangSC-regular', sans-serif; } .header { display: flex; @@ -358,7 +359,6 @@ page { white-space: nowrap; line-height: 36rpx; margin-top: 14rpx; - font-weight: 300; } .text-group_5 { position: absolute; @@ -389,7 +389,6 @@ page { white-space: nowrap; line-height: 36rpx; margin-top: 12rpx; - font-weight: 300; } .group_4 { @@ -435,7 +434,6 @@ page { white-space: nowrap; line-height: 36rpx; text-align: right;margin-top: 20rpx; - font-weight: 300; } .text-group_7 { @@ -472,7 +470,6 @@ page { line-height: 36rpx; text-align: right; margin-top: 15rpx; - font-weight: 300; } @@ -770,7 +767,6 @@ page { .more{ font-size: 28rpx; color: #B4B4B4; - font-weight: 300; line-height: 36rpx; } .Information{ @@ -784,7 +780,7 @@ page { height: 110rpx; display: flex; flex-direction: column; - margin: 10rpx 30rpx 0 30rpx; + margin: 15rpx 30rpx 0 30rpx; } .Information_one{ display: flex; @@ -801,7 +797,6 @@ page { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - font-weight: 300; } .Information_test2{ width: 60rpx; @@ -809,7 +804,6 @@ page { font-size: 26rpx; color: #666666; line-height: 40rpx; - font-weight: 300; } .Information_two{ display: flex; @@ -905,7 +899,6 @@ line-height: 40rpx; font-size: 32rpx; color: #333333; line-height: 52rpx; - font-weight: 300; } .new_submitt{ margin-top: 20rpx; @@ -933,8 +926,6 @@ line-height: 40rpx; text-overflow: ellipsis; white-space: nowrap; font-size: 32rpx; - font-family: "PingFang SC", "Helvetica Neue", Arial, sans-serif; - font-weight: 500; } .list_card:last-child { @@ -956,7 +947,6 @@ line-height: 40rpx; font-size: 32rpx; color: #333333; line-height: 52rpx; -font-weight: 300; } .new_submit{ margin-top: 30rpx; @@ -1018,7 +1008,7 @@ font-weight: 300; justify-content: space-between; font-size: 32rpx; margin-left: 20rpx; - font-weight: 300; + font-family: PingFangSC-regular; } .img_door{ @@ -1039,5 +1029,4 @@ font-weight: 300; .card_text{ margin-left: 20rpx; font-size: 32rpx; - font-weight: 300; } \ No newline at end of file diff --git a/pages/resiAndHouse/resiAndHouse.js b/pages/resiAndHouse/resiAndHouse.js index 1b811f9..9d6057e 100644 --- a/pages/resiAndHouse/resiAndHouse.js +++ b/pages/resiAndHouse/resiAndHouse.js @@ -113,6 +113,19 @@ Page({ this.getAllOrgCategoryCount() this.getTableData() this.getTopTreeData() + wx.loadFontFace({ + family: 'PingFangSC-regular', + source: 'url("https://img2.misssixty.com.cn/rs/lib/fonts/PingFangSC-regular.ttf")', + success: function() { + console.log('Font loaded successfully'); + }, + fail: function(error) { + console.error('Font loading failed', error); + }, + complete: function() { + console.log('Font loading process complete'); + } + }); }, // /** diff --git a/pages/resiAndHouse/resiAndHouse.wxss b/pages/resiAndHouse/resiAndHouse.wxss index 0a9fe63..5a43b5b 100644 --- a/pages/resiAndHouse/resiAndHouse.wxss +++ b/pages/resiAndHouse/resiAndHouse.wxss @@ -469,12 +469,11 @@ page { } .text_16 { + font-family: 'PingFangSC-regular', sans-serif; width: fit-content; overflow-wrap: break-word; color: rgba(51, 51, 51, 1); font-size: 34rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; text-align: left; white-space: nowrap; line-height: 41rpx; @@ -522,7 +521,8 @@ page { .text-wrapper_9 .label{ color: #999999; width: 235rpx; - font-weight: 300; + font-family: 'PingFangSC-regular', sans-serif; + } .text-wrapper_9 .value{ color: #04b8ad; @@ -644,8 +644,7 @@ page { height: 28rpx; overflow-wrap: break-word; font-size: 0rpx; - font-family: PingFang-SC-Medium; - font-weight: 300; + font-family: 'PingFangSC-regular', sans-serif; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -680,12 +679,11 @@ page { height: 30rpx; overflow-wrap: break-word; font-size: 0rpx; - font-family: PingFang-SC-Medium; - font-weight: 300; text-align: left; white-space: nowrap; line-height: 40rpx; margin: 20rpx 0 0 0; + font-family: 'PingFangSC-regular', sans-serif; } .text_27 { @@ -726,7 +724,7 @@ page { white-space: nowrap; line-height: 40rpx; margin: 20rpx 0 0 0; - font-weight: 300; + } .text_30 { @@ -762,31 +760,9 @@ page { 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; -} -.text_33 { - width: 537rpx; - 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; -} + + .image_6 { width: 650rpx; @@ -802,19 +778,7 @@ page { margin: 28rpx 0 0 31rpx; } -.text_34 { - width: 83rpx; - height: 32rpx; - overflow-wrap: break-word; - color: rgba(51, 51, 51, 1); - font-size: 34rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; - text-align: left; - white-space: nowrap; - line-height: 41rpx; - margin-top: 2rpx; -} + .text-wrapper_23 { background-color: rgba(236, 236, 236, 0.500000); diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss index e76c44e..089acec 100644 --- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss +++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss @@ -52,8 +52,7 @@ page { overflow-wrap: break-word; color: rgba(51,51,51,1); font-size: 32rpx; - font-family: PingFang-SC-Regular; - font-weight: normal; + font-family: "PingFangSC-Regular", sans-serif; text-align: left; white-space: nowrap; line-height: 42rpx; diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml index 2a1363c..1e686fa 100644 --- a/subpages/addResi/pages/addResi/addResi.wxml +++ b/subpages/addResi/pages/addResi/addResi.wxml @@ -153,13 +153,11 @@ - + + - - + - - diff --git a/subpages/addResi/pages/addResi/addResi.wxss b/subpages/addResi/pages/addResi/addResi.wxss index dded2b1..82b6156 100644 --- a/subpages/addResi/pages/addResi/addResi.wxss +++ b/subpages/addResi/pages/addResi/addResi.wxss @@ -94,8 +94,6 @@ page { height: 100%; line-height: 100rpx; font-size: 32rpx; - font-family: PingFang SC; - font-weight: 500; color: #666666; position: relative; } diff --git a/subpages/addhouse/pages/addhouse/addhouse.wxss b/subpages/addhouse/pages/addhouse/addhouse.wxss index 3e0015f..85f42ba 100644 --- a/subpages/addhouse/pages/addhouse/addhouse.wxss +++ b/subpages/addhouse/pages/addhouse/addhouse.wxss @@ -80,7 +80,7 @@ page { padding: 0 20rpx; box-sizing: border-box; position: relative; - top: -60rpx; + top: -50rpx; } .form_card { background-color: #fff; @@ -131,13 +131,11 @@ page { line-height: 100rpx; font-size: 32rpx; font-family: PingFang SC; - font-weight: 300; color: #666666; position: relative; } .form_card .form_item .label .must{ font-size: 32rpx; - font-weight: 300; color: #FF2A00; position: absolute; left: -18rpx; diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js index 65a7373..9748c0b 100644 --- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js +++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.js @@ -29,6 +29,19 @@ Page({ keyWord:options.keyWord }) this.getTable() + wx.loadFontFace({ + family: 'PingFangSC-regular', + source: 'url("https://img2.misssixty.com.cn/rs/lib/fonts/PingFangSC-regular.ttf")', + success: function() { + console.log('Font loaded successfully'); + }, + fail: function(error) { + console.error('Font loading failed', error); + }, + complete: function() { + console.log('Font loading process complete'); + } + }); }, /** diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml index cf64c87..16ce4f0 100644 --- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml +++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxml @@ -9,7 +9,7 @@ - + diff --git a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss index 5d8ac65..4898005 100644 --- a/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss +++ b/subpages/communitySelfInsp/pages/historyQuery/historyQuery.wxss @@ -3,6 +3,7 @@ page { min-height: 100vh; overflow: hidden; background-color: #f0f0f0; + font-family: 'PingFangSC-regular', sans-serif; } .content{ height: auto; @@ -42,8 +43,7 @@ page { flex-direction: column; justify-content: space-between; font-size: 32rpx; - font-family: PingFang SC; - font-weight: 500; + font-family: 'PingFangSC-regular', sans-serif; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -147,7 +147,7 @@ page { overflow-wrap: break-word; color: rgba(51,51,51,1); font-size: 35rpx; - font-family: PingFang-SC-Bold; + font-family: 'PingFangSC-regular', sans-serif; font-weight: 700; text-align: left; white-space: nowrap; @@ -207,6 +207,7 @@ page { width: 160rpx; justify-content: center; align-items: center; + } .button1{ width: 160rpx; @@ -232,7 +233,7 @@ page { } .text_two{ width: 118rpx; - height: 28rpx; + height: 40rpx; overflow-wrap: break-word; color: rgba(255,255,255,1); font-size: 30rpx; diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml index f3d1d84..c34eba0 100644 --- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml @@ -10,7 +10,8 @@ 所属组织 - {{agencyName?agencyName:'请选择-'}} + {{agencyName?agencyName:'请选择-'}} + diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss index 3af962e..dc3db37 100644 --- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss @@ -455,7 +455,6 @@ color: #333; } .telInput{ margin-left: 40rpx; - font-weight: 300 } .di-name{ @@ -463,9 +462,16 @@ color: #333; text-align: left; width: calc(100% - 30rpx); margin-left: 40rpx; - font-weight: 300; + font-family: "PingFangSC-Regular", sans-serif; +} +.di-name1{ + margin-right: 14rpx; + text-align: left; + width: calc(100% - 30rpx); + margin-left: 40rpx; + font-family: "PingFangSC-Regular", sans-serif; + color: #999; } - .di-but{ width: 30rpx; height: 34rpx; diff --git a/subpages/nohouse/pages/nohouse/nohouse.js b/subpages/nohouse/pages/nohouse/nohouse.js index 8607d38..cb1cd10 100644 --- a/subpages/nohouse/pages/nohouse/nohouse.js +++ b/subpages/nohouse/pages/nohouse/nohouse.js @@ -40,6 +40,19 @@ orgId:'' // this.getAgencygridtree(); this.getTopTreeData(); this.waitCollectHouseList() + wx.loadFontFace({ + family: 'PingFangSC-regular', + source: 'url("https://img2.misssixty.com.cn/rs/lib/fonts/PingFangSC-regular.ttf")', + success: function() { + console.log('Font loaded successfully'); + }, + fail: function(error) { + console.error('Font loading failed', error); + }, + complete: function() { + console.log('Font loading process complete'); + } + }); }, /** diff --git a/subpages/nohouse/pages/nohouse/nohouse.wxss b/subpages/nohouse/pages/nohouse/nohouse.wxss index b3f9959..47f68bd 100644 --- a/subpages/nohouse/pages/nohouse/nohouse.wxss +++ b/subpages/nohouse/pages/nohouse/nohouse.wxss @@ -4,6 +4,7 @@ page{ min-height: 100vh; overflow: hidden; background: #F7F7F7; + font-family: 'PingFangSC-regular', sans-serif; } .header{ @@ -129,7 +130,7 @@ line-height: 46rpx; text-align: left; white-space: nowrap; line-height: 42rpx; - font-weight: 300; + font-family: 'PingFangSC-regular', sans-serif; } .from_test2{ font-weight: 300; diff --git a/subpages/residentCategory/pages/residentCategory/residentCategory.wxss b/subpages/residentCategory/pages/residentCategory/residentCategory.wxss index 03e6b85..8b2e754 100644 --- a/subpages/residentCategory/pages/residentCategory/residentCategory.wxss +++ b/subpages/residentCategory/pages/residentCategory/residentCategory.wxss @@ -103,8 +103,7 @@ page{ overflow-wrap: break-word; color: rgba(57,116,246,1); font-size: 30rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; + font-family: 'PingFangSC-regular', sans-serif; text-align: left; white-space: nowrap; line-height: 52rpx; @@ -437,8 +436,7 @@ page{ overflow-wrap: break-word; color: rgba(153, 153, 153, 1); font-size: 30rpx; - font-family: PingFang-SC-Medium; - font-weight: 300; + font-family: 'PingFangSC-regular', sans-serif; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -450,8 +448,7 @@ page{ overflow-wrap: break-word; color: rgba(51, 51, 51, 1); font-size: 30rpx; - font-family: PingFang-SC-Medium; - font-weight: 300; + font-family: 'PingFangSC-regular', sans-serif; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -462,8 +459,7 @@ page{ height: 30rpx; overflow-wrap: break-word; font-size: 0rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; + font-family: 'PingFangSC-regular', sans-serif; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -501,8 +497,7 @@ page{ display: flex; width: 275rpx; overflow-wrap: break-word; - font-family: PingFang-SC-Medium; - font-weight: 500; + font-family: 'PingFangSC-regular', sans-serif; text-align: right; white-space: nowrap; line-height: 40rpx; @@ -521,7 +516,7 @@ page{ overflow-wrap: break-word; color: rgba(51, 51, 51, 1); font-size: 34rpx; - font-family: PingFang-SC-Medium; + font-family: 'PingFangSC-regular', sans-serif; font-weight: 500; text-align: left; white-space: nowrap; @@ -550,8 +545,7 @@ page{ overflow-wrap: break-word; color: rgba(153, 153, 153, 1); font-size: 30rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; + font-family: 'PingFangSC-regular', sans-serif; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -563,8 +557,7 @@ page{ overflow-wrap: break-word; color: rgba(153, 153, 153, 1); font-size: 30rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; + font-family: 'PingFangSC-regular', sans-serif; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -576,8 +569,7 @@ page{ overflow-wrap: break-word; color: rgba(51, 51, 51, 1); font-size: 30rpx; - font-family: PingFang-SC-Medium; - font-weight: 300; + font-family: 'PingFangSC-regular', sans-serif; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -588,7 +580,7 @@ page{ height: 28rpx; overflow-wrap: break-word; font-size: 0rpx; - font-family: PingFang-SC-Medium; + font-family: 'PingFangSC-regular', sans-serif; font-weight: 500; text-align: left; white-space: nowrap; @@ -602,7 +594,7 @@ page{ overflow-wrap: break-word; color: rgba(153, 153, 153, 1); font-size: 30rpx; - font-family: PingFang-SC-Medium; + font-family: 'PingFangSC-regular', sans-serif; font-weight: 300; text-align: left; white-space: nowrap; @@ -615,8 +607,7 @@ page{ overflow-wrap: break-word; color: rgba(51, 51, 51, 1); font-size: 30rpx; - font-family: PingFang-SC-Medium; - font-weight: 300; + font-family: 'PingFangSC-regular', sans-serif; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -627,7 +618,7 @@ page{ height: 28rpx; overflow-wrap: break-word; font-size: 0rpx; - font-family: PingFang-SC-Medium; + font-family: 'PingFangSC-regular', sans-serif; font-weight: 500; text-align: left; white-space: nowrap; @@ -641,8 +632,7 @@ page{ overflow-wrap: break-word; color: rgba(153, 153, 153, 1); font-size: 30rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; + font-family: 'PingFangSC-regular', sans-serif; text-align: left; white-space: nowrap; line-height: 40rpx; diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.js b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.js index 27baf58..1e0536e 100644 --- a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.js +++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.js @@ -57,6 +57,19 @@ Page({ this.getDicts() this.getTopTreeData() this.WaitResidentsList() + wx.loadFontFace({ + family: 'PingFangSC-regular', + source: 'url("https://img2.misssixty.com.cn/rs/lib/fonts/PingFangSC-regular.ttf")', + success: function() { + console.log('Font loaded successfully'); + }, + fail: function(error) { + console.error('Font loading failed', error); + }, + complete: function() { + console.log('Font loading process complete'); + } + }); }, // 进行树状懒加载 getTopTreeData() { diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss index 5ae0ae2..972f1a0 100644 --- a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss +++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss @@ -5,6 +5,7 @@ page{ overflow-y: auto; overflow-x: hidden; background: #F7F7F7; + font-family: 'PingFangSC-regular', sans-serif; } .header{ display: flex; @@ -48,8 +49,7 @@ page{ overflow-wrap: break-word; color: rgba(193,193,193,1); font-size: 30rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; + font-family: 'PingFangSC-regular', sans-serif; text-align: left; white-space: nowrap; line-height: 52rpx; @@ -147,8 +147,7 @@ page{ height: 29rpx; overflow-wrap: break-word; font-size: 0rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; + font-family: 'PingFangSC-regular', sans-serif; text-align: center; white-space: nowrap; line-height: 40rpx; @@ -244,8 +243,7 @@ page{ overflow-wrap: break-word; color: rgba(4, 184, 173, 1); font-size: 30rpx; - font-family: PingFang-SC-Bold; - font-weight: 700; + font-family: 'PingFangSC-regular', sans-serif; text-align: left; white-space: nowrap; line-height: 40rpx;