修改显示问题

pages/center/index.vue

@@ -13,12 +13,10 @@
 		<!-- ===================================== 头像 ===================================== -->
     <view class="u-flex user-box u-p-l-30 u-p-r-20 u-p-b-30 u-p-t-30">
       <view class="u-m-r-24" @click="clickHead">
-        <u-avatar :src="pic" size="140"></u-avatar>
-        <!-- <u-avatar :src="userInfo.headImgUrl || userInfo.avatar || pic" size="140"></u-avatar> -->
+        <u-avatar :src="userInfo.headImgUrl || pic" size="140"></u-avatar>
       </view>
-      <view class="u-flex-1" @click="login($store.state.vuex_hasLogin)">
-        <!-- <view class="u-font-18 u-p-b-20">{{ userInfo.nickname || userInfo.userName || '请登录' }}</view> -->
-        <view class="u-font-18 u-p-b-20">{{ userInfo.mobile || '请登录' }}</view>
+      <view class="u-flex-1">
+        <view class="u-font-18 u-p-b-20">{{ userInfo.nickname || userInfo.mobile }}</view>
         <view class="u-font-14">手机号:{{ userInfo.mobile || '暂无' }}</view>
       </view>
     </view>
@@ -201,6 +199,12 @@ export default {
 					this.$u.vuex('vuex_hasLogin', false);
 					this.$u.vuex('vuex_token', '');
 					this.$u.vuex('vuex_user', null);
+					uni.removeStorage({
+					    key: 'jumpUrl'
+					});
+					uni.removeStorage({
+					    key: 'backUrl'
+					});
 					setTimeout(() => {
 					  this.logoutPop = false
 					  uni.navigateTo({

pages/geomagnetismLock/geomagnetismLock.vue

@@ -54,49 +54,14 @@
 				</view>
 			</view>
 		</template>
-		<!-- 车位锁开始状态 -->
 		<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>
-		</template>
-		<!-- 车位锁正在状态 -->
-		<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>
-		</template>
-		<!-- 开锁完成 -->
-		<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>
-		</template>
-		<template v-else-if="parkingLockStatus === 5">
 			<view class="parking-lock-pay">
-				<view class="parking-lock-tips">{{tipsMsg}}</view>
+				<view class="parking-lock-tips">{{ tipsMsg }}</view>
 			</view>
 		</template>
 		<!-- 支付方式 -->
-		<PaymentMethod :payWayPop="payWayPop" :curOrderList="[orderId]" :jumpUrl="jumpUrl" :payeeId="payeeId" :payeeName="payeeName"
-			@closePaymentMethod="closePaymentMethod"></PaymentMethod>
-		<u-toast ref="uToast" />
+		<PaymentMethod :payWayPop="payWayPop" :curOrderList="[orderId]" :jumpUrl="jumpUrl" :payeeId="payeeId"
+			:payeeName="payeeName" @closePaymentMethod="closePaymentMethod"></PaymentMethod>
 		<u-popup v-model="show" mode="center" border-radius="14" width="200rpx" height="200rpx">
 			<view class="loadingSelect">订单查询中...</view>
 			<view class="spinner">
@@ -107,59 +72,7 @@
 				<view class="rect5"></view>
 			</view>
 		</u-popup>
-		<u-popup class="popup-vehicleNo" v-model="ShowaddvehicleNo" mode="center" border-radius="20" width="710rpx"
-			height="auto">
-			<view class="popup-vehicleNo-title">添加车牌</view>
-			<view class="popup-vehicleNo-center"></view>
-			<view class="popup-vehicleNo-content">
-				<view class="new-plate-number">
-					<view class="message-input-wrap" @click="messageInputClick">
-						<u-message-input :maxlength="8" width="70" font-size="50" :disabled-keyboard="true"
-							v-model="newPlateNumber"></u-message-input>
-					</view>
-				</view>
-			</view>
-			<view class="popup-vehicleNo-select">暂无绑定车牌</view>
-			<view class="vehicleNo-btn">
-				<u-button type="primary" @click="handleAddCar">确认</u-button>
-				<u-button type="primary" plain @click="ShowaddvehicleNo=false">取消</u-button>
-			</view>
-		</u-popup>
-
-		<u-popup class="popup-vehicleNo" v-model="ShowchangevehicleNo" mode="center" border-radius="20" width="710rpx"
-			height="auto">
-			<view class="popup-vehicleNo-title">更换车牌</view>
-			<view class="popup-vehicleNo-center"></view>
-			<view class="popup-vehicleNo-content">
-				<view class="new-plate-number">
-					<view class="message-input-wrap" @click="messageInputClick">
-						<u-message-input :maxlength="8" width="70" font-size="50" :disabled-keyboard="true"
-							v-model="newPlateNumber"></u-message-input>
-					</view>
-				</view>
-			</view>
-			<view class="popup-vehicleNo-select">
-				<u-collapse ref="refValue">
-					<u-collapse-item title="点击选择车牌" align="center">
-						<u-cell-group>
-							<u-cell-item :title="item.vehicleNo" v-for="(item, index) in groupList" :key="index"
-								:arrow="false">
-								<u-radio-group v-model="selectvalue" @change="radioGroupChange">
-									<u-radio :name="item.vehicleNo" :key="index"></u-radio>
-								</u-radio-group>
-							</u-cell-item>
-						</u-cell-group>
-					</u-collapse-item>
-				</u-collapse>
-			</view>
-			<view class="vehicleNo-btn">
-				<u-button type="primary" @click="handleAddCar">确认</u-button>
-				<u-button type="primary" plain @click="ShowchangevehicleNo=false">取消</u-button>
-			</view>
-		</u-popup>
-		<u-action-sheet :list="colorList" @click="confirmColor" v-model="colorShow"></u-action-sheet>
-		<u-keyboard ref="uKeyboard" mode="car" @change="keyboardChange" @confirm="keyboardConfirm"
-			@backspace="backspace" v-model="keyboardshow"></u-keyboard>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -172,37 +85,7 @@
 		},
 		data() {
 			return {
-				selectvalue: null,
-				groupList: [],
-				radiogroupList: [],
-				keyboardshow: false,
-				colorShow: false,
-				colorList: [{
-					text: '蓝色',
-					colorCode: 0
-				}, {
-					text: '黄色',
-					colorCode: 1
-				}, {
-					text: '黑色',
-					colorCode: 2
-				}, {
-					text: '白色',
-					colorCode: 3
-				}, {
-					text: '绿色',
-					colorCode: 4
-				}, {
-					text: '其他',
-					colorCode: 99
-				}],
-				vehicleColor: 0,
-				newPlateNumber: '',
-				//更换车牌弹窗
-				ShowchangevehicleNo: false,
-				//添加车牌弹窗
-				ShowaddvehicleNo: false,
-				// 车位锁状态 1:支付 2:开始开锁 3:开锁中 4:开锁完成
+				// 车位锁状态 1:需支付 2:查询失败返回提醒
 				parkingLockStatus: 0,
 				// 支付方式选择弹框
 				payWayPop: false,
@@ -210,11 +93,8 @@
 				orderList: [],
 				// 提示信息
 				tipsMsg: null,
-				// 设备编号
-				deviceNo: null,
 				// 轮询
 				timer: null,
-				timer1: null,
 				// 订单信息
 				orderInfo: {},
 				// 订单id
@@ -240,14 +120,14 @@
 				this.isBack = page?.isBack
 			} else {
 				this.tipsMsg = page.msg || '参数丢失!';
-				this.parkingLockStatus = 5
+				this.parkingLockStatus = 2
 			}
 		},
 		onShow() {
 			if (this.orderId) {
 				this.getOrderDetails(this.spaceId, this.orderId, this.payeeId)
 				if (this.polyOrderId && this.isBack == 1) {
-					this.timer1 = setInterval(() => {
+					this.timer = setInterval(() => {
 						this.show = true
 						this.handlePayStatus(this.polyOrderId)
 					}, 1000)
@@ -260,111 +140,8 @@
 			if (this.timer) {
 				clearInterval(this.timer)
 			}
-			if (this.timer1) {
-				clearInterval(this.timer1)
-			}
 		},
 		methods: {
-			radioGroupChange(e) {
-				this.newPlateNumber = e
-			},
-			// 获取车辆列表
-			handlegetMycars() {
-				let that = this;
-				this.$u.api.getMycars()
-					.then(res => {
-						if (res.code === 200) {
-							this.groupList = res.data.rows;
-							this.radiogroupList = res.data.rows;
-							this.$nextTick(() => {
-								// dom元素更新后执行，因此这里能正确打印更改之后的值
-								console.log(that.$refs.refValue.init()) // 改变了的值
-							})
-						} else {
-							this.$refs.uToast.show({
-								title: res.msg,
-								type: 'error'
-							})
-						}
-					})
-					.catch(err => {
-						this.$refs.uToast.show({
-							title: '操作失败!',
-							type: 'error'
-						})
-					});
-			},
-			//更换车牌信息
-			changevehicleNo() {
-				this.ShowchangevehicleNo = true;
-				this.handlegetMycars();
-			},
-			// 添加车辆
-			handleAddCar() {
-				if (!this.$u.test.carNo(this.newPlateNumber)) {
-					this.$refs.uToast.show({
-						title: '请正确填写车牌号',
-						type: 'error',
-					});
-					return
-				}
-				let param = {
-					orderId: this.orderId,
-					vehicleNo: this.newPlateNumber,
-					vehicleColor: this.vehicleColor,
-				};
-				let that = this;
-				this.$u.api.bindVehicleNo(param)
-					.then(res => {
-						if (res.code === 200) {
-							this.$refs.uToast.show({
-								title: res.msg,
-								type: 'success',
-							});
-							that.getOrderDetails(that.orderId);
-							that.ShowchangevehicleNo = false;
-						} else {
-							this.$refs.uToast.show({
-								title: res.msg,
-								type: 'error',
-							});
-						}
-					})
-					.catch(err => {
-						this.$refs.uToast.show({
-							title: '操作失败!',
-							type: 'error',
-						});
-					});
-			},
-			//新增车牌
-			addvehicleNo() {
-				this.ShowaddvehicleNo = true;
-			},
-
-			// 点击输入框
-			messageInputClick() {
-				this.keyboardshow = true;
-			},
-			// 按键被点击(点击退格键不会触发此事件)
-			keyboardChange(val) {
-				// 将每次按键的值拼接到value变量中，注意+=写法
-				this.newPlateNumber += val;
-			},
-			// 退格键被点击
-			backspace() {
-				// 删除value的最后一个字符
-				if (this.newPlateNumber.length) this.newPlateNumber = this.newPlateNumber.substr(0, this.newPlateNumber
-					.length - 1);
-			},
-			// 键盘输入完成后确认
-			keyboardConfirm() {
-				this.colorShow = true;
-			},
-			// 确认颜色
-			confirmColor(e) {
-				this.vehicleColor = this.colorList[e].colorCode;
-			},
 			/**
 			 * 反复查询支付状态
 			 * @param { String } orderId
@@ -376,13 +153,13 @@
 					if (res.code === 200) {
 						if (res.data.payStatus === 1 || res.data.payStatus === 3) {
 							this.show = false
-							clearInterval(this.timer1);
+							clearInterval(this.timer);
 							this.is_pay = false
 							uni.showModal({
 								title: '提示',
 								content: '支付成功，返回首页',
 								showCancel: false,
-								success: function(res) {
+								success: (res) => {
 									if (res.confirm) {
 										uni.switchTab({
 											url: '/pages/index/index'
@@ -390,10 +167,12 @@
 									}
 								}
 							});
+						} else if (res.data.payStatus === 2) {
+							this.is_pay = true
 						}
 					} else {
 						this.show = false
-						clearInterval(this.timer1);
+						clearInterval(this.timer);
 						this.$refs.uToast.show({
 							title: res.msg,
 							type: 'error',
@@ -401,13 +180,21 @@
 					}
 				}).catch(() => {
 					this.show = false
-					clearInterval(this.timer1);
+					clearInterval(this.timer);
 				})
 			},
+			/**
+			 * 立即支付
+			 */
 			payMoney() {
 				this.payWayPop = true
 			},
-			// 查询订单信息
+			/**
+			 * 查询订单信息
+			 * @param { String } spaceId 车位ID
+			 * @param { String } orderId 订单id
+			 * @param { String } payeeId 收费员ID
+			 */
 			getOrderDetails(spaceId, orderId, payeeId) {
 				this.$u.api.geomaLockDetailsApi({
 					spaceId,
@@ -417,22 +204,11 @@
 					if (res.code === 200 && res.data.id) {
 						this.payeeName = res.data.payeeName
 						this.parkingLockStatus = 1
-						// 获取页面完整url
-						const local = window.location.href
-						// 获取url后面的参数
-						const locationLocaturl = window.location.search;
-						// 截取url中的isBack
-						let isBack = getUrlParams(local, "isBack");
-						// 如果没有isBack，则去请求
-						if (!isBack) {
-							this.show = false
-							clearInterval(this.timer1)
-						}
 						this.orderInfo = res.data
 						this.show = false
-						if (res.data.payStatus == 0) {
+						if (res.data.payStatus == 0 || res.data.payStatus == 2) {
 							this.is_pay = true
-						} else if (res.data.payStatus == 1){
+						} else if (res.data.payStatus == 1) {
 							this.is_pay = false
 							uni.showModal({
 								title: '提示',
@@ -452,24 +228,12 @@
 							title: res.msg || '订单无数据',
 							type: 'error',
 						});
-						this.show = false;
-						if (this.timer1) {
-							clearInterval(this.timer1)
-						}
-					}
-				}).catch(() => {
-					this.show = false;
-					if (this.timer1) {
-						clearInterval(this.timer1)
 					}
 				})
 			},
-			// 返回首页
-			cancel() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				})
-			},
+			/**
+			 * 关闭支付弹框
+			 */
 			closePaymentMethod() {
 				this.payWayPop = false
 			}

pages/wechatLogin/wechatLogin.vue

@@ -21,7 +21,9 @@
 			if (backUrl) {
 				this.backUrl = decodeURIComponent(backUrl)
 			}
-			let code = getUrlParams(local, "code")
+			console.log('backUrl', decodeURIComponent(backUrl))
+			let code = getUrlParams(locationLocaturl, "code")
+			console.log('code', code)
 			if (code) {
 				this.code = code
 				this.handleGetWXInfo(this.code)
@@ -42,16 +44,12 @@
 						this.getToken(res.data.openId)
 					} else {
 						this.$refs.uToast.show({
-							title: '获取用户信息失败!',
+							title: res.msg || '获取用户信息失败!',
 							type: 'error'
 						});
 						uni.hideLoading()
 					}
 				}).catch((err) => {
-					this.$refs.uToast.show({
-						title: '获取用户信息失败!',
-						type: 'error'
-					});
 					uni.hideLoading()
 				})
 			},
@@ -62,15 +60,15 @@
 			getToken(openId) {
 				this.$u.api.codeV2Api.sendSmsCodeV2api({ openId }).then(res => {
 					if (res.code === 200) {
+						this.$u.vuex('vuex_user', res.data);
+						this.$u.vuex('vuex_token', res.data.accessToken);
+						this.$u.vuex('vuex_hasLogin', true);
 						if (res.data.needVerify) {
 							localStorage.setItem('backUrl', this.backUrl)
-							uni.navigateTo({
-							  url: '/pages/center/phoneLogin/phoneLogin'
+							this.$u.route({
+								url: 'pages/center/phoneLogin/phoneLogin'
 							})
 						} else {
-							this.$u.vuex('vuex_user', res.data);
-							this.$u.vuex('vuex_token', res.data.accessToken);
-							this.$u.vuex('vuex_hasLogin', true);
 							location.href = this.backUrl
 						}
 						uni.hideLoading()