From 6ff244ade9141bd6f2b9f5d6a06548731272f1df Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 18 Nov 2022 02:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tempCarFee/tempCarFee.vue         |  6 ++++--
 pages/tempParkingFee/tempParkingFee.vue | 27 +++++++++++++------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pages/tempCarFee/tempCarFee.vue b/pages/tempCarFee/tempCarFee.vue
index de7cbcf..88214b1 100644
--- a/pages/tempCarFee/tempCarFee.vue
+++ b/pages/tempCarFee/tempCarFee.vue
@@ -50,13 +50,15 @@
 								<view class="text-cut" style="width:220px">使用停车劵抵扣</view>
 							</view>
 						</view>
-						<view>{{couponCount+ '张' }}</view>
+						<view v-if="couponCount == 0">请选择</view>
+						<view v-else>{{couponCount+ '张' }}</view>
 					</view>
 				</view>
+				<!-- ="amount == 0" -->
 				<view class="cu-bar btn-group" style="margin-top: 20upx;">
 					<button @click="onPayFee" v-if="amount > 0"
 						class="cu-btn bg-green shadow-blur round lg">确认缴费</button>
-					<button @click="onPayFee" v-else="amount == 0"
+					<button @click="onPayFee" v-else
 							class="cu-btn bg-green shadow-blur round lg">确认开门</button>
 				</view>
 				<view class="cu-bar btn-group" style="margin-top: 20upx;">
diff --git a/pages/tempParkingFee/tempParkingFee.vue b/pages/tempParkingFee/tempParkingFee.vue
index 5430e2c..31f9f77 100644
--- a/pages/tempParkingFee/tempParkingFee.vue
+++ b/pages/tempParkingFee/tempParkingFee.vue
@@ -9,11 +9,12 @@
 
 			<view class="tips_block">
 			</view>
-			<view class="cu-bar btn-group " style="margin-top: 30px;">
+			<view class="cu-bar btn-group " style="margin-top: 30px;">
+				<button @click="_changeFlag('car')" style="margin-left: 0px;" class="cu-btn shadow-blur  lg"
+					:class="{'bg-blue':showFlag == 'car','line-blue':showFlag != 'car'}">车牌号</button>
 				<button @click="_changeFlag('phone')" style="margin-right: 0px;" class="cu-btn  shadow-blur lg"
 					:class="{'bg-blue':showFlag == 'phone','line-blue':showFlag != 'phone'}">手机号</button>
-				<button @click="_changeFlag('car')" style="margin-left: 0px;" class="cu-btn shadow-blur  lg"
-					:class="{'bg-blue':showFlag == 'car','line-blue':showFlag != 'car'}">车牌号</button>
+				
 			</view>
 			<view v-if="showFlag == 'phone'">
 				<view class='tips'>
@@ -22,7 +23,7 @@
 				<view class="plate-input-body">
 					<view class="plate-input-content">
 						<input type="number" maxlength="11" class="input-ui" v-model="carNum"
-							placeholder="手机号作为车牌号入场" />
+							placeholder="以手机号入场无牌车，请填手机号出场" />
 					</view>
 				</view>
 			</view>
@@ -165,15 +166,15 @@
 			this.machineId = options.machineId;
 			this.communityId = options.communityId;
 			uni.setStorageSync(mapping.W_APP_ID, this.appId)
-			// if (!isNotNull(this.openId)) {
-			// 	//刷新 openId
-			// 	if (isWxOrAli() == 'ALIPAY') {
-			// 		this._refreshAliPayOpenId();
-			// 	} else {
-			// 		this._refreshWechatOpenId();
-			// 	}
-			// 	return;
-			// }
+			if (!isNotNull(this.openId)) {
+				//刷新 openId
+				if (isWxOrAli() == 'ALIPAY') {
+					this._refreshAliPayOpenId();
+				} else {
+					this._refreshWechatOpenId();
+				}
+				return;
+			}
 			this._loadExistsCarNum();
 		},
 		methods: {