diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 4e4f6c6..b1b3d72 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -51,21 +51,21 @@ --> - + 设置 - + 修改密码 - + 使用指南 diff --git a/pages/resiAndHouse/resiAndHouse.wxss b/pages/resiAndHouse/resiAndHouse.wxss index 588deed..0b45c24 100644 --- a/pages/resiAndHouse/resiAndHouse.wxss +++ b/pages/resiAndHouse/resiAndHouse.wxss @@ -458,7 +458,7 @@ page { } .box_18 { - width: 100%; + width: 400rpx; /* height: 36rpx; */ flex-direction: row; align-items: center; @@ -509,6 +509,8 @@ page { } .text-wrapper_9 { + position: absolute; + right: 0; display: flex; width: 280rpx; overflow: hidden; @@ -1341,7 +1343,7 @@ page { min-width: 302rpx; flex: 1; overflow-x: scroll; - padding: 10rpx 0 0; + box-sizing: border-box; margin-left: 16rpx; font-size: 24rpx; diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml index 1e686fa..273d263 100644 --- a/subpages/addResi/pages/addResi/addResi.wxml +++ b/subpages/addResi/pages/addResi/addResi.wxml @@ -156,7 +156,7 @@ - + diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml index c34eba0..8b1ebf6 100644 --- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml +++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml @@ -10,7 +10,7 @@ 所属组织 - {{agencyName?agencyName:'请选择-'}} + {{agencyName?agencyName:'请选择'}} @@ -106,7 +106,7 @@ {{tabVal === '1'?'需求时间':'发生时间'}} - {{showTime?showTime:'请选择'}} + {{showTime?showTime:'请选择'}} @@ -136,7 +136,7 @@ {{tabVal === '1'?'需求人':'联系人'}} - + {{resiName?resiName:'请选择'}} @@ -145,7 +145,7 @@ * - 联系电话 + 联系电话 - - - - 待复核 - - - 已合格 - - - - - - - - - {{item.name}} - 检查时间: {{item.orderDate}} - 检查人员: {{item.checkPersons}} - {{item.status?'未整改隐患':'隐患明细'}}: - {{index+1}}.{{item.hazardDesc}} - - - - 整改要求:{{item.hazardDesc}} - - - - - 已整改隐患:{{indexC+1}}.{{item.hazardDesc}} - - - 拟复查时间: {{item.reviewTime}} + + + + + + + + + {{item.name}} + 检查时间: {{item.orderDate}} + 检查人员: {{item.checkPersons}} + {{item.status?'未整改隐患':'隐患明细'}}: + {{index+1}}.{{item.hazardDesc}} + + + + 整改要求:{{item.hazardDesc}} + + + + + 已整改隐患:{{indexC+1}}.{{item.hazardDesc}} + + + 拟复查时间: {{item.reviewTime}} + + + + + + + - - - - - - - + + + + + + + {{item.name}} + 检查时间: {{item.createdTime}} + 检查人员: {{item.checkPersons}} + 检查结论: 合格 - - - - {{item.name}} - 检查时间: {{item.createdTime}} - 检查人员: {{item.checkPersons}} - 检查结论: 合格 - 合格时间: {{item.orderDate}} + - - - - - - + + + + + - - + + + + + + - + + \ No newline at end of file diff --git a/subpages/securityCheck/pages/securityCheck.wxss b/subpages/securityCheck/pages/securityCheck.wxss index 259b177..a688414 100644 --- a/subpages/securityCheck/pages/securityCheck.wxss +++ b/subpages/securityCheck/pages/securityCheck.wxss @@ -9,16 +9,14 @@ page{ /* 按照行排序 */ flex-direction: column; } +.custom-tab-title .van-tab__title { + font-size: 32rpx; +} .search{ - height: 110rpx; width: 100%; - padding:0 22rpx; box-sizing: border-box; - background-color: #fff; - display: flex; align-items: center; /* justify-content: space-between; */ - padding-top: 20rpx; box-sizing: border-box; justify-content: center; } @@ -28,8 +26,6 @@ page{ margin-right: 60rpx; } .row1{ - display: flex; - flex-direction: row; font-size: 30rpx } .box_2 { @@ -53,11 +49,11 @@ page{ overflow-y: auto; } */ .section_5 { - width: 100%; height: 1395rpx; display: flex; flex-direction: column; overflow: hidden; + padding: 20rpx; } .content_1{ display: flex; @@ -108,19 +104,20 @@ page{ margin-left: 332rpx; } .list_1 { - /* width: 710rpx; */ + width: 700rpx; /* height: 603rpx; */ /* display: flex; */ /* flex-direction: column; */ /* justify-content: space-between; */ - margin: 20rpx 0 0 20rpx; + display: flex; /* width: 100%; */ + margin-bottom: 20rpx; } .section_1-0 { background-color: rgba(255,255,255,1.000000); border-radius: 20rpx; /* height: 410rpx; */ - /* width: 710rpx; */ + width: 710rpx; display: flex; flex-direction: column; padding-bottom: 10px; @@ -186,6 +183,7 @@ margin-left: 30rpx; .image-wrapper{ width: 190rpx; height: 190rpx; + }