二维码页面

common/apiurl.js

@@ -89,9 +89,18 @@ const apiurl = {
 	},
 	// 地磁获取小票详情
 	geomaLockDetailsUrl: '/client/orderinfo/detailByQrcode',
+	//入场扫码信息
 	getDetailEntrance: '/client/parking-orderinfo/detail/entrance',
+	//场内码扫码信息
 	getDetailAdvance: '/client/parking-orderinfo/detail/advance',
-	getDetailExport: '/client/parking-orderinfo/detail/export'
+	//出场码扫码信息
+	getDetailExport: '/client/parking-orderinfo/detail/export',
+	//无牌入场
+	entranceByNoVehicle: '/client/parking-orderinfo/entrance/noVehicleNo',
+	//场内车牌查询订单信息
+	getAdvanceInfo: '/client/parking-orderinfo/advance/info-by-vehicle',
+	//出场页面信息
+	getExportInfo: '/client/parking-orderinfo/export/info'
 }
 
 export {

common/http.api.js

@@ -89,6 +89,9 @@ const install = (Vue, vm) => {
 	let getDetailEntranceApi = (params = {}) => vm.$u.post(apiurl.getDetailEntrance, params);
 	let getDetailAdvanceApi = (params = {}) => vm.$u.post(apiurl.getDetailAdvance, params);
 	let getDetailExportApi = (params = {}) => vm.$u.post(apiurl.getDetailExport, params);
+	let entranceByNoVehicleApi = (params = {}) => vm.$u.post(apiurl.entranceByNoVehicle, params);
+	let getAdvanceInfoApi = (params = {}) => vm.$u.post(apiurl.getAdvanceInfo, params);
+	let getExportInfoApi = (params = {}) => vm.$u.post(apiurl.getExportInfo, params);
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = {
 		feedbackAdd,
@@ -133,7 +136,10 @@ const install = (Vue, vm) => {
 		geomaLockDetailsApi,
 		getDetailEntranceApi,
 		getDetailAdvanceApi,
-		getDetailExportApi
+		getDetailExportApi,
+		entranceByNoVehicleApi,
+		getAdvanceInfoApi,
+		getExportInfoApi
 	};
 }
 

common/http.interceptor - 副本.js

@@ -1,83 +0,0 @@
-import { config } from '@/common/config.js';
-import store  from '../store/index.js'
-// 这里的vm，就是我们在vue文件里面的this，所以我们能在这里获取vuex的变量，比如存放在里面的token
-// 同时，我们也可以在此使用getApp().globalData，如果你把token放在getApp().globalData的话，也是可以使用的
-const install = (Vue, vm) => {
-	Vue.prototype.$u.http.setConfig({
-		baseUrl: config.baseUrl,
-		// 如果将此值设置为true，拦截回调中将会返回服务端返回的所有数据response，而不是response.data
-		// 设置为true后，就需要在this.$u.http.interceptor.response进行多一次的判断，请打印查看具体值
-		// originalData: true, 
-		// 设置自定义头部content-type
-		// header: {
-		// 	'content-type': 'xxx'
-		// }
-	});
-	// 请求拦截，配置Token等参数
-	Vue.prototype.$u.http.interceptor.request = (config) => {
-		// config.header.Token = 'xxxxxx';
-		// 方式一，存放在vuex的token，假设使用了uView封装的vuex方式，见：https://uviewui.com/components/globalVariable.html
-		// config.header.token = vm.vuex_token;
-		
-		if(vm.vuex_token){config.header.Authorization = `Bearer ${vm.vuex_token}`;}
-		
-		// 方式二，如果没有使用uView封装的vuex方法，那么需要使用$store.state获取
-		// config.header.token = vm.$store.state.token;
-		
-		// 方式三，如果token放在了globalData，通过getApp().globalData获取
-		// config.header.token = getApp().globalData.username;
-		
-		// 方式四，如果token放在了Storage本地存储中，拦截是每次请求都执行的，所以哪怕您重新登录修改了Storage，下一次的请求将会是最新值
-		// const token = uni.getStorageSync('token');
-		// config.header.token = token;
-		// url加时间戳
-		config.url = config.url + '?t=' + Date.now()
-		// 此url参数为this.$u.get(url)中的url值
-		let noTokenList = ['/wechat/h5/user','/client/auth/verifyCode'];
-		if(noTokenList.includes(config.url)) config.header.noToken = true;
-		// console.log('noTokenList.includes(config.url)',noTokenList.includes(config.url));
-		// console.log('config.url',config.url);
-		return config; 
-	}
-	// 响应拦截，判断状态码是否通过
-	Vue.prototype.$u.http.interceptor.response = (res) => {
-		// 如果把originalData设置为了true，这里得到将会是服务器返回的所有的原始数据
-		// 判断可能变成了res.statueCode，或者res.data.code之类的，请打印查看结果
-		// console.log('interceptor res',res);
-		if(res.code == 200) {
-			// 如果把originalData设置为了true，这里return回什么，this.$u.post的then回调中就会得到什么
-			return res;  
-		} else if(res.code == 401 || res.code == 400){
-			const backUrl = location.href
-			const loginUrl = 'phoneLogin'
-			if (backUrl.indexOf(loginUrl) > 0) {
-				localStorage.clear()
-			} else {
-				localStorage.setItem('backUrl', location.href)
-				localStorage.removeItem('lifeData')
-				uni.showModal({
-					title: '提示',
-					content: '未查询到登录信息或信息已失效, 请重新登录',
-					showCancel: false,
-					success: function(res) {
-						if (res.confirm) {
-							uni.navigateTo({
-								url: "/pages/center/phoneLogin/phoneLogin"
-							})
-						}
-					}
-				});
-			}
-		} else {
-			uni.showToast({
-				title: res.msg || '程序错误!',
-				duration: 2000,
-				icon: 'none'
-			})
-		};
-	}
-}
-
-export default {
-	install
-}

pages/parkadvance/parkadvance.vue

@@ -2,227 +2,82 @@
 	<!-- 地磁 -->
 	<view class="parking-lock">
 		<!-- 地磁支付 -->
-		<template v-if="parkingLockStatus === 1">
-			<view class="parking-lock-pay">
-				<view class="parking-lock-title">支付停车费</view>
-				<view class="parking-lock-tips">请您确认停车费用，确认后请支付费用，结束停车。谢谢您的使用！</view>
+		<template >
+			<view class="parking-lock-pay" v-if="infoData">
+				<!-- <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 class="weight">{{ orderInfo.vehicleNo }}</view>
+						<view>停车场</view>
+						<view class="weight">{{ infoData.parkName}}</view>
 					</view>
 					<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.freeDuration || '0天0时15分0秒' }}</view> -->
-						<view>{{ '0天0时15分0秒' }}</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.duration || 0 }}</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">
-						<view>订单编号</view>
-						<view>{{ orderInfo.orderId }}</view>
+						<input  type="text" placeholder="请输入车牌" v-model="formInfo.vehicleNo" />
 					</view>
 				</view>
-				<view class="parking-lock-pay-btn" v-if="is_pay">
-					<button type="default" @click="payMoney">立即支付</button>
+				<view class="parking-lock-pay-btn">
+					<button type="default" @click="onSearchClick">查询</button>
 				</view>
 			</view>
-		</template>
-		<template v-else-if="parkingLockStatus === 2">
-			<view class="parking-lock-pay">
-				<view class="parking-lock-tips">{{ tipsMsg }}</view>
+			<view v-else>
+				<view class="parking-lock-info">
+					<view class="parking-lock-info-item">
+						<view>入口无车辆</view>
+					</view>
+				</view>
 			</view>
 		</template>
-		<!-- 支付方式 -->
-		<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">
-				<view class="rect1"></view>
-				<view class="rect2"></view>
-				<view class="rect3"></view>
-				<view class="rect4"></view>
-				<view class="rect5"></view>
-			</view>
-		</u-popup>
-		<u-toast ref="uToast" />
 	</view>
 </template>
 
 <script>
-	import getUrlParams from "../../utils/getUrlParams.js";
-	import PaymentMethod from '@/pages/paymentMethod/paymentMethod.vue'
 	export default {
 		components: {
-			PaymentMethod
 		},
 		data() {
 			return {
-				// 车位锁状态 1:需支付 2:查询失败返回提醒
-				parkingLockStatus: 0,
-				// 支付方式选择弹框
-				payWayPop: false,
-				// 订单编号
-				orderList: [],
-				// 提示信息
-				tipsMsg: null,
-				// 轮询
-				timer: null,
-				// 订单信息
-				orderInfo: {},
-				// 订单id
-				orderId: null,
-				// 重定向地址
-				jumpUrl: location.href + '&isBack=1',
-				show: true,
-				isBack: '',
-				polyOrderId: '',
-				// 地磁
-				spaceId: '',
-				payeeId: '',
-				payeeName: '',
-				is_pay: false
+				intoInfo:{
+					parkNo: ''
+				},
+				formInfo:{
+					vehicleNo : ''
+				},
+				infoData:undefined
 			}
 		},
 		onLoad(page) {
-			if (page.orderId) {
-				this.orderId = page?.orderId
-				this.spaceId = page?.orderId
-				this.payeeId = page?.payeeId
-				this.polyOrderId = page?.polyOrderId
-				this.isBack = page?.isBack
-			} else {
-				this.tipsMsg = page.msg || '参数丢失!';
-				this.parkingLockStatus = 2
-			}
+			this.intoInfo.parkNo = page?.parkNo;
 		},
 		onShow() {
-			if (this.orderId) {
-				this.getOrderDetails(this.spaceId, this.orderId, this.payeeId)
-				if (this.polyOrderId && this.isBack == 1) {
-					this.timer = setInterval(() => {
-						this.show = true
-						this.handlePayStatus(this.polyOrderId)
-					}, 1000)
-				}
-			} else {
-				this.show = false
-			}
+			this.getOrderDetails(this.intoInfo.parkNo);
 		},
 		onUnload() {
-			if (this.timer) {
-				clearInterval(this.timer)
-			}
+			
 		},
 		methods: {
-			/**
-			 * 反复查询支付状态
-			 * @param { String } orderId
-			 */
-			handlePayStatus(orderId) {
-				this.$u.api.getOrderInfo({
-					orderId
-				}).then(res => {
-					if (res.code === 200) {
-						if (res.data.payStatus === 1 || res.data.payStatus === 3) {
-							this.show = false
-							clearInterval(this.timer);
-							this.is_pay = false
-							uni.showModal({
-								title: '提示',
-								content: '支付成功，返回首页',
-								showCancel: false,
-								success: (res) => {
-									if (res.confirm) {
-										uni.switchTab({
-											url: '/pages/index/index'
-										})
-									}
-								}
-							});
-						} else if (res.data.payStatus === 2) {
-							this.is_pay = true
-						}
+			onSearchClick(){
+				let askParams = {
+					parkNo: this.intoInfo.parkNo,
+					vehicleNo: this.formInfo.vehicleNo
+				}
+				this.$u.api.getAdvanceInfoApi(askParams).then(res => {
+					if (res.code === 200 ) {
+						
 					} else {
-						this.show = false
-						clearInterval(this.timer);
-						this.$refs.uToast.show({
-							title: res.msg,
-							type: 'error',
-						});
+						
 					}
-				}).catch(() => {
-					this.show = false
-					clearInterval(this.timer);
 				})
 			},
-			/**
-			 * 立即支付
-			 */
-			payMoney() {
-				this.payWayPop = true
-			},
 			/**
 			 * 查询订单信息
-			 * @param { String } spaceId 车位ID
+			 * @param { String } tqgThree 车位ID
 			 * @param { String } orderId 订单id
 			 * @param { String } payeeId 收费员ID
 			 */
-			getOrderDetails(spaceId, orderId, payeeId) {
-				this.$u.api.geomaLockDetailsApi({
-					spaceId,
-					orderId,
-					payeeId
-				}).then(res => {
-					if (res.code === 200 && res.data.id) {
-						this.payeeName = res.data.payeeName
-						this.parkingLockStatus = 1
-						this.orderInfo = res.data
-						this.show = false
-						if (res.data.payStatus == 0 || res.data.payStatus == 2) {
-							this.is_pay = true
-						} else if (res.data.payStatus == 1) {
-							this.is_pay = false
-							uni.showModal({
-								title: '提示',
-								content: '订单已支付，返回首页',
-								showCancel: false,
-								success: function(res) {
-									if (res.confirm) {
-										uni.switchTab({
-											url: '/pages/index/index'
-										})
-									}
-								}
-							});
-						}
+			getOrderDetails(parkNo) {
+				this.$u.api.getDetailAdvanceApi({parkNo}).then(res => {
+					if (res.code === 200 ) {
+						this.infoData = res.data
 					} else {
 						this.$refs.uToast.show({
 							title: res.msg || '订单无数据',
@@ -230,13 +85,8 @@
 						});
 					}
 				})
-			},
-			/**
-			 * 关闭支付弹框
-			 */
-			closePaymentMethod() {
-				this.payWayPop = false
 			}
+	
 		}
 	}
 </script>

pages/parkentrace/parkentrace.vue

@@ -36,37 +36,15 @@
 				</view>
 			</view>
 		</template>
-		<!-- <template v-else-if="parkingLockStatus === 2">
-			<view class="parking-lock-pay">
-				<view class="parking-lock-tips">{{ tipsMsg }}</view>
-			</view>
-		</template> -->
-		<!-- 支付方式 -->
-		<!-- <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">
-				<view class="rect1"></view>
-				<view class="rect2"></view>
-				<view class="rect3"></view>
-				<view class="rect4"></view>
-				<view class="rect5"></view>
-			</view>
-		</u-popup> -->
-		<!-- <u-toast ref="uToast" /> -->
 	</view>
 </template>
 
 <script>
-	// import getUrlParams from "../../utils/getUrlParams.js";
-	// import PaymentMethod from '@/pages/paymentMethod/paymentMethod.vue'
 	export default {
 		components: {
 		},
 		data() {
 			return {
-		
 				intoInfo:{
 					parkNo: '',
 					roadwayNo:''
@@ -87,6 +65,25 @@
 		methods: {
 			onEntraceClick(){
 				
+				let askParams = {
+					orderId: this.infoData.id
+				}
+				this.$u.api.entranceByNoVehicleApi(askParams).then(res => {
+					if (res.code === 200 ) {
+						this.$refs.uToast.show({
+							title: res.msg || '入场成功',
+							type: 'success',
+						});
+						uni.reLaunch({
+						    url: '/pages/index/index'
+						});
+					} else {
+						this.$refs.uToast.show({
+							title: res.msg || '入场失败',
+							type: 'error',
+						});
+					}
+				})
 			},
 			/**
 			 * 查询订单信息

pages/parkexport/parkexport.vue

@@ -2,227 +2,92 @@
 	<!-- 地磁 -->
 	<view class="parking-lock">
 		<!-- 地磁支付 -->
-		<template v-if="parkingLockStatus === 1">
-			<view class="parking-lock-pay">
-				<view class="parking-lock-title">支付停车费</view>
-				<view class="parking-lock-tips">请您确认停车费用，确认后请支付费用，结束停车。谢谢您的使用！</view>
+		<template >
+			<view class="parking-lock-pay" v-if="infoData">
+				<!-- <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 class="weight">{{ orderInfo.vehicleNo }}</view>
+						<view>停车场</view>
+						<view class="weight">{{ infoData.outParkingName}}</view>
 					</view>
 					<view class="parking-lock-info-item">
-						<view>停车场名称</view>
-						<view>{{orderInfo.roadName }}</view>
+						<view>出口名称</view>
+						<view>{{infoData.outEntranceName }}</view>
 					</view>
 					<view class="parking-lock-info-item">
-						<view>停车泊位</view>
-						<view>{{orderInfo.spaceName}}</view>
+						<view>通道名称</view>
+						<view>{{infoData.outRoadwayName}}</view>
 					</view>
 					<view class="parking-lock-info-item">
 						<view>入场时间</view>
-						<view>{{orderInfo.inTime}}</view>
+						<view>{{infoData.inTime}}</view>
 					</view>
 					<view class="parking-lock-info-item">
 						<view>出场时间</view>
-						<view>{{orderInfo.outTime}}</view>
+						<view>{{infoData.outTime}}</view>
 					</view>
 					<view class="parking-lock-info-item">
-						<view>免费时长</view>
-						<!-- <view>{{ orderInfo.freeDuration || '0天0时15分0秒' }}</view> -->
-						<view>{{ '0天0时15分0秒' }}</view>
+						<view>停车时长</view>
+						<view>{{infoData.duration}}</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.duration || 0 }}</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">
-						<view>订单编号</view>
-						<view>{{ orderInfo.orderId }}</view>
+						<view>应收金额</view>
+						<view>{{infoData.totalAmount}}元</view>
 					</view>
 				</view>
-				<view class="parking-lock-pay-btn" v-if="is_pay">
-					<button type="default" @click="payMoney">立即支付</button>
+				<view class="parking-lock-pay-btn">
+					<button type="default" @click="onEntraceClick">支付出场</button>
 				</view>
 			</view>
-		</template>
-		<template v-else-if="parkingLockStatus === 2">
-			<view class="parking-lock-pay">
-				<view class="parking-lock-tips">{{ tipsMsg }}</view>
+			<view v-else>
+				<view class="parking-lock-info">
+					<view class="parking-lock-info-item">
+						<view>入口无车辆</view>
+					</view>
+				</view>
 			</view>
 		</template>
-		<!-- 支付方式 -->
-		<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">
-				<view class="rect1"></view>
-				<view class="rect2"></view>
-				<view class="rect3"></view>
-				<view class="rect4"></view>
-				<view class="rect5"></view>
-			</view>
-		</u-popup>
-		<u-toast ref="uToast" />
 	</view>
 </template>
 
 <script>
-	import getUrlParams from "../../utils/getUrlParams.js";
-	import PaymentMethod from '@/pages/paymentMethod/paymentMethod.vue'
 	export default {
 		components: {
-			PaymentMethod
 		},
 		data() {
 			return {
-				// 车位锁状态 1:需支付 2:查询失败返回提醒
-				parkingLockStatus: 0,
-				// 支付方式选择弹框
-				payWayPop: false,
-				// 订单编号
-				orderList: [],
-				// 提示信息
-				tipsMsg: null,
-				// 轮询
-				timer: null,
-				// 订单信息
-				orderInfo: {},
-				// 订单id
-				orderId: null,
-				// 重定向地址
-				jumpUrl: location.href + '&isBack=1',
-				show: true,
-				isBack: '',
-				polyOrderId: '',
-				// 地磁
-				spaceId: '',
-				payeeId: '',
-				payeeName: '',
-				is_pay: false
+				intoInfo:{
+					parkNo: '',
+					roadwayNo:''
+				},
+				infoData:undefined
 			}
 		},
 		onLoad(page) {
-			if (page.orderId) {
-				this.orderId = page?.orderId
-				this.spaceId = page?.orderId
-				this.payeeId = page?.payeeId
-				this.polyOrderId = page?.polyOrderId
-				this.isBack = page?.isBack
-			} else {
-				this.tipsMsg = page.msg || '参数丢失!';
-				this.parkingLockStatus = 2
-			}
+			this.intoInfo.parkNo = page?.parkNo;
+			this.intoInfo.roadwayNo = page?.roadwayNo;
 		},
 		onShow() {
-			if (this.orderId) {
-				this.getOrderDetails(this.spaceId, this.orderId, this.payeeId)
-				if (this.polyOrderId && this.isBack == 1) {
-					this.timer = setInterval(() => {
-						this.show = true
-						this.handlePayStatus(this.polyOrderId)
-					}, 1000)
-				}
-			} else {
-				this.show = false
-			}
+			this.getOrderDetails(this.intoInfo.parkNo, this.intoInfo.roadwayNo);
 		},
 		onUnload() {
-			if (this.timer) {
-				clearInterval(this.timer)
-			}
+			
 		},
 		methods: {
-			/**
-			 * 反复查询支付状态
-			 * @param { String } orderId
-			 */
-			handlePayStatus(orderId) {
-				this.$u.api.getOrderInfo({
-					orderId
-				}).then(res => {
-					if (res.code === 200) {
-						if (res.data.payStatus === 1 || res.data.payStatus === 3) {
-							this.show = false
-							clearInterval(this.timer);
-							this.is_pay = false
-							uni.showModal({
-								title: '提示',
-								content: '支付成功，返回首页',
-								showCancel: false,
-								success: (res) => {
-									if (res.confirm) {
-										uni.switchTab({
-											url: '/pages/index/index'
-										})
-									}
-								}
-							});
-						} else if (res.data.payStatus === 2) {
-							this.is_pay = true
-						}
-					} else {
-						this.show = false
-						clearInterval(this.timer);
-						this.$refs.uToast.show({
-							title: res.msg,
-							type: 'error',
-						});
-					}
-				}).catch(() => {
-					this.show = false
-					clearInterval(this.timer);
-				})
-			},
-			/**
-			 * 立即支付
-			 */
-			payMoney() {
-				this.payWayPop = true
+			onEntraceClick(){
+				
 			},
 			/**
 			 * 查询订单信息
-			 * @param { String } spaceId 车位ID
+			 * @param { String } tqgThree 车位ID
 			 * @param { String } orderId 订单id
 			 * @param { String } payeeId 收费员ID
 			 */
-			getOrderDetails(spaceId, orderId, payeeId) {
-				this.$u.api.geomaLockDetailsApi({
-					spaceId,
-					orderId,
-					payeeId
-				}).then(res => {
-					if (res.code === 200 && res.data.id) {
-						this.payeeName = res.data.payeeName
-						this.parkingLockStatus = 1
-						this.orderInfo = res.data
-						this.show = false
-						if (res.data.payStatus == 0 || res.data.payStatus == 2) {
-							this.is_pay = true
-						} else if (res.data.payStatus == 1) {
-							this.is_pay = false
-							uni.showModal({
-								title: '提示',
-								content: '订单已支付，返回首页',
-								showCancel: false,
-								success: function(res) {
-									if (res.confirm) {
-										uni.switchTab({
-											url: '/pages/index/index'
-										})
-									}
-								}
-							});
-						}
+			getOrderDetails(parkNo, roadwayNo) {
+				this.$u.api.getDetailExportApi({parkNo,roadwayNo}).then(res => {
+					if (res.code === 200 ) {
+						this.infoData = res.data
 					} else {
 						this.$refs.uToast.show({
 							title: res.msg || '订单无数据',
@@ -230,13 +95,8 @@
 						});
 					}
 				})
-			},
-			/**
-			 * 关闭支付弹框
-			 */
-			closePaymentMethod() {
-				this.payWayPop = false
 			}
+	
 		}
 	}
 </script>