打包配置

manifest.json

@@ -1,7 +1,12 @@
 {
     "name" : "智慧停车",
+<<<<<<< HEAD
     "appid" : "__UNI__BF6D66C",
     "description" : "普定停车二期",
+=======
+    "appid" : "__UNI__0BC09F6",
+    "description" : "",
+>>>>>>> 07f09249460eec563758cac7bb46b8f75d1c02f2
     "versionName" : "1.5.0",
     "versionCode" : "100",
     "transformPx" : false,

pages.json

@@ -96,8 +96,10 @@
 		{
 			"path": "pages/payLists/payLists",
 			"style": {
-				"navigationStyle": "custom", // 隐藏系统导航栏
-				"navigationBarTitleText": "停车缴费"
+				"navigationBarTitleText": "停车缴费",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#008CFF",
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -285,7 +287,18 @@
 			}
 
 		}
-	],
+        ,{
+            "path" : "pages/parkroadgate/parkroadgate",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "道闸",
+                "enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#008CFF",
+				"navigationBarTextStyle": "white"
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uView",

pages/center/order/order.vue

@@ -99,10 +99,11 @@
 										入场通道：{{orderItem.roadwayName}}</view>
 									<view class="order-center-item">
 										入场时间：{{ orderItem.inTime }}</view>
-									<view class="order-center-item" v-if="orderItem.orderStatus == 1 && orderItem.outTime">
+									<view class="order-center-item"
+										v-if="orderItem.orderStatus == 1 && orderItem.outTime">
 										出场通道：{{`未出场`}}</view>
-										<view class="order-center-item" v-if="orderItem.orderStatus !== 1">
-											出场通道：{{orderItem.outParkingName}}</view>
+									<view class="order-center-item" v-if="orderItem.orderStatus !== 1">
+										出场通道：{{orderItem.outParkingName}}</view>
 									<view class="order-center-item" v-if="orderItem.orderStatus !== 1">
 										出场时间：{{ orderItem.inTime }}</view>
 									<view class="order-center-item">
@@ -116,7 +117,7 @@
 										<span class="pay-amount">{{ orderItem.payAmount || 0 }}</span>
 									</view>
 									<view class="order-center-item"
-									v-if="(orderItem.actualAmount || orderItem.actualAmount === 0) && orderItem.orderStatus !== 2 && orderItem.orderStatus !== 1">
+										v-if="(orderItem.actualAmount || orderItem.actualAmount === 0) && orderItem.orderStatus !== 2 && orderItem.orderStatus !== 1">
 										实缴金额：
 										<span class="pay-amount">{{ orderItem.actualAmount || 0 }}</span>
 									</view>
@@ -159,28 +160,28 @@
 				list: [{
 						index: 0,
 						name: '全部',
-						orderStatus	: null,
+						orderStatus: null,
 						pageNum: 1,
 						total: null
 					},
 					{
 						index: 1,
 						name: '停放中',
-						orderStatus	: 1,
+						orderStatus: 1,
 						pageNum: 1,
 						total: null
 					},
 					{
 						index: 2,
 						name: '欠费未缴',
-						orderStatus	: 2,
+						orderStatus: 2,
 						pageNum: 1,
 						total: null
 					},
 					{
 						index: 3,
 						name: '已完成',
-						orderStatus	: 4,
+						orderStatus: 4,
 						pageNum: 1,
 						total: null
 					}
@@ -200,23 +201,28 @@
 						value: 'park'
 					}
 				],
-				typeCurrent: {//设置停车类型默认值
+				typeCurrent: { //设置停车类型默认值
 					label: '路段',
 					value: 'road'
 				}
 			}
 		},
-		onShow() {
-			// this.typeCurrent = this.typeList[0]
-			// onShow 刷新数据
-			this.list[this.current].pageNum = 1
-			this.orderList = [
-				[],
-				[],
-				[],
-				[]
-			]
-			this.getOrderList(this.list[this.current],this.typeCurrent)
+		onShow() {},
+		onLoad(options) {
+			let questCurrent = options.orderStatus
+			if (questCurrent) {
+				this.current = questCurrent
+				this.change(questCurrent)
+			} else {
+				this.list[this.current].pageNum = 1
+				this.orderList = [
+					[],
+					[],
+					[],
+					[]
+				]
+				this.getOrderList(this.list[this.current], this.typeCurrent)
+			}
 		},
 		computed: {
 			// 价格小数
@@ -249,21 +255,21 @@
 					return
 				};
 				this.loadStatus.splice(this.list[this.current].index, 1, 'loading')
-				this.getOrderList(this.list[this.current],this.typeCurrent)
+				this.getOrderList(this.list[this.current], this.typeCurrent)
 			},
 			// 页面数据
 
-			getOrderList(orderType,typeCurrent) {
+			getOrderList(orderType, typeCurrent) {
 				//初始化订单列表
 				const param = {
 					pageNum: orderType.pageNum,
-					orderStatus: orderType.orderStatus	
+					orderStatus: orderType.orderStatus
 				}
-				
+
 				// 未出场: orderStatus	 = 1-停放中
 				// 缴费中: orderStatus	 = 2-出场中  && payStatus = 2-支付中
 				// 完成:   orderStatus	 = 4-完成
-				if(typeCurrent.value == 'road'){
+				if (typeCurrent.value == 'road') {
 					this.$u.api.getOrderList(param)
 						.then(res => {
 							for (const item of res.data.pageInfo.rows) {
@@ -280,8 +286,8 @@
 								type: 'error'
 							})
 						})
-					
-				}else{
+
+				} else {
 					this.$u.api.getRoomParkingApi(param)
 						.then(res => {
 							for (const item of res.data.pageInfo.rows) {
@@ -299,7 +305,7 @@
 							})
 						})
 				}
-				
+
 				this.loadStatus.splice(this.current, 1, 'loadmore')
 			},
 			// tab栏切换
@@ -313,7 +319,7 @@
 					[]
 				]
 				this.list[index].pageNum = 1
-				this.getOrderList(this.list[index],this.typeCurrent)
+				this.getOrderList(this.list[index], this.typeCurrent)
 			},
 			transition({
 				detail: {
@@ -389,7 +395,7 @@
 					[]
 				]
 				this.list[this.current].pageNum = 1
-				this.getOrderList(this.list[this.current],this.typeCurrent)
+				this.getOrderList(this.list[this.current], this.typeCurrent)
 			}
 		},
 		filters: {

pages/center/order/orderDetails/orderDetails.vue

@@ -67,12 +67,12 @@
 				<u-cell-item title="订单编号 " :arrow="false" :border-bottom="false" :border-top="false"
 					:value="orderInfo.orderId"></u-cell-item>
 				<template v-if="orderInfo.deviceType == 1">
-					<u-cell-item title="入场通道 " :arrow="false" :border-bottom="false" :border-top="false" value="停车场入口">
-					</u-cell-item>
+					<u-cell-item title="入场通道 " :arrow="false" :border-bottom="false" :border-top="false"
+						:value="orderInfo.roadwayName"></u-cell-item>
 					<u-cell-item title="入场时间 " :arrow="false" :border-bottom="false" :border-top="false"
 						:value="orderInfo.inTime"></u-cell-item>
-					<u-cell-item title="出场通道 " :arrow="false" :border-bottom="false" :border-top="false" value="停车场出口">
-					</u-cell-item>
+					<u-cell-item title="出场通道 " :arrow="false" :border-bottom="false" :border-top="false"
+						:value="orderInfo.outRoadwayName"></u-cell-item>
 					<u-cell-item title="出场时间 " :arrow="false" :border-bottom="false" :border-top="false"
 						:value="orderInfo.outTime"></u-cell-item>
 				</template>
@@ -101,18 +101,22 @@
 				<u-cell-item v-if="orderInfo.payStatus == 1" title="缴费方式 " :arrow="false" :border-bottom="false"
 					:border-top="false" :value="orderInfo.paySource | verifyPaySource"></u-cell-item>
 			</u-cell-group>
+			<view class="" v-if="orderInfo.deviceType == 1 && orderInfo.payAmount == 0">
+				提示：可寻找附近的收费员打印小票并扫码出场
+			</view>
 		</view>
 		<view class="bottom-btn-wrap"
-			v-if="(orderInfo.payStatus == 0 || orderInfo.payStatus == 2 || orderInfo.payStatus == 3) && openFlag !== 'open'">
+			v-if="(orderInfo.payStatus == 0 || orderInfo.payStatus == 2 || orderInfo.payStatus == 3) && openFlag !== 'open'&& (orderInfo.deviceType != 1 && orderInfo.payAmount != 0)">
 			<view class="bottom-btn" @click="goPay(orderId)">去支付</view>
 		</view>
+		
 		<view class="bottom-btn-wrap" v-if="openFlag === 'open' && orderInfo.payStatus == 1">
 			<view class="bottom-btn" @click="jumpOrderList()">返回订单页</view>
 		</view>
 
 		<!-- 支付方式 -->
-		<PaymentMethod :payWayPop="payWayPop" :curOrderList="orderList" :jumpUrl="jumpUrl"
-			:exportFlag="openFlag === 'park'" @closePaymentMethod="closePaymentMethod"></PaymentMethod>
+		<PaymentMethod :payWayPop="payWayPop" :exportFlag="exportFlag" :curOrderList="orderList" :jumpUrl="jumpUrl"
+			@closePaymentMethod="closePaymentMethod"></PaymentMethod>
 
 		<!-- 加载中遮罩 -->
 		<u-mask :show="loadingMask">
@@ -148,10 +152,12 @@
 				orderList: [],
 				// 重定向页面
 				jumpUrl: location.href + '&type=open',
-				loadingMask: false
+				loadingMask: false,
+				exportFlag: false,
 			}
 		},
 		onLoad(page) {
+
 			this.orderId = page?.orderId
 			// 该标识判断是否是从支付完成页面回调回来
 			this.openFlag = page?.type
@@ -192,6 +198,7 @@
 						.then(res => {
 							if (res.code === 200) {
 								this.orderInfo = res.data
+								console.log(this.orderInfo)
 							} else {
 								this.$refs.uToast.show({
 									title: res.msg,
@@ -206,6 +213,7 @@
 						.then(res => {
 							if (res.code === 200) {
 								this.orderInfo = res.data
+								console.log(this.orderInfo)
 							} else {
 								this.$refs.uToast.show({
 									title: res.msg,
@@ -244,10 +252,17 @@
 				})
 			},
 			goPay(orderId) {
+
 				this.orderList = []
 				this.orderList.push(orderId)
+				if (this.openFlag == 'park') {
+					this.exportFlag = true
+				} else {
+					this.exportFlag = false
+				}
 				if (this.orderList.length > 0) {
 					this.payWayPop = true
+
 				} else {
 					this.$refs.uToast.show({
 						title: '当前订单编号不存在,请重新进入当前页面!',

pages/parkentrace/parkentrace.vue

@@ -36,6 +36,7 @@
 				</view>
 			</view>
 		</template>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -64,10 +65,10 @@
 		},
 		methods: {
 			onEntraceClick(){
-				
 				let askParams = {
 					orderId: this.infoData.id
 				}
+				
 				this.$u.api.entranceByNoVehicleApi(askParams).then(res => {
 					if (res.code === 200 ) {
 						this.$refs.uToast.show({
@@ -75,7 +76,7 @@
 							type: 'success',
 						});
 						uni.reLaunch({
-						    url: '/pages/index/index'
+						    url: '/pages/parkroadgate/parkroadgate'
 						});
 					} else {
 						this.$refs.uToast.show({
@@ -84,6 +85,7 @@
 						});
 					}
 				})
+				
 			},
 			/**
 			 * 查询订单信息

pages/parkexport/parkexport.vue

@@ -65,7 +65,7 @@
 		<template v-else>
 			<view class="parking-lock-info">
 				<view class="parking-lock-info-item">
-					<view>入口无车辆</view>
+					<view>出口无车辆</view>
 				</view>
 			</view>
 		</template>
@@ -75,6 +75,7 @@
 			:curOrderList="orderList"
 			:jumpUrl="jumpUrl"
 			:exportFlag="true"
+			:sanPay="saopay"
 			@closePaymentMethod="closePaymentMethod"
 		></PaymentMethod>
 		<u-toast ref="uToast" />
@@ -95,6 +96,7 @@
 					polyOrderId: '',
 					isBack: 0
 				},
+				saopay:true,
 				payWayPop: false, // 支付弹框
 				infoData: undefined, // 订单信息
 				orderList: [], // 支付订单列表

pages/parkingLock/parkingLock.vue

@@ -1,210 +1,218 @@
 <template>
-	<!-- 车位锁 -->
-	<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>
-				<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.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="Jump">
+			<view class="Jump-btn" @click="jumpArrears">
+				欠费补缴
+			</view>
+		</view>
+		<!-- 车位锁 -->
+		<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>
+					<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.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>{{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">
+							<view>订单编号</view>
+							<view>{{orderInfo.orderId}}</view>
+						</view>
+						<!-- <view class="parking-lock-info-item" v-if="orderInfo.vehicleNo">
+							<view>车牌信息</view>
+							<view class="really-license">{{ orderInfo.vehicleNo }}</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">
-						<view>合计金额</view>
-						<view>{{orderInfo.totalAmount}} 元</view>
+					<view class="parking-lock-pay-btn">
+						<button type="default" @click="payMoney">立即支付</button>
 					</view>
-					<view class="parking-lock-info-item">
-						<view>优惠金额</view>
-						<view>{{orderInfo.preferentialAmount}} 元</view>
+					<!-- <view class="parking-lock-pay-attention">
+						<text>
+							温馨提示：车牌信息可填可不填，如果您已通过本机号码办理了特定车或包月车业务，则需要输入车牌号，否则将按照常规收费标准进行收费。
+						</text>
 					</view> -->
-					<view class="parking-lock-info-item">
-						<view>应缴金额</view>
-						<view class="really-money">{{orderInfo.payAmount || 0}} 元</view>
+					<view class="parking-lock-pay-attention">
+						<text>
+							温馨提示：车辆计费前您有15分钟免费停车时长，15分钟过后则升板锁车开始计费。
+						</text>
 					</view>
-					<view class="parking-lock-info-item">
-						<view>订单编号</view>
-						<view>{{orderInfo.orderId}}</view>
-					</view>
-					<!-- <view class="parking-lock-info-item" v-if="orderInfo.vehicleNo">
-						<view>车牌信息</view>
-						<view class="really-license">{{ orderInfo.vehicleNo }}</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>
+			</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-info-item" v-else>
-						<view>车牌信息</view>
-						<view class="really-license">{{orderInfo.vehicleNo}} <text @click="changevehicleNo"
-								class="really-license-txt1">更换</text></view>
-					</view> -->
+					<view class="parking-lock-begin-info">车位锁正在动作，还未到位</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 class="parking-lock-pay-attention">
-					<text>
-						温馨提示：车辆计费前您有15分钟免费停车时长，15分钟过后则升板锁车开始计费。
-					</text>
-				</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>
+			</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>
-				<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>
+			</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>
-				<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>
+			</template>
+			<template v-else-if="parkingLockStatus === 5">
+				<view class="parking-lock-pay">
+					<view class="parking-lock-tips">{{tipsMsg}}</view>
 				</view>
-				<view class="parking-lock-success-info">开锁已完成</view>
-				<view class="parking-lock-success-button">
-					<button @click="cancel">返回</button>
+			</template>
+			<!-- 支付方式 -->
+			<PaymentMethod :payWayPop="payWayPop" :curOrderList="orderList" :deviceNo="deviceNo" :jumpUrl="jumpUrl"
+				@closePaymentMethod="closePaymentMethod"></PaymentMethod>
+			<u-toast ref="uToast" />
+			<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>
-			</view>
-		</template>
-		<template v-else-if="parkingLockStatus === 5">
-			<view class="parking-lock-pay">
-				<view class="parking-lock-tips">{{tipsMsg}}</view>
-			</view>
-		</template>
-		<!-- 支付方式 -->
-		<PaymentMethod :payWayPop="payWayPop" :curOrderList="orderList" :deviceNo="deviceNo" :jumpUrl="jumpUrl"
-			@closePaymentMethod="closePaymentMethod"></PaymentMethod>
-		<u-toast ref="uToast" />
-		<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-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>
+			</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>
-			<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>
+				<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>
+			<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>
-			<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>
+				<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>
+		</view>
 	</view>
+
 </template>
 
 <script>
@@ -305,6 +313,11 @@
 			}
 		},
 		methods: {
+			jumpArrears() {
+				uni.navigateTo({
+					url: '../center/order/order?orderStatus=2'
+				})
+			},
 			radioGroupChange(e) {
 				this.newPlateNumber = e
 			},
@@ -410,7 +423,9 @@
 			 * @param { String } orderId
 			 */
 			handlePayStatus(orderId) {
-				this.$u.api.getOrderInfo({ orderId }).then(res => {
+				this.$u.api.getOrderInfo({
+					orderId
+				}).then(res => {
 					if (res.code === 200) {
 						if (res.data.payStatus === 1 || res.data.payStatus === 3) {
 							this.show = false
@@ -435,7 +450,9 @@
 			},
 			// 查询订单信息
 			getOrderDetails(id) {
-				this.$u.api.getOrderDetail({ id }).then(res => {
+				this.$u.api.getOrderDetail({
+					id
+				}).then(res => {
 					if (res.code === 200 && res.data.id) {
 						this.parkingLockStatus = 1
 						// 获取页面完整url
@@ -481,22 +498,24 @@
 			},
 			// 查询设备状态
 			getEqumentStatus(orderNo) {
-				this.$u.api.getEquomentInfo({ orderNo }).then(res => {
-						if (res.code === 200) {
-							if (res.data.deviceStatus == 0) {
-								this.parkingLockStatus = 4
-								clearInterval(this.timer)
-							} else if (res.data.deviceStatus == 1 || res.data.deviceStatus == 5) {
-								this.parkingLockStatus = 2
-							} else if (res.data.deviceStatus == 6) {
-								this.parkingLockStatus = 3
-							}
-						} else {
+				this.$u.api.getEquomentInfo({
+					orderNo
+				}).then(res => {
+					if (res.code === 200) {
+						if (res.data.deviceStatus == 0) {
+							this.parkingLockStatus = 4
 							clearInterval(this.timer)
+						} else if (res.data.deviceStatus == 1 || res.data.deviceStatus == 5) {
+							this.parkingLockStatus = 2
+						} else if (res.data.deviceStatus == 6) {
+							this.parkingLockStatus = 3
 						}
-					}).catch(() => {
+					} else {
 						clearInterval(this.timer)
-					})
+					}
+				}).catch(() => {
+					clearInterval(this.timer)
+				})
 			},
 			// 返回首页
 			cancel() {
@@ -513,4 +532,16 @@
 
 <style lang="scss" scoped>
 	@import './parkingLock.scss';
+
+	.Jump {
+
+		display: flex;
+		justify-content: flex-end;
+		background-color: #F6F6FF;
+
+		&-btn {
+			color: rgb(0, 140, 255);
+			padding: 12rpx 20rpx;
+		}
+	}
 </style>

pages/parkroadgate/parkroadgate.scss

@@ -0,0 +1,30 @@
+	.parking-lock-success {
+		padding-top: 80rpx;
+		.parking-lock-success-box {
+			width: 441rpx;
+			height: 441rpx;
+			margin: 0 auto;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.parking-lock-success-info {
+			color: #4CCD8A;
+			font-size: 50rpx;
+			text-align: center;
+			margin: 56rpx 0 202rpx;
+		}
+		.parking-lock-success-button {
+			width: calc(100% - 80rpx);
+			margin: 0 auto;
+			button {
+				width: 100%;
+				height: 100rpx;
+				line-height: 100rpx;
+				background-color: #008CFF;
+				font-size: 28rpx;
+				color: #fff;
+			}
+		}
+	}

pages/parkroadgate/parkroadgate.vue

@@ -0,0 +1,35 @@
+<template>
+	<!-- 道闸 -->
+	<view class="parking-roadgate">
+		<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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			cancel(){
+				uni.reLaunch({
+				    url: '/pages/index/index'
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+@import './parkroadgate'
+</style>

pages/payLists/payLists.scss

@@ -4,11 +4,14 @@ page {
 .swiper-wrap{
 	display: flex;
 	flex-direction: column;
-	height: calc(100vh - var(--window-top));
+	height: calc(82vh - var(--window-top));
 	width: 100%;
 	.swiper-box {
 		flex: 1;
 	}
+	/deep/ .uni-swiper-slides{
+		bottom: 20rpx;
+	}
 }
 .page-box{
 	margin: 25rpx 40rpx;
@@ -75,7 +78,7 @@ page {
 	padding-top: 16rpx;
 	background-color: #E4F3FF;
 	height: 72rpx;
-	margin: 60rpx 20rpx;
+	margin: 40rpx 20rpx;
 	.total{
 		color: #3397FA;
 	}

pages/payLists/payLists.vue

@@ -1,43 +1,110 @@
 <template>
 	<view>
-		<u-navbar title-color="#fff" :custom-back="customBack" :bpay-bottom="false" back-icon-color="#CCE8FF"
-			:background="{background: '#008CFF' }" title="停车缴费"></u-navbar>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback">
-			<scroll-view scroll-y style="height: 100%; width: 100%;">
-				<view class="page-box">
-					<view class="pay" v-for="(payItem, index) in  payList" :key="payItem.id">
-						<view class="pay-top u-flex">
-							<view class="pay-top-left u-flex-1">
-								<view class="car">{{payItem.vehicleNo}}</view>
-								<view class="addr">{{payItem.roadName}}</view>
-							</view>
-							<view class="pay-top-right">{{payItem.orderStatus | filterOrderStatus}}</view>
-						</view>
-						<view class="pay-center">
-							<view class="pay-center-item">停车泊位：{{payItem.spaceName}}</view>
-							<view class="pay-center-item">入场时间：{{payItem.inTime || 0}}</view>
-							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">出场时间：{{payItem.outTime || 0}}
-							</view>
-							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">停车时长：{{payItem.duration || 0}}
-							</view>
-							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">免费时长：{{payItem.freeDuration || 0}}
-							</view>
-							<!-- 计费时长=停车时长－免费时长 -->
-							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">计费时长：{{payItem.calcDuration || 0}}
-							</view>
-							<view class="pay-center-item">应付金额：<span class="pay-amount">{{payItem.payAmount || 0}}</span>
-							</view>
-							<view class="pay-center-item" v-if="payItem.deviceType && payItem.deviceType != 1">车位锁设备号：{{payItem.deviceNo}}
-							</view>
-						</view>
-						<view class="pay-bottom">
-							<u-cell-item title="去支付" @click="choosePayWay(payItem.orderId)" style="color: #008CFF;">
-							</u-cell-item>
+		<!-- <u-navbar title-color="#fff" :custom-back="customBack" :bpay-bottom="false" back-icon-color="#CCE8FF"
+			:background="{background: '#008CFF' }" title="停车缴费"></u-navbar> -->
+		<view class="swiper-wrap">
+			<view class="u-tabs-box">
+				<u-tabs-swiper activeColor="#008CFF" ref="tabs" :list="list" :current="current" @change="change"
+					:is-scroll="false" swiperWidth="100%"></u-tabs-swiper>
+			</view>
+			<swiper class="swiper-box" :current="swiperCurrent" @transition="transition"
+				@animationfinish="animationfinish" disable-touch>
+				<swiper-item class="swiper-item" v-for="(item, index) in list" :key="index">
+					<!-- <mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"> -->
+					<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom">
+						<view class="page-box">
+							<view class="pay" v-for="(payItem, index) in  payList[index]"
+								:key="payItem.id">
+								<view  v-if="item.index==0">
+									<view  class="pay-top u-flex">
+											<view class="pay-top-left u-flex-1">
+												<view class="car">{{payItem.vehicleNo}}</view>
+												<view class="addr">{{payItem.roadName}}</view>
+											</view>
+											<view class="pay-top-right">{{payItem.orderStatus | filterOrderStatus}}
+											</view>
+										</view>
+										<view class="pay-center">
+											<view class="pay-center-item">订单编号：{{payItem.orderId}}</view>
+											<view class="pay-center-item">停车泊位：{{payItem.spaceName}}</view>
+											<view class="pay-center-item">入场时间：{{payItem.inTime || 0}}</view>
+											<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+												出场时间：{{payItem.outTime || 0}}
+											</view>
+											<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+												免费时长：{{payItem.freeDuration || 0}}
+											</view>
+											<!-- 计费时长=停车时长－免费时长 -->
+											<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+												计费时长：{{payItem.calcDuration || 0}}
+											</view>
+											<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+												累计停车时长：{{payItem.duration || 0}}
+											</view>
+											<view class="pay-center-item">应付金额：<span
+													class="pay-amount">{{payItem.payAmount || 0}}</span>
+											</view>
+											<view class="pay-center-item" v-if="payItem.deviceType && payItem.deviceType != 1">
+												车位锁设备号：{{payItem.deviceNo}}
+											</view>
+										</view>
+										<view class="pay-bottom">
+											<u-cell-item title="去支付" @click="choosePayWay(payItem.orderId)"
+												style="color: #008CFF;">
+											</u-cell-item>
+										</view>
+										
+									</view>
+									<view  v-if="item.index==1">
+										<view class="pay-top u-flex">
+											<view class="pay-top-left u-flex-1">
+												<view class="car">{{payItem.vehicleNo}}</view>
+												<view class="addr">{{payItem.parkingName}}</view>
+											</view>
+											<view class="pay-top-right">{{payItem.orderStatus | filterOrderStatus}}
+											</view>
+										</view>
+										<view class="pay-center">
+											<view class="pay-center-item">订单编号：{{payItem.orderId}}</view>
+											<view class="pay-center-item">入场通道：{{payItem.entranceName}}</view>
+											<view class="pay-center-item">入场时间：{{payItem.inTime || 0}}</view>
+											<view class="pay-center-item">出场通道：{{payItem.outEntranceName}}</view>
+											<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+												出场时间：{{payItem.outTime || 0}}
+											</view>
+											<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+												免费时长：{{payItem.freeDuration || 0}}
+											</view>
+											<!-- 计费时长=停车时长－免费时长 -->
+											<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+												计费时长：{{payItem.calcDuration || 0}}
+											</view>
+											<view class="pay-center-item" v-if="payItem.orderStatus !== 1">
+												累计停车时长：{{payItem.duration || 0}}
+											</view>
+											<view class="pay-center-item">应付金额：<span
+													class="pay-amount">{{payItem.payAmount || 0}}</span>
+											</view>
+											<view class="pay-center-item" v-if="payItem.deviceType && payItem.deviceType != 1">
+												车位锁设备号：{{payItem.deviceNo}}
+											</view>
+										</view>
+										<view class="pay-bottom">
+											<u-cell-item title="去支付" @click="choosePayWay(payItem.orderId)"
+												style="color: #008CFF;">
+											</u-cell-item>
+										</view>
+									</view>
+									
+								</view>
+								<u-loadmore :status="loadStatus[index]" bg-color="#F6F6FF"></u-loadmore>
 						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</mescroll-body>
+					</scroll-view>
+					<!-- </mescroll-body> -->
+				</swiper-item>
+			</swiper>
+		</view>
+
 		<view class="bottom">
 			<view class="bottom-total">
 				累计欠费<span class="total">{{totalCount}}</span>笔,合计<span class="total">{{totalPayAmount}}</span>元
@@ -61,7 +128,7 @@
 			</view>
 		</u-modal>
 		<!-- 支付方式 -->
-		<PaymentMethod :payWayPop="payWayPop" :curOrderList="currentItem" :jumpUrl="jumpUrl"
+		<PaymentMethod :payWayPop="payWayPop" :exportFlag="exportFlag" :curOrderList="currentItem" :jumpUrl="jumpUrl"
 			@closePaymentMethod="closePaymentMethod"></PaymentMethod>
 		<u-toast ref="uToast" />
 	</view>
@@ -81,9 +148,34 @@
 				totalPayAmount: '',
 				totalCount: '',
 				currentPayUrl: "",
-				payList: [],
-				list: [],
+				payList: [
+					[],
+					[],
+					[],
+					[]
+				],
+				list: [{
+						index: 0,
+						name: '路段',
+						orderStatus: null,
+						pageNum: 1,
+						total: null
+					},
+					{
+						index: 1,
+						name: '停车场',
+						orderStatus: 1,
+						pageNum: 1,
+						total: null
+					},
+				],
+				current: 0,
+				swiperCurrent: 0,
+				dx: 0,
+				loadStatus: ['loadmore', 'loadmore', 'loadmore', 'loadmore'],
+				isLoadMore: false, //是否加载中
 				orderList: [],
+				exportFlag: false,
 				PayUrl: "",
 				payTipsPop: false,
 				payWayPop: false,
@@ -117,67 +209,125 @@
 		onLoad() {
 			const href = location.href.split('#')
 			this.jumpUrl = href[0] + '#/pages/center/order/order'
+
+
 		},
 		onShow() {
 			// onShow 刷新数据
 			if (this.mescroll) {
 				this.mescroll.triggerDownScroll();
 			}
-
+			this.list[this.current].pageNum = 1
+			this.orderList = [
+				[],
+				[],
+				[],
+				[]
+			]
+			this.orderListArr(this.list[this.current], this.swiperCurrent)
+			
 		},
 		methods: {
+			reachBottom() {
+				if (this.payList[this.current].length >= this.list[this.current].total) {
+					this.loadStatus.splice(this.list[this.current].index, 1, 'nomore')
+					return
+				};
+				this.loadStatus.splice(this.list[this.current].index, 1, 'loading')
+				this.orderListArr(this.list[this.current], this.swiperCurrent)
+			},
+			// tab栏切换
+			change(index) {
+				this.swiperCurrent = index
+				this.current = index
+				//重新初始化
+				this.payList = [
+					[],
+					[],
+					[],
+					[]
+				]
+				this.list[index].pageNum = 1
+				if (index == 1) {
+					this.exportFlag = true
+				} else {
+					this.exportFlag = false
+				}
+				this.orderListArr(this.list[index], index)
+			},
+			transition({
+				detail: {
+					dx
+				}
+			}) {
+				this.$refs.tabs.setDx(dx)
+			},
+			animationfinish({
+				detail: {
+					current
+				}
+			}) {
+				this.$refs.tabs.setFinishCurrent(current)
+				this.swiperCurrent = current
+				this.current = current
+			},
 			customBack() {
 				this.$u.route({
 					type: 'switchTab',
 					url: 'pages/index/index'
 				});
 			},
-			/*下拉刷新的回调*/
-			downCallback() {
-				// 第2种: 下拉刷新和上拉加载调同样的接口, 则不用第1种, 直接mescroll.resetUpScroll()即可
-				this.mescroll.resetUpScroll(); // 重置列表为第一页 (自动执行 page.num=1, 再触发upCallback方法 )
-			},
-			/*上拉加载的回调*/
-			upCallback(page) {
-				let pageNum = page.num; // 页码, 默认从1开始
-				let pageSize = page.size; // 页长, 默认每页10条
-				// this.getMessageList()
-				this.$u.api.getOrderList({
-						pageSize: pageSize,
-						pageNum: pageNum,
-						paying: true
-					})
-					.then(res => {
-						// 接口返回的当前页数据列表 (数组)
-						let curPageData = res.data.pageInfo.rows;
-						// 接口返回的当前页数据长度 (如列表有26个数据,当前页返回8个,则curPageLen=8)
-						let curPageLen = curPageData.length;
-						// 接口返回的总页数 (如列表有26个数据,每页10条,共3页; 则totalPage=3)
-						let totalPage = res.data.pageInfo.pages;
-						// 接口返回的总数据量(如列表有26个数据,每页10条,共3页; 则totalSize=26)
-						let totalSize = res.data.pageInfo.total;
-						// 接口返回的是否有下一页 (true/false)
-						// let hasNext = data.pages; 
+			orderListArr(orderType, index) {
+				let pageNum = orderType.pageNum; // 页码, 默认从1开始
+				let pageSize = orderType.total; // 页长, 默认每页10条
+				if (index == 0) {
+					this.$u.api.getOrderList({
+							// pageSize: pageSize,
+							pageNum: pageNum,
+							paying: true
+						})
+						.then(res => {
+							for (const item of res.data.pageInfo.rows) {
+								this.payList[orderType.index].push(item)
+							}
+							this.list[this.current].total = res.data.pageInfo.total
+							this.list[orderType.index].pageNum++
+							if (this.payList[this.current].length >= this.list[this.current].total) {
+								this.loadStatus.splice(this.list[orderType.index].index, 1, 'nomore')
+							};
+							this.totalCount = res.data.costInfo.totalCount;	
+							this.totalPayAmount = res.data.costInfo.totalPayAmount;
 
-						//设置列表数据
-						if (page.num == 1) this.payList = []; //如果是第一页需手动置空列表
-						this.payList = this.payList.concat(curPageData); //追加新数据
-						this.totalCount = res.data.costInfo.totalCount;
-						this.totalPayAmount = res.data.costInfo.totalPayAmount;
-						// 请求成功,隐藏加载状态
-						//方法一(推荐): 后台接口有返回列表的总页数 totalPage
-						this.mescroll.endByPage(curPageLen, totalPage);
-						setTimeout(() => {
-							this.mescroll.endSuccess(curPageLen)
-						}, 20)
-					}).catch(err => {
-						this.$refs.uToast.show({
-							title: err.msg,
-							type: 'error',
+						}).catch(err => {
+							this.$refs.uToast.show({
+								title: err.msg,
+								type: 'error',
+							});
 						});
-					});
-
+				} else {
+					this.$u.api.getRoomParkingApi({
+							pageNum: pageNum,
+							paying: true
+						})
+						.then(res => {
+							for (const item of res.data.pageInfo.rows) {
+								this.payList[orderType.index].push(item)
+							}
+							this.list[this.current].total = res.data.pageInfo.total
+							this.list[orderType.index].pageNum++
+							if (this.payList[this.current].length >= this.list[this.current].total) {
+								this.loadStatus.splice(this.list[orderType.index].index, 1, 'nomore')
+							};
+							this.totalCount = res.data.costInfo.totalCount;
+							this.totalPayAmount = res.data.costInfo.totalPayAmount;
+						})
+				}
 			},
+			/*下拉刷新的回调*/
+			// downCallback() {
+			// 	// 第2种: 下拉刷新和上拉加载调同样的接口, 则不用第1种, 直接mescroll.resetUpScroll()即可
+			// 	this.mescroll.resetUpScroll(); // 重置列表为第一页 (自动执行 page.num=1, 再触发upCallback方法 )
+			// },
 			paythis(orderId) {
 				let orderList = [];
 				orderList.push(orderId);
@@ -239,7 +389,7 @@
 				let orderNum = 0,
 					price = 0
 				this.currentItem = []
-				this.payList.forEach(item => {
+				this.payList[this.current].forEach(item => {
 					if (item.orderStatus !== 4 && item.payStatus !== 1) {
 						price += Number(item.payAmount)
 						orderNum++

pages/paymentMethod/paymentMethod.vue

@@ -70,6 +70,11 @@
 				type: String,
 				default: undefined
 			},
+			//扫码支付需要字段
+			sanPay:{
+				type:Boolean,
+				default:false
+			},
 			// 追缴类型
 			pursueType: {
 				type: String,
@@ -105,9 +110,11 @@
 					jumpUrl: this.jumpUrl,
 					payeeId: this.payeeId,
 					payeeName: this.payeeName,
-					pursueType: this.pursueType
+					pursueType: this.pursueType,
+					sanPay: this.sanPay
 				};
-				if (this.exportFlag) {
+				console.log(params)
+				if (this.exportFlag == true) {
 					this.$u.api.quickPayExportApi(params).then(res=>{
 						if (res.data.needPay) {
 							let payUrl = res.data.url;
@@ -214,7 +221,8 @@
 					deviceNo: deviceNo ? deviceNo : null,
 					payeeId: this.payeeId,
 					payeeName: this.payeeName,
-					pursueType: this.pursueType
+					pursueType: this.pursueType,
+					sanPay:this.sanPay
 				};
 				if (this.exportFlag) {
 					this.$u.api.polyPayExportApi(params)