zhengkaixin 3 years ago
parent
commit
96dc8a901d
2 changed files with 15 additions and 11 deletions
  1. 6 5
      pagesFinance/detailed/index.vue
  2. 9 6
      pagesFinance/share/index.vue

+ 6 - 5
pagesFinance/detailed/index.vue

@@ -6,7 +6,7 @@
 				<view class="navbar-screen" @click="popupShow = true"><span>筛选</span><u-icon name="filter-2-fill" custom-prefix="custom-icon" color="#b0b8c8" size="32"></u-icon></view>
 				<view class="navbar-screen" @click="popupShow = true"><span>筛选</span><u-icon name="filter-2-fill" custom-prefix="custom-icon" color="#b0b8c8" size="32"></u-icon></view>
 			</view>
 			</view>
 		</u-navbar>
 		</u-navbar>
-		<u-popup v-model="popupShow" mode="top">
+		<u-popup v-model="popupShow" mode="top" height="80%" >
 			<view class="popup-screen">
 			<view class="popup-screen">
 				<view class="screen">
 				<view class="screen">
 					<view class="screen-item">
 					<view class="screen-item">
@@ -66,7 +66,7 @@
 						</view>
 						</view>
 					</view>
 					</view>
 					<view 
 					<view 
-						v-show="selectstationId"
+					
 					class="screen-item">
 					class="screen-item">
 						<view class="screen-head">桩号</view>
 						<view class="screen-head">桩号</view>
 						<view class="screen-main">
 						<view class="screen-main">
@@ -351,13 +351,13 @@
 				font-size: 16px;
 				font-size: 16px;
 			}
 			}
 			.screen-main{
 			.screen-main{
-				//display: flex;
-				    display: -webkit-box;
+				display: flex;
+				//    display: -webkit-box;
 				flex-wrap: wrap;
 				flex-wrap: wrap;
 				justify-content: space-between;
 				justify-content: space-between;
 			}
 			}
 			.screen-entry{
 			.screen-entry{
-				width: 31%;
+				width: 29%;
 				padding:6px 0;
 				padding:6px 0;
 				background-color: #F2F5FA ;
 				background-color: #F2F5FA ;
 				text-align: center;
 				text-align: center;
@@ -379,6 +379,7 @@
 			height:50px;
 			height:50px;
 			border-top: 1px solid #ededed;
 			border-top: 1px solid #ededed;
 			.screen-btn-l{
 			.screen-btn-l{
+				 background-color: #fff;
 				flex: 0.2;
 				flex: 0.2;
 				text-align: center;
 				text-align: center;
 				line-height: 50px;
 				line-height: 50px;

+ 9 - 6
pagesFinance/share/index.vue

@@ -6,7 +6,7 @@
 				<view class="navbar-screen" @click="popupShow = true"><span>筛选</span><u-icon name="filter-2-fill" custom-prefix="custom-icon" color="#b0b8c8" size="32"></u-icon></view>
 				<view class="navbar-screen" @click="popupShow = true"><span>筛选</span><u-icon name="filter-2-fill" custom-prefix="custom-icon" color="#b0b8c8" size="32"></u-icon></view>
 			</view>
 			</view>
 		</u-navbar>
 		</u-navbar>
-		<u-popup v-model="popupShow" mode="top">
+		<u-popup v-model="popupShow" mode="top" height="80%">
 			<view class="popup-screen">
 			<view class="popup-screen">
 				<view class="screen">
 				<view class="screen">
 					<view class="screen-item">
 					<view class="screen-item">
@@ -66,7 +66,7 @@
 						</view>
 						</view>
 					</view>
 					</view>
 					<view 
 					<view 
-					v-show="selectstationId"
+				
 					class="screen-item">
 					class="screen-item">
 						<view class="screen-head">桩号</view>
 						<view class="screen-head">桩号</view>
 						<view class="screen-main">
 						<view class="screen-main">
@@ -90,7 +90,8 @@
 					</view>
 					</view>
 				</view>
 				</view>
 				<view class="screen-foot">
 				<view class="screen-foot">
-					<view class="screen-btn-l" @click="resetBtn" >重置</view>
+					<view class="screen-btn-l"
+					 @click="resetBtn" >重置</view>
 					<view class="screen-btn-r" @click="okbtn" >确定</view>
 					<view class="screen-btn-r" @click="okbtn" >确定</view>
 				</view>
 				</view>
 			</view>
 			</view>
@@ -362,13 +363,14 @@
 				font-size: 16px;
 				font-size: 16px;
 			}
 			}
 			.screen-main{
 			.screen-main{
-				  display: -webkit-box;
-				//display: flex;
+				 // display: -webkit-box;
+				display: flex;
 				flex-wrap: wrap;
 				flex-wrap: wrap;
 				justify-content: space-between;
 				justify-content: space-between;
 			}
 			}
 			.screen-entry{
 			.screen-entry{
-				width: 31%;
+				width: 29%;
+				
 				padding:6px 0;
 				padding:6px 0;
 				background-color: #F2F5FA ;
 				background-color: #F2F5FA ;
 				text-align: center;
 				text-align: center;
@@ -390,6 +392,7 @@
 			height:50px;
 			height:50px;
 			border-top: 1px solid #ededed;
 			border-top: 1px solid #ededed;
 			.screen-btn-l{
 			.screen-btn-l{
+				background-color: #fff;
 				flex: 0.2;
 				flex: 0.2;
 				text-align: center;
 				text-align: center;
 				line-height: 50px;
 				line-height: 50px;