调整

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -102,7 +102,8 @@
 				</view>
 				
 			</view>
-		</view>
+		</view>
+		
 		<view class="cost-explain">
 			<view class="text">
 				费用说明
@@ -115,9 +116,10 @@
 			 @click="step=1">
 				&#xe600;
 			</view>
-		</view>
+		</view>
+		
 		<!--提示  -->
-		<view class="tips" v-if="userCardBool" style="margin-bottom: 20px;" >
+		<view class="tips"  v-if="userCardBool" style="margin-bottom: 40rpx;" >
 			<p class="p">会员活动：</p>
 			<!-- <view class="content" v-if="!isInsert">
 				点击降锁后，请稍等几十秒，待地锁完全下降后，再驶入车位。
@@ -125,30 +127,21 @@
 			<view class="content" :style="canUse?'':'color: red;'" >
 			
 				{{canUse?'充电服务费包月卡':'此充电站不支持月卡服务'}}
-				
 				 
 			</view>
-			
+
 		</view>
+	<!-- 填写车牌后状态 -->
+	<view class="car">
+		<view class="car-name">
+			入场车辆
+		</view>
+		<view class="car-number">
+			{{car?car.carNum:''}}
+			<img   v-if="!car" @click="carDet(car?car.carNum:'')" src="../../../static/img/riLine-edit-box-line2.svg" alt="">
+		</view>
+	</view>
 	
-		<!-- 入场车辆 -->
-		<!-- 未填写车牌状态 -->
-		<view class="car" v-if="false">
-			<view class="car-name">
-				入场车辆
-			</view>
-			<input type="text" placeholder="填写车牌号减免停车费">
-		</view>
-		<!-- 填写车牌后状态 -->
-		<view class="car">
-			<view class="car-name">
-				入场车辆
-			</view>
-			<view class="car-number">
-				{{car?car.carNum:''}}
-				<img   v-if="!car" @click="carDet(car?car.carNum:'')" src="../../../static/img/riLine-edit-box-line2.svg" alt="">
-			</view>
-		</view>
 
 		<view class="bottom">
 			 
@@ -178,14 +171,14 @@
 			
 			<view class="content">
 			
-				{{description}}
-				
-			</view>
-			<view class="content">
-			
-				{{carDetText}}
+				1.车停好，请熄火后再充电；<br/>
+				2.请确保充电枪插接到位；<br/>
+				3.车辆充电时，请关闭车内电源；<br/>
+				4.充电完毕，请及时把枪;<br/>
+				5.填写车牌号，离场时可减免部分停车费。
 				
 			</view>
+			 
 			
 		</view>
 		<!-- 弹窗 -->
@@ -563,7 +556,7 @@
 		}
 	}
 	.main {
-		padding: 20px 20px 16px 20px;
+		padding: 40rpx 40rpx 24rpx 40rpx;
 		background-image: linear-gradient(#D6EEDC, #F6F8F8);
 
 		.text-1 {
@@ -583,12 +576,12 @@
 			background-color: #fff;
 			margin: 0px auto ;
 			border-radius: 12px;
-			padding: 20px;
+			padding:20rpx 38rpx ;
 
 			.name {
 				margin-top: 8rpx;
 				color: #777777;
-				font-size: 16px;
+				font-size: 32rpx;
   
 				.free {
 					display: inline-block;
@@ -598,7 +591,7 @@
 					border-radius: 50px;
 					background-color: rgba(208, 246, 228, 100);
 					color: rgba(0, 185, 98, 100);
-					font-size: 14px;
+					font-size: 28rpx;
 					text-align: center;
 					margin-left: 12px;
 				}
@@ -607,11 +600,11 @@
 
 			.price {
 				color: rgba(0, 185, 98, 100);
-				font-size: 28px;
+				font-size: 56rpx;
 				margin-top: 12px;
 
 				.unit {
-					font-size: 16px;
+					font-size: 32rpx;
 					color: #666666;
 					margin-left: 4px;
 				}
@@ -619,12 +612,12 @@
 
 			.address {
 				color:#333333;
-				font-size: 20px;
+				font-size: 40rpx;
 
 				.explain {
 					line-height: 22px;
 					color: rgba(22, 119, 255, 100);
-					font-size: 16px;
+					font-size: 32rpx;
 					float: right;
 				}
 			}
@@ -646,47 +639,47 @@
 }
 // 费用说明
 .cost-explain{
-	margin: 0px 20px 12px 20px;
-	padding: 20px;
+	margin: 0px 40rpx 24rpx 40rpx;
+	padding: 40rpx;
 	background-color: #fff;
 	border-radius: 12px;
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	.text{
-		font-size: 18px;
+		font-size: 36rpx;
 		color: #101010;
 	}
 	.iconfont{
 		color: #b3b3b3;
-		font-size: 24px
+		font-size: 48rpx
 	}
 }
 	.tips {
 		background-color: #fff;
-		padding: 20px;
-		margin: 4px 20px 0 20px;
+		padding: 40rpx;
+		margin: 8rpx 40rpx 0 40rpx;
 		border-radius: 12px;
 
 		.p {
 			line-height: 25px;
 			color: #333333;
-			font-size: 16px;
+			font-size: 32rpx;
 			font-weight: 550;
 		}
 
 		.content {
-			margin-top: 8px;
+			margin-top: 16rpx;
 			line-height: 22px;
 			color: #666666;
-			font-size: 16px;
+			font-size: 28rpx;
 		}
 	}
 
 	.bottom {
 		
 		width: 100%;
-		padding: 16px 0;
+		padding: 28rpx 0;
 		
 
 		.u-btn {
@@ -705,12 +698,12 @@
 	// 入场车辆
 	.car {
 		background-color: #fff;
-		margin: 0 20px;
+		margin: 0 40rpx;
 		border-radius: 12px;
-		padding:19px 20px;
+		padding:38rpx 40rpx;
 		display: flex;
 		justify-content: space-between;
-		font-size: 18px;
+		font-size: 36rpx;
        .car-number{
 		   display: flex;
 	   }

pages/user/company-vip.vue

@@ -89,7 +89,7 @@
 				platform:'',
 				startDate:'',
 				endTime:"",
-				pageIndex:'',
+				pageIndex:0,
 				list: [],
 				electricQuantity:0,
 				recordsTotal: 0,