1、当无牌车到达停车场入口时，需先扫描岗亭张贴的“无牌车入场二维码”，扫码成功后跳转新增开闸页面

2、扫码支付添加sanpay布尔值参数
3、【车主公众号-首页-停车缴费】增加订单编号字段（车位锁订单和地磁订单统一修改）
4、从上至下顺序修改为“免费时长、计费时长、累计停车时长”（车位锁订单和地磁订单统一修改）
5、修改停车缴费分为路段和停车场，点击全部缴费时仅缴费一种停车点类型

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/orderDetails/orderDetails.vue

@@ -13,7 +13,7 @@
 					:value="(orderInfo.preferentialAmount ? orderInfo.preferentialAmount.toFixed(2) : 0) + ' 元'">
 				</u-cell-item>
 			</u-cell-group>
-		 <!-- 路段显示 -->
+			<!-- 路段显示 -->
 			<u-cell-group v-if="openFlag == 'road'">
 				<u-cell-item title="订单编号 " :arrow="false" :border-bottom="false" :border-top="false"
 					:value="orderInfo.orderId"></u-cell-item>
@@ -64,43 +64,43 @@
 			</u-cell-group>
 			<!-- 停车场时长 -->
 			<u-cell-group v-if="openFlag == 'park'">
-					<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="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="orderInfo.outRoadwayName"></u-cell-item>
-						<u-cell-item title="出场时间 " :arrow="false" :border-bottom="false" :border-top="false"
-							:value="orderInfo.outTime"></u-cell-item>
-					</template>
-					<template v-else>
-						<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="orderInfo.outTime"></u-cell-item>
-					</template>
-					<template v-if="orderInfo.deviceType == 1">
-						<u-cell-item title="免费时长 " :arrow="false" :border-bottom="false" :border-top="false"
-							:value="orderInfo.freeDuration"></u-cell-item>
-					</template>
-					<template v-else>
-						<u-cell-item title="免费时长 " :arrow="false" :border-bottom="false" :border-top="false"
-							value="0天0时15分0秒"></u-cell-item>
-					</template>
-					<u-cell-item title="计费时长 " :arrow="false" :border-bottom="false" :border-top="false"
-						:value="orderInfo.calcDuration"></u-cell-item>
-					<u-cell-item title="累计停车时长 " :arrow="false" :border-bottom="false" :border-top="false"
-						:value="orderInfo.duration"></u-cell-item>
-					<u-cell-item v-if="orderInfo.createTime" title="订单创建时间 " :arrow="false" :border-bottom="false"
-						:border-top="false" :value="orderInfo.createTime"></u-cell-item>
-					<u-cell-item v-if="orderInfo.payTime" title="支付时间 " :arrow="false" :border-bottom="false"
-						:border-top="false" :value="orderInfo.payTime"></u-cell-item>
-					<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>
+				<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="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="orderInfo.outRoadwayName"></u-cell-item>
+					<u-cell-item title="出场时间 " :arrow="false" :border-bottom="false" :border-top="false"
+						:value="orderInfo.outTime"></u-cell-item>
+				</template>
+				<template v-else>
+					<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="orderInfo.outTime"></u-cell-item>
+				</template>
+				<template v-if="orderInfo.deviceType == 1">
+					<u-cell-item title="免费时长 " :arrow="false" :border-bottom="false" :border-top="false"
+						:value="orderInfo.freeDuration"></u-cell-item>
+				</template>
+				<template v-else>
+					<u-cell-item title="免费时长 " :arrow="false" :border-bottom="false" :border-top="false"
+						value="0天0时15分0秒"></u-cell-item>
+				</template>
+				<u-cell-item title="计费时长 " :arrow="false" :border-bottom="false" :border-top="false"
+					:value="orderInfo.calcDuration"></u-cell-item>
+				<u-cell-item title="累计停车时长 " :arrow="false" :border-bottom="false" :border-top="false"
+					:value="orderInfo.duration"></u-cell-item>
+				<u-cell-item v-if="orderInfo.createTime" title="订单创建时间 " :arrow="false" :border-bottom="false"
+					:border-top="false" :value="orderInfo.createTime"></u-cell-item>
+				<u-cell-item v-if="orderInfo.payTime" title="支付时间 " :arrow="false" :border-bottom="false"
+					:border-top="false" :value="orderInfo.payTime"></u-cell-item>
+				<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>
 		<view class="bottom-btn-wrap"
 			v-if="(orderInfo.payStatus == 0 || orderInfo.payStatus == 2 || orderInfo.payStatus == 3) && openFlag !== 'open'">
@@ -149,10 +149,11 @@
 				// 重定向页面
 				jumpUrl: location.href + '&type=open',
 				loadingMask: false,
-				exportFlag:false,
+				exportFlag: false,
 			}
 		},
 		onLoad(page) {
+
 			this.orderId = page?.orderId
 			// 该标识判断是否是从支付完成页面回调回来
 			this.openFlag = page?.type
@@ -172,7 +173,7 @@
 						}
 					}, 1000)
 				} else {
-					this.handleGetOrderinfo(this.orderId,this.openFlag)
+					this.handleGetOrderinfo(this.orderId, this.openFlag)
 				}
 			}
 		},
@@ -185,8 +186,8 @@
 			/**
 			 * 通过订单id去获取订单信息
 			 * */
-			handleGetOrderinfo(orderId,openFlag) {
-				if(openFlag == 'road'){
+			handleGetOrderinfo(orderId, openFlag) {
+				if (openFlag == 'road') {
 					this.$u.api.getOrderDetail({
 							id: orderId
 						})
@@ -201,7 +202,7 @@
 								})
 							}
 						})
-				}else{
+				} else {
 					this.$u.api.getRoomOrderDetail({
 							id: orderId
 						})
@@ -217,7 +218,7 @@
 							}
 						})
 				}
-			
+
 			},
 			/**
 			 * 查询支付状态
@@ -231,7 +232,7 @@
 						if (res.data.payStatus === 1 || res.data.payStatus === 3) {
 							this.loadingMask = false
 							clearInterval(this.timer);
-							this.handleGetOrderinfo(this.orderId,this.openFlag)
+							this.handleGetOrderinfo(this.orderId, this.openFlag)
 						}
 					} else {
 						this.$refs.uToast.show({
@@ -247,17 +248,17 @@
 				})
 			},
 			goPay(orderId) {
-				
+
 				this.orderList = []
 				this.orderList.push(orderId)
-				if(this.openFlag == 'park'){
+				if (this.openFlag == 'park') {
 					this.exportFlag = true
-				}else{
+				} 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

@@ -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/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,167 @@
 		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方法 )
+			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;
+
+						}).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方法 )
+			// },
 			/*上拉加载的回调*/
-			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; 
+			// upCallback(page) {
+			// 	console.log(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; 
 
-						//设置列表数据
-						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',
-						});
-					});
+			// 			//设置列表数据
+			// 			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',
+			// 			});
+			// 		});
 
-			},
+			// },
 			paythis(orderId) {
 				let orderList = [];
 				orderList.push(orderId);

pages/paymentMethod/paymentMethod.vue

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