修改点金计划页面冲突

pages/parkingLock/parkingLock.vue

@@ -2,109 +2,119 @@
 	<!-- 车位锁 -->
 	<view class="parking-lock">
 		<!-- 车位锁支付 -->
-		<view class="parking-lock-pay" v-if="parkingLockStatus === 1">
-			<view class="parking-lock-title">支付停车费</view>
-			<view class="parking-lock-tips">请您确认停车费用，确认后请支付费用，结束停车。谢谢您的使用！</view>
-			<view class="parking-lock-info">
-				<view class="parking-lock-info-item">
-					<view>停车场名称</view>
-					<view>{{orderInfo.roadName}}</view>
-				</view>
-				<view class="parking-lock-info-item">
-					<view>停车泊位</view>
-					<view>{{orderInfo.spaceName}}</view>
-				</view>
-				<view class="parking-lock-info-item">
-					<view>入场时间</view>
-					<view>{{orderInfo.inTime}}</view>
-				</view>
-				<view class="parking-lock-info-item">
-					<view>出场时间</view>
-					<view>{{orderInfo.outTime}}</view>
-				</view>
-				<view class="parking-lock-info-item">
-					<view>停车时长</view>
-					<view>{{ orderInfo.duration || 0}}</view>
-				</view>
-				<view class="parking-lock-info-item">
-					<view>免费时长</view>
-					<view>{{ orderInfo.freeDuration || 0 }}</view>
-				</view>
-				<!-- <view class="parking-lock-info-item">
-					<view>开始计费</view>
-					<view>{{orderInfo.inTime}}</view>
-				</view>
-				<view class="parking-lock-info-item">
-					<view>结束计费</view>
-					<view>{{orderInfo.outTime}}</view>
-				</view> -->
-				<view class="parking-lock-info-item">
-					<view>计费时长</view>
-					<view>{{orderInfo.calcDuration || 0}}</view>
-				</view>
-				<!-- <view class="parking-lock-info-item">
-					<view>合计金额</view>
-					<view>{{orderInfo.totalAmount}} 元</view>
-				</view>
-				<view class="parking-lock-info-item">
-					<view>优惠金额</view>
-					<view>{{orderInfo.preferentialAmount}} 元</view>
-				</view> -->
-				<view class="parking-lock-info-item">
-					<view>应缴金额</view>
-					<view class="really-money">{{orderInfo.payAmount || 0}} 元</view>
-				</view>
-				<view class="parking-lock-info-item" v-if="orderInfo.vehicleNo==''">
-					<view>车牌信息</view>
-					<view class="really-license"><text class="really-license-txt" @click="addvehicleNo">添加车牌</text>
+		<template v-if="parkingLockStatus === 1">
+			<view class="parking-lock-pay">
+				<view class="parking-lock-title">支付停车费</view>
+				<view class="parking-lock-tips">请您确认停车费用，确认后请支付费用，结束停车。谢谢您的使用！</view>
+				<view class="parking-lock-info">
+					<view class="parking-lock-info-item">
+						<view>停车场名称</view>
+						<view>{{orderInfo.roadName}}</view>
+					</view>
+					<view class="parking-lock-info-item">
+						<view>停车泊位</view>
+						<view>{{orderInfo.spaceName}}</view>
+					</view>
+					<view class="parking-lock-info-item">
+						<view>入场时间</view>
+						<view>{{orderInfo.inTime}}</view>
+					</view>
+					<view class="parking-lock-info-item">
+						<view>出场时间</view>
+						<view>{{orderInfo.outTime}}</view>
+					</view>
+					<view class="parking-lock-info-item">
+						<view>停车时长</view>
+						<view>{{ orderInfo.duration || 0}}</view>
+					</view>
+					<view class="parking-lock-info-item">
+						<view>免费时长</view>
+						<view>{{ orderInfo.freeDuration || 0 }}</view>
+					</view>
+					<!-- <view class="parking-lock-info-item">
+						<view>开始计费</view>
+						<view>{{orderInfo.inTime}}</view>
+					</view>
+					<view class="parking-lock-info-item">
+						<view>结束计费</view>
+						<view>{{orderInfo.outTime}}</view>
+					</view> -->
+					<view class="parking-lock-info-item">
+						<view>计费时长</view>
+						<view>{{orderInfo.calcDuration || 0}}</view>
+					</view>
+					<!-- <view class="parking-lock-info-item">
+						<view>合计金额</view>
+						<view>{{orderInfo.totalAmount}} 元</view>
+					</view>
+					<view class="parking-lock-info-item">
+						<view>优惠金额</view>
+						<view>{{orderInfo.preferentialAmount}} 元</view>
+					</view> -->
+					<view class="parking-lock-info-item">
+						<view>应缴金额</view>
+						<view class="really-money">{{orderInfo.payAmount || 0}} 元</view>
+					</view>
+					<view class="parking-lock-info-item" v-if="orderInfo.vehicleNo==''">
+						<view>车牌信息</view>
+						<view class="really-license"><text class="really-license-txt" @click="addvehicleNo">添加车牌</text>
+						</view>
+					</view>
+					<view class="parking-lock-info-item" v-else>
+						<view>车牌信息</view>
+						<view class="really-license">{{orderInfo.vehicleNo}} <text @click="changevehicleNo"
+								class="really-license-txt1">更换</text></view>
 					</view>
 				</view>
-				<view class="parking-lock-info-item" v-else>
-					<view>车牌信息</view>
-					<view class="really-license">{{orderInfo.vehicleNo}} <text @click="changevehicleNo"
-							class="really-license-txt1">更换</text></view>
+				<view class="parking-lock-pay-btn">
+					<button type="default" @click="payMoney">立即支付</button>
+				</view>
+				<view class="parking-lock-pay-attention">
+					<text>
+						温馨提示：车牌信息可填可不填，如果您已通过本机号码办理了特定车或包月车业务，则需要输入车牌号，否则将按照常规收费标准进行收费。
+					</text>
 				</view>
 			</view>
-			<view class="parking-lock-pay-btn">
-				<button type="default" @click="payMoney">立即支付</button>
-			</view>
-			<view class="parking-lock-pay-attention">
-				<text>
-					温馨提示：车牌信息可填可不填，如果您已通过本机号码办理了特定车或包月车业务，则需要输入车牌号，否则将按照常规收费标准进行收费。
-				</text>
-			</view>
-		</view>
+		</template>
 		<!-- 车位锁开始状态 -->
-		<view class="parking-lock-begin" v-else-if="parkingLockStatus === 2">
-			<view class="parking-lock-begin-box">
-				<view class="parking-lock-begin-bg">
-					<image src="../../static/img/parking-lock-bg.png" mode=""></image>
+		<template v-else-if="parkingLockStatus === 2">
+			<view class="parking-lock-begin">
+				<view class="parking-lock-begin-box">
+					<view class="parking-lock-begin-bg">
+						<image src="../../static/img/parking-lock-bg.png" mode=""></image>
+					</view>
 				</view>
+				<view class="parking-lock-begin-info">车位锁正在动作，还未到位</view>
 			</view>
-			<view class="parking-lock-begin-info">车位锁正在动作，还未到位</view>
-		</view>
+		</template>
 		<!-- 车位锁正在状态 -->
-		<view class="parking-lock-loading" v-else-if="parkingLockStatus === 3">
-			<view class="parking-lock-loading-box">
-				<view class="parking-lock-loading-bg">
-					<image src="../../static/img/parking-lock-bg.png" mode=""></image>
+		<template v-else-if="parkingLockStatus === 3">
+			<view class="parking-lock-loading">
+				<view class="parking-lock-loading-box">
+					<view class="parking-lock-loading-bg">
+						<image src="../../static/img/parking-lock-bg.png" mode=""></image>
+					</view>
 				</view>
+				<view class="parking-lock-loading-info">开锁中，请等待！</view>
 			</view>
-			<view class="parking-lock-loading-info">开锁中，请等待！</view>
-		</view>
+		</template>
 		<!-- 开锁完成 -->
-		<view class="parking-lock-success" v-else-if="parkingLockStatus === 4">
-			<view class="parking-lock-success-box">
-				<image src="../../static/img/parking-lock-achieve.png" mode=""></image>
+		<template v-else-if="parkingLockStatus === 4">
+			<view class="parking-lock-success">
+				<view class="parking-lock-success-box">
+					<image src="../../static/img/parking-lock-achieve.png" mode=""></image>
+				</view>
+				<view class="parking-lock-success-info">开锁已完成</view>
+				<view class="parking-lock-success-button">
+					<button @click="cancel">返回</button>
+				</view>
 			</view>
-			<view class="parking-lock-success-info">开锁已完成</view>
-			<view class="parking-lock-success-button">
-				<button @click="cancel">返回</button>
+		</template>
+		<template v-else-if="parkingLockStatus === 5">
+			<view class="parking-lock-pay">
+				<view class="parking-lock-tips">{{tipsMsg}}</view>
 			</view>
-		</view>
-		<view class="parking-lock-pay" v-else-if="parkingLockStatus === 5">
-			<view class="parking-lock-tips">{{tipsMsg}}</view>
-		</view>
+		</template>
 		<!-- 支付方式 -->
 		<PaymentMethod :payWayPop="payWayPop" :curOrderList="orderList" :deviceNo="deviceNo" :jumpUrl="jumpUrl"
 			@closePaymentMethod="closePaymentMethod"></PaymentMethod>

static/html/wxPayCallback.html

@@ -47,19 +47,12 @@
     </style>
 </head>
 <body>
-    <div class="container">
+	<div class="container">
 		<div class="text-img">
-<<<<<<< HEAD
-			<img src="https://h5.pdzhtc.com/static/img/text-html-bg.png" alt="" width="290" height="100"/>
-		</div>
-		<div class="car-img">
-			<img src="https://h5.pdzhtc.com/static/img/car-html-bg.png" alt="" width="300" height="170"/>
-=======
 			<img src="https://h5.pdzhtc.com/static/img/text-html-bg.png" alt="" width="80%" height="20%"/>
 		</div>
 		<div class="car-img">
 			<img src="https://h5.pdzhtc.com/static/img/car-html-bg.png" alt="" width="65%" height="25%"/>
->>>>>>> 07d8f3d90719874f4d560a7a8a47ab08f65cf0fc
 		</div>
 		<a href="javascript:goToBgzchina()" class="button">回到镇宁智慧停车</a>
 	</div>