diff --git a/pages/index/index.js b/pages/index/index.js index 0daa42c..714b4cc 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -17,7 +17,7 @@ Page({ nodata:false, emptyHouseNum:'', catesNonIntResiNum:'', - readFlag:'0', + readFlag:'1', agencyName:'--' }, diff --git a/pages/index/index.wxml b/pages/index/index.wxml index bb6a8f2..0caee3d 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,5 +1,4 @@ - - + {{agencyName}} diff --git a/pages/index/index.wxss b/pages/index/index.wxss index aa9e704..3cbcf2d 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -530,9 +530,6 @@ 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; @@ -561,12 +558,8 @@ .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; @@ -610,9 +603,6 @@ 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 43rpx; @@ -647,9 +637,6 @@ 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; @@ -942,14 +929,12 @@ line-height: 52rpx; } .more{ - font-family: PingFang SC; - font-weight: 500; font-size: 28rpx; color: #B4B4B4; line-height: 36rpx; } .Information{ - height: 100rpx; + height: 110rpx; display: flex; flex-direction: column; margin: 10rpx 30rpx 30rpx 30rpx; @@ -963,8 +948,6 @@ .Information_test{ width: 490rpx; height: auto; - font-family: PingFang SC; - /* font-weight: 500; */ font-size: 32rpx; color: #333333; line-height: 32rpx; @@ -975,8 +958,6 @@ .Information_test2{ width: 60rpx; height: auto; - font-family: PingFang SC; - font-weight: 500; font-size: 26rpx; color: #666666; line-height: 40rpx; @@ -984,13 +965,11 @@ .Information_two{ display: flex; justify-content: space-between; - margin: 23rpx 0 0 0rpx; + margin: 20rpx 0 0 0rpx; } .Information_test3{ width: 169rpx; height: auto; -font-family: PingFang SC; -font-weight: 500; font-size: 28rpx; color: #999999; line-height: 40rpx; @@ -998,8 +977,6 @@ line-height: 40rpx; .Information_test4{ width: auto; height: auto; -font-family: PingFang SC; -font-weight: 500; font-size: 26rpx; color: #C1C1C1; line-height: 40rpx; diff --git a/pages/resiAndHouse/resiAndHouse.wxss b/pages/resiAndHouse/resiAndHouse.wxss index 1062119..0f7f131 100644 --- a/pages/resiAndHouse/resiAndHouse.wxss +++ b/pages/resiAndHouse/resiAndHouse.wxss @@ -655,9 +655,7 @@ page { 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; } @@ -668,8 +666,7 @@ page { 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; @@ -691,13 +688,8 @@ page { .text_27 { width: 415rpx; 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; } @@ -707,8 +699,6 @@ page { 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; @@ -720,9 +710,6 @@ page { 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; } @@ -746,8 +733,6 @@ page { 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; @@ -759,8 +744,6 @@ page { 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; @@ -771,8 +754,6 @@ page { height: 28rpx; overflow-wrap: break-word; font-size: 0rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -1355,11 +1336,15 @@ page { .box_17 .tabs .tab_item .num { font-weight: 400; font-size: 36rpx; + font-weight: 550; + color: #333333; } .box_17 .tabs .tab_item_fw .num { font-weight: 400; font-size: 36rpx; + font-weight: 550; + color: #333333; } .box_17 .tabs .tab_item_fw .name { diff --git a/pages/work2/work2.wxss b/pages/work2/work2.wxss index 792e98a..0f88a7b 100644 --- a/pages/work2/work2.wxss +++ b/pages/work2/work2.wxss @@ -198,8 +198,6 @@ overflow-wrap: break-word; color: rgba(51,51,51,1); font-size: 28rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; text-align: left; white-space: nowrap; line-height: 28rpx; @@ -211,13 +209,10 @@ overflow-wrap: break-word; color: rgba(51,51,51,1); font-size: 28rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; text-align: left; white-space: nowrap; line-height: 28rpx; margin-top: 15rpx; - } .text_5-0 { width: 109rpx; @@ -225,8 +220,6 @@ overflow-wrap: break-word; color: rgba(51,51,51,1); font-size: 28rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; text-align: right; white-space: nowrap; line-height: 28rpx; @@ -266,12 +259,6 @@ width: 100rpx; height: 100rpx; } - - - - - - .image_14-1 { width: 100rpx; height: 100rpx; @@ -291,8 +278,6 @@ 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: 42rpx; @@ -308,8 +293,6 @@ overflow-wrap: break-word; color: rgba(51,51,51,1); font-size: 28rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; text-align: left; white-space: nowrap; line-height: 28rpx; diff --git a/subpages/nohouse/pages/nohouse/nohouse.wxss b/subpages/nohouse/pages/nohouse/nohouse.wxss index dca1642..37b4d58 100644 --- a/subpages/nohouse/pages/nohouse/nohouse.wxss +++ b/subpages/nohouse/pages/nohouse/nohouse.wxss @@ -121,8 +121,6 @@ line-height: 46rpx; justify-content: space-between; padding: 30rpx 10rpx; border-bottom: 2rpx solid #EAEAEA; - - } .from_test1{ display: flex; @@ -139,8 +137,6 @@ line-height: 46rpx; 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; diff --git a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss index 08864b0..968f8c2 100644 --- a/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss +++ b/subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss @@ -141,7 +141,8 @@ text-align: center; .lable{ display: block; width:auto; - height: 40rpx; + height: 35rpx; + line-height:35rpx; /* background: #f6f6f6; */ margin-left: 20rpx; /* color:red; */ @@ -174,7 +175,7 @@ text-align: center; text-align: center; white-space: nowrap; line-height: 42rpx; - margin-right: 20rpx; + margin-right: 10rpx; margin-left: 10rpx; } @@ -184,8 +185,7 @@ text-align: center; overflow-wrap: break-word; color: rgba(51,51,51,1); font-size: 34rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; + font-weight: 400; text-align: left; white-space: nowrap; line-height: 41rpx; @@ -215,8 +215,6 @@ text-align: center; overflow-wrap: break-word; color: rgba(153, 153, 153, 1); font-size: 26rpx; - font-family: PingFang-SC-Medium; - font-weight: 500; text-align: left; white-space: nowrap; line-height: 40rpx; @@ -247,8 +245,6 @@ text-align: center; 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; @@ -276,8 +272,6 @@ text-align: center; 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; @@ -288,8 +282,6 @@ text-align: center; 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; @@ -305,8 +297,6 @@ text-align: center; 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; @@ -317,8 +307,6 @@ text-align: center; 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; diff --git a/utils/config.js b/utils/config.js index 06ba8aa..dce6c12 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/' // 演示环境