月卡页面 充电枪详情页面修改

pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -32,7 +32,8 @@
 					</view>
 					<view class="original-cost" v-if="item.monthlyRentCard.discount">
 						原价 {{item.monthlyRentCard.price}}元/月
-					</view>
+					</view>
+					<p>已有60人购买</p>
 					<view class="original-cost" v-if="item.monthlyRentCard.isVip">
 						原价 {{item.monthlyRentCard.oldPrice}}元/月
 					</view>
@@ -168,8 +169,7 @@
 			<view class="slogan-4"
 			 v-if="cardId||ispay"
 			 @click="gotoUrl('pages/monthlyCardActivity/monthlyCardList?cardId='+(ispay?userCard.rentCardId:cardId))">
-				适用<br/>
-				站点
+				查看本活动适用站点
 			</view>
 		</view>
 		
@@ -557,6 +557,11 @@
 			top: 24rpx;
 			right: 32rpx;
 			position: absolute;
+			p{
+				text-align: right;
+				color: rgba(0, 0, 0, 0.5);
+				font-size: 12px
+			}
 		}
 
 		.current-price {
@@ -732,23 +737,11 @@
 		}
 	}
 	.slogan-4 {
-		    margin-top: 10px;
-		        /* text-decoration: underline; */
-		        color: #9F9C99;
-		      
-		        text-align: center;
-		        position: fixed;
-		        /* top: 40px; */
-		        bottom: 40px;
-		        right: 20px;
-				height: 55px;
-		        width: 55px;
-				line-height: 20px;
-		        font-size: 16px;
-		       background: linear-gradient(45deg,#4BD2C0,rgb(72,218,149));
-			   box-shadow: 0 4rpx 24rpx 0 rgb(72,218,149) ;
-		        padding-top: 8px;
-		        color: #fff;
-		        border-radius: 25px;
+		margin-top: 10px;
+		text-decoration: underline;
+		height: 20px;
+		color: #9F9C99;
+		font-size: 32rpx;
+		text-align: center;
 	}
 </style>

pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -104,19 +104,7 @@
 			</view>
 			
 		</view>
-		<!--提示  -->
-		<view class="tips" v-if="carDetText" >
-			<p class="p">提示：</p>
-			<!-- <view class="content" v-if="!isInsert">
-				点击降锁后，请稍等几十秒，待地锁完全下降后，再驶入车位。
-			</view> -->
-			<view class="content">
-			
-				{{carDetText}}
-				
-			</view>
-			
-		</view>
+	
 		<!-- 入场车辆 -->
 		<!-- 未填写车牌状态 -->
 		<view class="car" v-if="false">
@@ -154,6 +142,19 @@
 			<!-- 开始充电 -->
 			 <u-button shape="circle" type="success" v-else  @click="charge"  >开始充电</u-button>
 		</view>
+		<!--提示  -->
+		<view class="tips" v-if="carDetText" >
+			<p class="p">注意事项：</p>
+			<!-- <view class="content" v-if="!isInsert">
+				点击降锁后，请稍等几十秒，待地锁完全下降后，再驶入车位。
+			</view> -->
+			<view class="content">
+			
+				{{carDetText}}
+				
+			</view>
+			
+		</view>
 		<!-- 弹窗 -->
 		<view>
 
@@ -510,7 +511,7 @@
 		}
 	}
 	.main {
-		padding: 28px 20px;
+		padding: 28px 20px 16px 20px;
 		background-image: linear-gradient(#D6EEDC, #F6F8F8);
 
 		.text-1 {
@@ -529,7 +530,7 @@
 		.charging-info {
 
 			background-color: #fff;
-			margin: 20px auto 0;
+			margin: 28px auto 0;
 			border-radius: 12px;
 			padding: 20px;
 
@@ -581,32 +582,30 @@
 	}
 
 	.tips {
-		background-color: #fff;
-		margin: 0 20px;
+		
+		margin: 4px 20px 0 20px;
 		border-radius: 12px;
-		padding: 20px;
 
 		.p {
 			line-height: 25px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 18px;
+			color: #333333;
+			font-size: 16px;
+			font-weight: 550;
 		}
 
 		.content {
 			margin-top: 8px;
 			line-height: 22px;
-			color: rgba(102, 102, 102, 100);
+			color: #666666;
 			font-size: 16px;
 		}
 	}
 
 	.bottom {
-		background-color: #fff;
+		
 		width: 100%;
-		padding: 12px 0;
-		position: fixed;
-		bottom: 0;
-		left: 0;
+		padding: 16px 0;
+		
 
 		.u-btn {
 			width: 91.4%
@@ -621,7 +620,7 @@
 	// 入场车辆
 	.car {
 		background-color: #fff;
-		margin: 20px;
+		margin: 0 20px;
 		border-radius: 12px;
 		padding: 20px;
 		display: flex;