Merge remote-tracking branch 'origin/master'

homePage/parkingService/plateManagement/index.vue

 <template>
 	<view class="plateManagement">
 		<!-- 添加车牌后 生成的卡片 -->
+		<view v-for="(plate, index) in Plates" :key="index" v-if="plate" class="plateCard-wapper">
+			<view class="plateCard">
+				<text>{{plate}}</text>
+			</view>
+			<view class="line">
+				<!-- 分割线 -->
+				<u-line color="#eeeeee" :hair-line="false" ></u-line>
+			</view>
+			<!-- 分割线下方 -->
+			<view class="down-line">
+				<view class="iconlocation">
+					<u-icon name="trash" size="40"></u-icon>
+				</view>
+				<view class="button">
+					<u-button type="error" size="mini" shape="square">查询缴费</u-button>
+				</view>
+			</view>
+		</view>
 		<!-- 第一部分 卡片 -->
 		<view >
 			<view class="card">
@@ -26,7 +44,8 @@
 	export default{
 		data() {
 			return {
-				plate:'',
+				Plates:['京A11111','京A11111','京A11111'],
+				// show:false
 				
 			}
 		},
@@ -46,12 +65,59 @@
 	.plateManagement{
 		background-color: #eeeeee;
 		min-height: 100vh;
-		padding: 10rpx;
+		padding: 10rpx 0 0 0;
+		
+		//添加车牌产生的卡片
+		.plateCard-wapper{
+			width: 94%;
+			margin-left: 3%;
+			height: 16vh;
+			background-color: #fff;
+			border-radius: 20px;
+			margin-top: 20rpx;
+			padding: 40rpx 40rpx;
+			
+			//卡片
+			.plateCard{
+				
+			}
+			
+			//分割线
+			.line{
+				margin-top: 40rpx;
+				margin-bottom: 34rpx;
+			}
+			
+			//分割线下方部分
+			.down-line{
+				display: flex;
+				width: 100%;
+				justify-content:flex-end
+				
+				.iconlocation{
+					
+				}
+				
+				//图标
+				.iconlocation{
+					width: 50%;
+					float: left;
+				}
+				
+				//按钮
+				.button{
+					// float: right;
+					width: 50%;
+					text-align: right;
+				}
+			}
+		}
+		
 		//卡片
 		.card{
 			margin-top: 20rpx;
-			width: 90%;
-			margin-left: 5%;
+			width: 94%;
+			margin-left: 3%;
 			height: 20vh;
 			background-color: #fff;
 			border-radius: 20px;

homePage/shop/detail/index.vue

@@ -105,6 +105,7 @@
 				//图片底部区域
 				.lowArea{
 					padding: 0 30rpx 0 30rpx;
+					height: 20vh;
 					
 					//分割线上方
 					.up-line{
@@ -125,7 +126,8 @@
 					
 					//分割线下方 所造楼层
 					.locations{
-						margin-top: 20rpx;
+						margin-top: 40rpx;
+						margin-bottom: auto;
 						display: flex;
 						font-size: 26rpx;