elink-star
/
epmet-work-mp
19
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'data-page-one' into data-page

lisu
mk 1 year ago
parent
81331c3f8f 255c258532
commit
b17fcf1197
8 changed files with 16 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pages/index/index.js
  2. 3
      pages/index/index.wxml
  3. 27
      pages/index/index.wxss
  4. 27
      pages/resiAndHouse/resiAndHouse.wxss
  5. 17
      pages/work2/work2.wxss
  6. 4
      subpages/nohouse/pages/nohouse/nohouse.wxss
  7. 20
      subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss
  8. 4
      utils/config.js

2
pages/index/index.js
View File

@ -17,7 +17,7 @@ Page({
nodata:false, nodata:false,
emptyHouseNum:'', emptyHouseNum:'',
catesNonIntResiNum:'', catesNonIntResiNum:'',
readFlag:'0', readFlag:'1',
agencyName:'--' agencyName:'--'
}, },

3
pages/index/index.wxml
View File

@ -1,5 +1,4 @@
<official-account></official-account> <view class="header">
<view class="header">
<view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;"> <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
<image src="/images/work2/Header.png" class="back" bindtap="back" mode="" /> <image src="/images/work2/Header.png" class="back" bindtap="back" mode="" />
<text lines="1" class="header_text_1" style=" top: {{statusHeight}}px;width: 50rpx;height: 50rpx;">{{agencyName}}</text> <text lines="1" class="header_text_1" style=" top: {{statusHeight}}px;width: 50rpx;height: 50rpx;">{{agencyName}}</text>

27
pages/index/index.wxss
View File

@ -530,9 +530,6 @@
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(102,102,102,1); color: rgba(102,102,102,1);
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 36rpx; line-height: 36rpx;
margin-top: 14rpx; margin-top: 14rpx;
@ -561,12 +558,8 @@
.text_11 { .text_11 {
width: 180rpx; width: 180rpx;
height: 25rpx; height: 25rpx;
overflow-wrap: break-word;
color: rgba(102,102,102,1); color: rgba(102,102,102,1);
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 36rpx; line-height: 36rpx;
margin-top: 12rpx; margin-top: 12rpx;
@ -610,9 +603,6 @@
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(102,102,102,1); color: rgba(102,102,102,1);
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 36rpx; line-height: 36rpx;
margin: 14rpx 0 0 43rpx; margin: 14rpx 0 0 43rpx;
@ -647,9 +637,6 @@
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(102,102,102,1); color: rgba(102,102,102,1);
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 36rpx; line-height: 36rpx;
margin-top: 14rpx; margin-top: 14rpx;
@ -942,14 +929,12 @@
line-height: 52rpx; line-height: 52rpx;
} }
.more{ .more{
font-family: PingFang SC;
font-weight: 500;
font-size: 28rpx; font-size: 28rpx;
color: #B4B4B4; color: #B4B4B4;
line-height: 36rpx; line-height: 36rpx;
} }
.Information{ .Information{
height: 100rpx; height: 110rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 10rpx 30rpx 30rpx 30rpx; margin: 10rpx 30rpx 30rpx 30rpx;
@ -963,8 +948,6 @@
.Information_test{ .Information_test{
width: 490rpx; width: 490rpx;
height: auto; height: auto;
font-family: PingFang SC;
/* font-weight: 500; */
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
line-height: 32rpx; line-height: 32rpx;
@ -975,8 +958,6 @@
.Information_test2{ .Information_test2{
width: 60rpx; width: 60rpx;
height: auto; height: auto;
font-family: PingFang SC;
font-weight: 500;
font-size: 26rpx; font-size: 26rpx;
color: #666666; color: #666666;
line-height: 40rpx; line-height: 40rpx;
@ -984,13 +965,11 @@
.Information_two{ .Information_two{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin: 23rpx 0 0 0rpx; margin: 20rpx 0 0 0rpx;
} }
.Information_test3{ .Information_test3{
width: 169rpx; width: 169rpx;
height: auto; height: auto;
font-family: PingFang SC;
font-weight: 500;
font-size: 28rpx; font-size: 28rpx;
color: #999999; color: #999999;
line-height: 40rpx; line-height: 40rpx;
@ -998,8 +977,6 @@ line-height: 40rpx;
.Information_test4{ .Information_test4{
width: auto; width: auto;
height: auto; height: auto;
font-family: PingFang SC;
font-weight: 500;
font-size: 26rpx; font-size: 26rpx;
color: #C1C1C1; color: #C1C1C1;
line-height: 40rpx; line-height: 40rpx;

27
pages/resiAndHouse/resiAndHouse.wxss
View File

@ -655,9 +655,7 @@ page {
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(153, 153, 153, 1); color: rgba(153, 153, 153, 1);
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
} }
@ -668,8 +666,7 @@ page {
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
@ -691,13 +688,8 @@ page {
.text_27 { .text_27 {
width: 415rpx; width: 415rpx;
height: 28rpx; height: 28rpx;
overflow-wrap: break-word;
color: rgba(153, 153, 153, 1); color: rgba(153, 153, 153, 1);
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
} }
@ -707,8 +699,6 @@ page {
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(153, 153, 153, 1); color: rgba(153, 153, 153, 1);
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
@ -720,9 +710,6 @@ page {
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
} }
@ -746,8 +733,6 @@ page {
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(153, 153, 153, 1); color: rgba(153, 153, 153, 1);
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
@ -759,8 +744,6 @@ page {
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
@ -771,8 +754,6 @@ page {
height: 28rpx; height: 28rpx;
overflow-wrap: break-word; overflow-wrap: break-word;
font-size: 0rpx; font-size: 0rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
@ -1355,11 +1336,15 @@ page {
.box_17 .tabs .tab_item .num { .box_17 .tabs .tab_item .num {
font-weight: 400; font-weight: 400;
font-size: 36rpx; font-size: 36rpx;
font-weight: 550;
color: #333333;
} }
.box_17 .tabs .tab_item_fw .num { .box_17 .tabs .tab_item_fw .num {
font-weight: 400; font-weight: 400;
font-size: 36rpx; font-size: 36rpx;
font-weight: 550;
color: #333333;
} }
.box_17 .tabs .tab_item_fw .name { .box_17 .tabs .tab_item_fw .name {

17
pages/work2/work2.wxss
View File

@ -198,8 +198,6 @@
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51,51,51,1); color: rgba(51,51,51,1);
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 28rpx; line-height: 28rpx;
@ -211,13 +209,10 @@
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51,51,51,1); color: rgba(51,51,51,1);
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 28rpx; line-height: 28rpx;
margin-top: 15rpx; margin-top: 15rpx;
} }
.text_5-0 { .text_5-0 {
width: 109rpx; width: 109rpx;
@ -225,8 +220,6 @@
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51,51,51,1); color: rgba(51,51,51,1);
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: right; text-align: right;
white-space: nowrap; white-space: nowrap;
line-height: 28rpx; line-height: 28rpx;
@ -266,12 +259,6 @@
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
} }
.image_14-1 { .image_14-1 {
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
@ -291,8 +278,6 @@
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51,51,51,1); color: rgba(51,51,51,1);
font-size: 34rpx; font-size: 34rpx;
font-family: PingFang-SC-Bold;
font-weight: 700;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 42rpx; line-height: 42rpx;
@ -308,8 +293,6 @@
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51,51,51,1); color: rgba(51,51,51,1);
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 28rpx; line-height: 28rpx;

4
subpages/nohouse/pages/nohouse/nohouse.wxss
View File

@ -121,8 +121,6 @@ line-height: 46rpx;
justify-content: space-between; justify-content: space-between;
padding: 30rpx 10rpx; padding: 30rpx 10rpx;
border-bottom: 2rpx solid #EAEAEA; border-bottom: 2rpx solid #EAEAEA;
} }
.from_test1{ .from_test1{
display: flex; display: flex;
@ -139,8 +137,6 @@ line-height: 46rpx;
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51,51,51,1); color: rgba(51,51,51,1);
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 42rpx; line-height: 42rpx;

20
subpages/resnoinformation/pages/resnoinformation/resnoinformation.wxss
View File

@ -141,7 +141,8 @@ text-align: center;
.lable{ .lable{
display: block; display: block;
width:auto; width:auto;
height: 40rpx; height: 35rpx;
line-height:35rpx;
/* background: #f6f6f6; */ /* background: #f6f6f6; */
margin-left: 20rpx; margin-left: 20rpx;
/* color:red; */ /* color:red; */
@ -174,7 +175,7 @@ text-align: center;
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
line-height: 42rpx; line-height: 42rpx;
margin-right: 20rpx; margin-right: 10rpx;
margin-left: 10rpx; margin-left: 10rpx;
} }
@ -184,8 +185,7 @@ text-align: center;
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51,51,51,1); color: rgba(51,51,51,1);
font-size: 34rpx; font-size: 34rpx;
font-family: PingFang-SC-Medium; font-weight: 400;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 41rpx; line-height: 41rpx;
@ -215,8 +215,6 @@ text-align: center;
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(153, 153, 153, 1); color: rgba(153, 153, 153, 1);
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
@ -247,8 +245,6 @@ text-align: center;
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(153, 153, 153, 1); color: rgba(153, 153, 153, 1);
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
@ -276,8 +272,6 @@ text-align: center;
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(153, 153, 153, 1); color: rgba(153, 153, 153, 1);
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
@ -288,8 +282,6 @@ text-align: center;
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
@ -305,8 +297,6 @@ text-align: center;
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(153, 153, 153, 1); color: rgba(153, 153, 153, 1);
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;
@ -317,8 +307,6 @@ text-align: center;
overflow-wrap: break-word; overflow-wrap: break-word;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang-SC-Medium;
font-weight: 500;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
line-height: 40rpx; line-height: 40rpx;

4
utils/config.js
View File

@ -5,8 +5,8 @@ module.exports = {
}; };
function BASEURL() { function BASEURL() {
// return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境
return 'http://192.168.1.144/api/' //测试环境 // return 'http://192.168.1.144/api/' //测试环境
// return 'http://219.146.91.110:30801/api/' // return 'http://219.146.91.110:30801/api/'
// return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境

Write Preview
Loading…
Cancel
Save