修改部分显示字段

common/config.js

@@ -2,7 +2,7 @@ const config = {
 	wxAppid:'wxbe90cc7c5233dd84',// 测试wxAppid 
 	// wxAppid: 'wx45c3cf2b632f5fd5', // 正式wxAppid
 	
-	baseUrl:'https://wx.hw.hongweisoft.com/parkingzn',// 64服务器
+	baseUrl:'https://wx.hw.hongweisoft.com/parking',// 64服务器
 	// baseUrl: 'https://parking.pdzhtc.com', //正式接口访问地址
 }
 export {

pages/center/index.vue

@@ -126,7 +126,7 @@ export default {
       // 用户信息
       userInfo: [],
       code: null,
-      phoneNo: '18885351206',
+      phoneNo: '0851-38222696',
       logoutPop: false,
       messageNum: 0
     }

pages/center/order/order.vue

@@ -1,296 +1,321 @@
 <template>
-  <view>
-    <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"
-      >
-        <swiper-item class="swiper-item" v-for="(item, index) in list" :key="index">
-          <scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom">
-            <view class="page-box">
-              <view
-                class="order"
-                @click="goDetails(orderItem)"
-                v-for="(orderItem, index) in  orderList[index]"
-                :key="'o-' + index"
-              >
-                <view class="order-top u-flex">
-                  <view class="order-top-left u-flex-1">
-                    <view class="car">{{ orderItem.vehicleNo }}</view>
-                    <view class="addr">{{ orderItem.roadName }}</view>
-                  </view>
-                  <!--
+	<view>
+		<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">
+				<swiper-item class="swiper-item" v-for="(item, index) in list" :key="index">
+					<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom">
+						<view class="page-box">
+							<view class="order" @click="goDetails(orderItem)"
+								v-for="(orderItem, index) in  orderList[index]" :key="'o-' + index">
+								<view class="order-top u-flex">
+									<view class="order-top-left u-flex-1">
+										<view class="car">{{ orderItem.vehicleNo }}</view>
+										<view class="addr">{{ orderItem.roadName }}</view>
+									</view>
+									<!--
                     显示申请退款按钮满足一下条件:
                     1.允许退款allowRefund等于1 并且
                     2.退款状态auditStatus等于2 已驳回 或者
                     3.退款状态auditStatus不能为空 并且不能等于0
                   -->
-                  <view
-                    class="order-top-right apply-refund"
-                    v-show="orderItem.allowRefund == 1 &&
+									<view class="order-top-right apply-refund" v-show="orderItem.allowRefund == 1 &&
                     (orderItem.auditStatus == 2 || !orderItem.auditStatus && orderItem.auditStatus != 0)"
-                    @click.stop="applyRefund(orderItem)"
-                  >申请退款</view>
-                  <!--
+										@click.stop="applyRefund(orderItem)">申请退款</view>
+									<!--
                     显示申请状态满足以下条件
                     申请状态存在或者审核状态存在(由于0比较特殊,所以单独拉出来判断)
                   -->
-                  <view
-                    class="order-top-right apply-refund"
-                    @click.stop="applyRefundDetails(orderItem)"
-                    v-if="orderItem.refundStatus ||
+									<view class="order-top-right apply-refund"
+										@click.stop="applyRefundDetails(orderItem)" v-if="orderItem.refundStatus ||
                     orderItem.refundStatus == 0 ||
                     orderItem.auditStatus ||
-                    orderItem.auditStatus == 0"
-                  >{{ orderItem | verifyRefundStatus }}</view>
-                  <view
-                    class="order-top-right"
-                    v-else
-                    :class="{ 'order-top-right-finished': orderItem.orderStatus == '4' }"
-                  >{{ orderItem.orderStatus | verifyStatusFilter }}</view>
-                </view>
-                <view class="order-center">
-                  <view class="order-center-item">订单编号：{{ orderItem.orderId }}</view>
-                  <view class="order-center-item">入场时间：{{ orderItem.inTime }}</view>
-				  <view
-				    class="order-center-item"
-				    v-if="orderItem.orderStatus == 1 && orderItem.outTime"
-				  >预计出场时间：{{orderItem.outTime}}</view>
-				  <view
-				    class="order-center-item"
-				    v-if="orderItem.orderStatus !== 1"
-				  >出场时间：{{ orderItem.outTime }}</view>
-                  <view
-                    class="order-center-item"
-                    v-if="orderItem.orderStatus !== 1"
-                  >停留时间：{{ orderItem.duration }}</view>
-				  <view
-					class="order-center-item"
-					v-if="orderItem.orderStatus == 1"
-				  >
-				    预计金额：
-				    <span class="pay-amount">{{ orderItem.payAmount }}</span>
-				  </view>
-                  <view class="order-center-item" v-else>
-                    应付金额：
-                    <span class="pay-amount">{{ orderItem.payAmount }}</span>
-                  </view>
-                  <view
-                    class="order-center-item"
-                    v-if="(orderItem.actualAmount || orderItem.actualAmount === 0) && orderItem.orderStatus !== 2"
-                  >
-                    实缴金额：
-                    <span class="pay-amount">{{ orderItem.actualAmount }}</span>
-                  </view>
-					<view class="order-center-item">泊位号：{{ orderItem.spaceName }}</view>
-					<view class="order-center-item" v-if="orderItem.deviceType !=1">车位锁设备号：{{ orderItem.deviceNo }}</view>
-                </view>
-                <view class="order-bottom">
-                  <u-cell-item title="收费标准" @click.native.stop="jumpChargeStandard(orderItem)"></u-cell-item>
-                </view>
-              </view>
-              <u-loadmore :status="loadStatus[index]" bg-color="#F6F6FF"></u-loadmore>
-            </view>
-          </scroll-view>
-        </swiper-item>
-      </swiper>
-    </view>
+                    orderItem.auditStatus == 0">{{ orderItem | verifyRefundStatus }}</view>
+									<view class="order-top-right" v-else
+										:class="{ 'order-top-right-finished': orderItem.orderStatus == '4' }">
+										{{ orderItem.orderStatus | verifyStatusFilter }}</view>
+								</view>
+								<view class="order-center">
+									<view class="order-center-item">订单编号：{{ orderItem.orderId }}</view>
+									<view class="order-center-item">入场时间：{{ orderItem.inTime }}</view>
+									<!-- <view class="order-center-item"
+										v-if="orderItem.orderStatus == 1 && orderItem.outTime">
+										预计出场时间：{{ orderItem.outTime }}</view> -->
+									<view class="order-center-item"
+										v-if="orderItem.orderStatus == 1 && orderItem.outTime">
+										出场时间：{{ `未出场` }}</view>
+									<view class="order-center-item" v-if="orderItem.orderStatus !== 1">
+										出场时间：{{ orderItem.outTime }}</view>
+									<!-- <view class="order-center-item" v-if="orderItem.orderStatus !== 1">
+										停车时长：{{ orderItem.duration || 0 }}</view> -->
+									<view class="order-center-item">
+										停车时长：{{ orderItem.duration || 0 }}</view>
+									<!-- <view class="order-center-item" v-if="orderItem.orderStatus !== 1">
+										免费时长：{{ orderItem.freeDuration || 0 }}</view> -->
+									<view class="order-center-item">
+										免费时长：{{ orderItem.freeDuration || 0 }}</view>
+									<!-- <view class="order-center-item" v-if="orderItem.orderStatus !== 1">
+										计费时长：{{ orderItem.calcDuration || 0 }}</view> -->
+									<view class="order-center-item">
+										计费时长：{{ orderItem.calcDuration || 0 }}</view>
+									<view class="order-center-item" v-if="orderItem.orderStatus == 1">
+										预计金额：
+										<span class="pay-amount">{{ orderItem.payAmount || 0 }}</span>
+									</view>
+									<view class="order-center-item" v-else>
+										应付金额：
+										<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">
+										实缴金额：
+										<span class="pay-amount">{{ orderItem.actualAmount || 0 }}</span>
+									</view>
+									<view class="order-center-item">泊位号：{{ orderItem.spaceName }}</view>
+									<view class="order-center-item" v-if="Number(orderItem.deviceType) !== 1">
+										车位锁设备号：{{ orderItem.deviceNo }}</view>
+								</view>
+								<view class="order-bottom">
+									<u-cell-item title="收费标准" @click.native.stop="jumpChargeStandard(orderItem)">
+									</u-cell-item>
+								</view>
+							</view>
+							<u-loadmore :status="loadStatus[index]" bg-color="#F6F6FF"></u-loadmore>
+						</view>
+					</scroll-view>
+				</swiper-item>
+			</swiper>
+		</view>
 
-    <u-toast ref="uToast" />
-  </view>
+		<u-toast ref="uToast" />
+	</view>
 </template>
 
 <script>
-export default {
-  data () {
-    return {
-      orderList: [[], [], [], []],
-      list: [
-        { index: 0, name: '全部', orderStatu: null, pageNum: 1, total: null },
-        { index: 1, name: '停放中', orderStatu: 1, pageNum: 1, total: null },
-        { index: 2, name: '欠费未缴', orderStatu: 2, pageNum: 1, total: null },
-        { index: 3, name: '已完成', orderStatu: 4, pageNum: 1, total: null }
-      ],
-      current: 0,
-      swiperCurrent: 0,
-      tabsHeight: 0,
-      dx: 0,
-      loadStatus: ['loadmore', 'loadmore', 'loadmore', 'loadmore']
-    }
-  },
-  onShow () {
-    // onShow 刷新数据
-    this.list[this.current].pageNum = 1
-    this.orderList = [[], [], [], []]
-    this.getOrderList(this.list[this.current])
-  },
-  computed: {
-    // 价格小数
-    priceDecimal () {
-      return val => {
-        if (val !== parseInt(val)) return val.slice(-2)
-        else return '00'
-      }
-    },
-    // 价格整数
-    priceInt () {
-      return val => {
-        if (val !== parseInt(val)) return val.split('.')[0]
-        else return val
-      }
-    }
-  },
-  methods: {
-    reachBottom () {
-      // console.log('this.list[this.current]',this.list[this.current]);
-      if (this.orderList[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.getOrderList(this.list[this.current])
-    },
-    // 页面数据
+	// 订单状态orderStatus: 1-停放中 2-出场中 3-欠费 4-完成
+	export default {
+		data() {
+			return {
+				orderList: [
+					[],
+					[],
+					[],
+					[]
+				],
+				list: [{
+						index: 0,
+						name: '全部',
+						orderStatu: null,
+						pageNum: 1,
+						total: null
+					},
+					{
+						index: 1,
+						name: '停放中',
+						orderStatu: 1,
+						pageNum: 1,
+						total: null
+					},
+					{
+						index: 2,
+						name: '欠费未缴',
+						orderStatu: 2,
+						pageNum: 1,
+						total: null
+					},
+					{
+						index: 3,
+						name: '已完成',
+						orderStatu: 4,
+						pageNum: 1,
+						total: null
+					}
+				],
+				current: 0,
+				swiperCurrent: 0,
+				tabsHeight: 0,
+				dx: 0,
+				loadStatus: ['loadmore', 'loadmore', 'loadmore', 'loadmore']
+			}
+		},
+		onShow() {
+			// onShow 刷新数据
+			this.list[this.current].pageNum = 1
+			this.orderList = [
+				[],
+				[],
+				[],
+				[]
+			]
+			this.getOrderList(this.list[this.current])
+		},
+		computed: {
+			// 价格小数
+			priceDecimal() {
+				return val => {
+					if (val !== parseInt(val)) return val.slice(-2)
+					else return '00'
+				}
+			},
+			// 价格整数
+			priceInt() {
+				return val => {
+					if (val !== parseInt(val)) return val.split('.')[0]
+					else return val
+				}
+			}
+		},
+		methods: {
+			reachBottom() {
+				// console.log('this.list[this.current]',this.list[this.current]);
+				if (this.orderList[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.getOrderList(this.list[this.current])
+			},
+			// 页面数据
 
-    getOrderList (orderType) {
-      const param = {
-        pageNum: orderType.pageNum,
-        orderStatus: orderType.orderStatu
-      }
-      // 未出场: orderStatu = 1-停放中
-      // 缴费中: orderStatu = 2-出场中  && payStatus = 2-支付中
-      // 完成:   orderStatu = 4-完成
-      this.$u.api.getOrderList(param)
-        .then(res => {
-          for (const item of res.data.pageInfo.rows) {
-            this.orderList[orderType.index].push(item)
-          }
-          this.list[this.current].total = res.data.pageInfo.total
-          this.list[orderType.index].pageNum++
-          if (this.orderList[this.current].length >= this.list[this.current].total) {
-            this.loadStatus.splice(this.list[orderType.index].index, 1, 'nomore')
-          };
-        }).catch(err => {
-          this.$refs.uToast.show({
-            title: err.msg,
-            type: 'error'
-          })
-          // console.log('getOrderList ',err)
-        })
+			getOrderList(orderType) {
+				const param = {
+					pageNum: orderType.pageNum,
+					orderStatus: orderType.orderStatu
+				}
+				// 未出场: orderStatu = 1-停放中
+				// 缴费中: orderStatu = 2-出场中  && payStatus = 2-支付中
+				// 完成:   orderStatu = 4-完成
+				this.$u.api.getOrderList(param)
+					.then(res => {
+						for (const item of res.data.pageInfo.rows) {
+							this.orderList[orderType.index].push(item)
+						}
+						this.list[this.current].total = res.data.pageInfo.total
+						this.list[orderType.index].pageNum++
+						if (this.orderList[this.current].length >= this.list[this.current].total) {
+							this.loadStatus.splice(this.list[orderType.index].index, 1, 'nomore')
+						};
+					}).catch(err => {
+						this.$refs.uToast.show({
+							title: err.msg,
+							type: 'error'
+						})
+						// console.log('getOrderList ',err)
+					})
 
-      this.loadStatus.splice(this.current, 1, 'loadmore')
-    },
-    // tab栏切换
-    change (index) {
-      // this.swiperCurrent = this.list[index].orderStatu;
-      this.swiperCurrent = index
-      this.getOrderList(this.list[index])
-    },
-    transition ({ detail: { dx } }) {
-      this.$refs.tabs.setDx(dx)
-    },
-    animationfinish ({ detail: { current } }) {
-      this.$refs.tabs.setFinishCurrent(current)
-      this.swiperCurrent = current
-      this.current = current
-    },
-    /**
-     * 跳转详情
-     * 未发起退款或者未退款成功的
-     * */
-    goDetails (item) {
-      this.$u.route({
-        url: 'pages/center/order/orderDetails/orderDetails',
-        params: {
-          orderId: item.id
-        }
-      })
-    },
-    jumpChargeStandard (item) {
-      this.$u.route({
-        url: 'pages/chargeStandard/chargeStandard',
-        params: {
-          roadNo: item.roadNo
-        }
-      })
-    },
-    // 申请退款
-    applyRefund (item) {
-      this.$u.route('pages/applyRefund/applyRefund', {
-        orderId: item.orderId,
-        payAmount: item.actualAmount
-      })
-    },
-    /**
-     * 申请退款详情
-     * 只要申请退款状态等于1并且审批状态等于1跳转到退款完成详情页
-     *  否则跳转到退款过程页
-     * */
-    applyRefundDetails (item) {
-      if (item.refundStatus === 1 && item.auditStatus === 1) {
-        this.$u.route('pages/applyRefundDetails/applyRefundAchieveDetails', {
-          orderId: item.orderId
-        })
-      } else {
-        this.$u.route('pages/applyRefundDetails/applyRefundDetails', {
-          orderId: item.orderId
-        })
-      }
-    }
-  },
-  filters: {
-    verifyStatusFilter (value) {
-      if (value === 0) {
-        return ''
-      } else if (value === 1) {
-        return '停放中'
-      } else if (value === 2) {
-        return '欠费未缴'
-      } else if (value === 4) {
-        return '已完成'
-      } else {
-        return ''
-      }
-    },
-    verifyRefundStatus (item) {
-      if (item.auditStatus === 0) {
-        return '申请退款中'
-      } else if (item.auditStatus === 1) {
-        if (item.refundStatus === 0) {
-          return '退款失败'
-        } else if (item.refundStatus === 1) {
-          return '退款成功'
-        }
-      } else if (item.auditStatus === 2) {
-        return '已驳回'
-      }
-    }
-  }
-}
+				this.loadStatus.splice(this.current, 1, 'loadmore')
+			},
+			// tab栏切换
+			change(index) {
+				// this.swiperCurrent = this.list[index].orderStatu;
+				this.swiperCurrent = index
+				this.getOrderList(this.list[index])
+			},
+			transition({
+				detail: {
+					dx
+				}
+			}) {
+				this.$refs.tabs.setDx(dx)
+			},
+			animationfinish({
+				detail: {
+					current
+				}
+			}) {
+				this.$refs.tabs.setFinishCurrent(current)
+				this.swiperCurrent = current
+				this.current = current
+			},
+			/**
+			 * 跳转详情
+			 * 未发起退款或者未退款成功的
+			 * */
+			goDetails(item) {
+				this.$u.route({
+					url: 'pages/center/order/orderDetails/orderDetails',
+					params: {
+						orderId: item.id
+					}
+				})
+			},
+			jumpChargeStandard(item) {
+				this.$u.route({
+					url: 'pages/chargeStandard/chargeStandard',
+					params: {
+						roadNo: item.roadNo
+					}
+				})
+			},
+			// 申请退款
+			applyRefund(item) {
+				this.$u.route('pages/applyRefund/applyRefund', {
+					orderId: item.orderId,
+					payAmount: item.actualAmount
+				})
+			},
+			/**
+			 * 申请退款详情
+			 * 只要申请退款状态等于1并且审批状态等于1跳转到退款完成详情页
+			 *  否则跳转到退款过程页
+			 * */
+			applyRefundDetails(item) {
+				if (item.refundStatus === 1 && item.auditStatus === 1) {
+					this.$u.route('pages/applyRefundDetails/applyRefundAchieveDetails', {
+						orderId: item.orderId
+					})
+				} else {
+					this.$u.route('pages/applyRefundDetails/applyRefundDetails', {
+						orderId: item.orderId
+					})
+				}
+			}
+		},
+		filters: {
+			verifyStatusFilter(value) {
+				if (value === 0) {
+					return ''
+				} else if (value === 1) {
+					return '停放中'
+				} else if (value === 2) {
+					return '欠费未缴'
+				} else if (value === 4) {
+					return '已完成'
+				} else {
+					return ''
+				}
+			},
+			verifyRefundStatus(item) {
+				if (item.auditStatus === 0) {
+					return '申请退款中'
+				} else if (item.auditStatus === 1) {
+					if (item.refundStatus === 0) {
+						return '退款失败'
+					} else if (item.refundStatus === 1) {
+						return '退款成功'
+					}
+				} else if (item.auditStatus === 2) {
+					return '已驳回'
+				}
+			}
+		}
+	}
 </script>
 
 <style>
-/* #ifndef H5 */
-page {
-  height: 100%;
-  background-color: #f6f6ff;
-}
-/* #endif */
+	/* #ifndef H5 */
+	page {
+		height: 100%;
+		background-color: #f6f6ff;
+	}
+
+	/* #endif */
 </style>
 
 <style lang="scss" scoped>
-@import "./order.scss";
+	@import "./order.scss";
 </style>

pages/center/order/orderDetails/orderDetails.vue

@@ -41,20 +41,34 @@
           :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>
         <u-cell-item
-          title="计费时长 "
+          title="停车时长 "
           :arrow="false"
           :border-bottom="false"
           :border-top="false"
           :value="orderInfo.duration"
         ></u-cell-item>
-        <u-cell-item
-          title="出场时间 "
-          :arrow="false"
-          :border-bottom="false"
-          :border-top="false"
-          :value="orderInfo.outTime"
-        ></u-cell-item>
+				<u-cell-item
+				  title="免费时长 "
+				  :arrow="false"
+				  :border-bottom="false"
+				  :border-top="false"
+				  :value="orderInfo.duration"
+				></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="订单创建时间 "

pages/index/index.vue

@@ -40,10 +40,10 @@
 
 		<u-card :show-head="false" :show-foot="false" border-radius="16" margin="20rpx 40rpx" padding="30">
 			<view slot="body" class="myorders">
-				<view class="myorders-item">当前已缴费<text style="color: #008CFF;">{{totalCount||'0'}}</text>笔，合计<text
-						style="color: #008CFF;">{{totalActualAmount||'0'}}</text>元</view>
+				<view class="myorders-item">当前已缴费<text style="color: #008CFF;">{{ totalCount || '0'}}</text>笔，合计<text
+						style="color: #008CFF;">{{totalActualAmount || '0'}}</text>元</view>
 				<view class="myorders-item">当前欠费<text style="color: #FF482B;">{{totalPayCount||'0'}}</text>笔，合计<text
-						style="color: #FF482B;">{{totalPayAmount||'0'}}</text>元</view>
+						style="color: #FF482B;">{{ totalPayAmount || '0' }}</text>元</view>
 			</view>
 		</u-card>
 		<!-- ===================================== 无停车信息 ===================================== -->
@@ -79,11 +79,11 @@
 							</view>
 							<view class="item-cell">
 								<span class="pending-order-body-left-label">出场时间：</span>
-								<span>{{item.outTime}}</span>
+								<span>{{item.outTime || '未出场' }}</span>
 							</view>
 							<view class="item-cell">
 								<span class="pending-order-body-left-label">预计金额：</span>
-								<span>{{ item.payAmount }}</span>
+								<span>{{ item.payAmount || 0 }}</span>
 							</view>
 							<view class="item-cell" v-if="item.vehicleNo==''">
 								<span class="pending-order-body-left-label">车牌信息：</span>
@@ -92,7 +92,7 @@
 							<view class="item-cell" v-else>
 								<span class="pending-order-body-left-label">车牌信息：</span>
 								<span >{{ item.vehicleNo }}</span>
-								<span class="pending-order-body-right-label" @click="changevehicleNo(item.orderId)">更换</span>
+								<!-- <span class="pending-order-body-right-label" @click="changevehicleNo(item.orderId)">更换</span> -->
 							</view>
 							<!-- <view class="item-cell">
                 <span class="pending-order-body-left-label">出场时间:</span>
@@ -113,7 +113,7 @@
 						<view class="pending-order-body-right">
 							<view class="order">停车泊位:{{ item.spaceName }}</view>
 						</view>
-						<view class="go-pay-wrap">
+						<view class="go-pay-wrap" v-if="Number(item.deviceType) !== 2">
 							<view class="go-pay" @click="goPay(item.id)" v-if="item.payAmount != 0">出场缴费</view>
 							<view class="go-pay1" v-else>出场缴费</view>
 						</view>

pages/parkingLock/parkingLock.vue

@@ -15,20 +15,32 @@
 					<view>{{orderInfo.spaceName}}</view>
 				</view>
 				<view class="parking-lock-info-item">
-					<view>免费时长</view>
-					<view>15分钟</view>
+					<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> -->
 				<view class="parking-lock-info-item">
 					<view>计费时长</view>
-					<view>{{orderInfo.duration}}</view>
+					<view>{{orderInfo.calcDuration || 0}}</view>
 				</view>
 				<!-- <view class="parking-lock-info-item">
 					<view>合计金额</view>
@@ -40,15 +52,17 @@
 				</view> -->
 				<view class="parking-lock-info-item">
 					<view>应缴金额</view>
-					<view class="really-money">{{orderInfo.payAmount}} 元</view>
+					<view class="really-money">{{orderInfo.payAmount || 0}} 元</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 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 class="really-license">{{orderInfo.vehicleNo}} <text @click="changevehicleNo"
+							class="really-license-txt1">更换</text></view>
 				</view>
 			</view>
 			<view class="parking-lock-pay-btn">
@@ -92,31 +106,29 @@
 			<view class="parking-lock-tips">{{tipsMsg}}</view>
 		</view>
 		<!-- 支付方式 -->
-		<PaymentMethod
-			:payWayPop="payWayPop"
-			:curOrderList="orderList"
-			:deviceNo="deviceNo"
-			:jumpUrl="jumpUrl"
+		<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 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">
+		<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>		
+						<u-message-input :maxlength="8" width="70" font-size="50" :disabled-keyboard="true"
+							v-model="newPlateNumber"></u-message-input>
+					</view>
 				</view>
 			</view>
 			<view class="popup-vehicleNo-select">暂无绑定车牌</view>
@@ -125,24 +137,27 @@
 				<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">
+
+		<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>	
+						<u-message-input :maxlength="8" width="70" font-size="50" :disabled-keyboard="true"
+							v-model="newPlateNumber"></u-message-input>
+					</view>
 				</view>
 			</view>
 			<view class="popup-vehicleNo-select">
 				<u-collapse ref="refValue">
 					<u-collapse-item title="点击选择车牌" align="center">
-						<u-cell-group >
-							<u-cell-item  :title="item.vehicleNo" v-for="(item, index) in groupList"  :key="index" :arrow="false" >
-								<u-radio-group v-model="selectvalue"  @change="radioGroupChange">
-									<u-radio  :name="item.vehicleNo" :key="index"></u-radio>
+						<u-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>
@@ -155,7 +170,8 @@
 			</view>
 		</u-popup>
 		<u-action-sheet :list="colorList" @click="confirmColor" v-model="colorShow"></u-action-sheet>
-		<u-keyboard ref="uKeyboard" mode="car" @change="keyboardChange" @confirm="keyboardConfirm" @backspace="backspace" v-model="keyboardshow"></u-keyboard>
+		<u-keyboard ref="uKeyboard" mode="car" @change="keyboardChange" @confirm="keyboardConfirm"
+			@backspace="backspace" v-model="keyboardshow"></u-keyboard>
 	</view>
 </template>
 
@@ -173,16 +189,27 @@
 				radiogroupList: [],
 				keyboardshow: false,
 				colorShow: false,
-				colorList:[
-					{text:'蓝色',colorCode:0}
-					,{text:'黄色',colorCode:1}
-					,{text:'黑色',colorCode:2}
-					,{text:'白色',colorCode:3}
-					,{text:'绿色',colorCode:4}
-					,{text:'其他',colorCode:99}
-				],
-				vehicleColor:0,
-				newPlateNumber:'',
+				colorList: [{
+					text: '蓝色',
+					colorCode: 0
+				}, {
+					text: '黄色',
+					colorCode: 1
+				}, {
+					text: '黑色',
+					colorCode: 2
+				}, {
+					text: '白色',
+					colorCode: 3
+				}, {
+					text: '绿色',
+					colorCode: 4
+				}, {
+					text: '其他',
+					colorCode: 99
+				}],
+				vehicleColor: 0,
+				newPlateNumber: '',
 				//更换车牌弹窗
 				ShowchangevehicleNo: false,
 				//添加车牌弹窗
@@ -222,15 +249,15 @@
 			}
 		},
 		onShow() {
-			if(this.orderId){
+			if (this.orderId) {
 				this.timer1 = setInterval(() => {
 					// uni.showLoading({
 					//     title: '订单查询中'
 					// });
 					this.show = true
 					this.getOrderDetails(this.orderId)
-				}, 2000)				
-			}else{
+				}, 2000)
+			} else {
 				this.show = false
 			}
 		},
@@ -243,14 +270,14 @@
 			}
 		},
 		methods: {
-			radioGroupChange(e){
+			radioGroupChange(e) {
 				this.newPlateNumber = e
 			},
 			// 获取车辆列表
-			handlegetMycars(){
+			handlegetMycars() {
 				let that = this;
 				this.$u.api.getMycars()
-					.then(res=>{
+					.then(res => {
 						if (res.code === 200) {
 							this.groupList = res.data.rows;
 							this.radiogroupList = res.data.rows;
@@ -265,7 +292,7 @@
 							})
 						}
 					})
-					.catch(err=>{
+					.catch(err => {
 						this.$refs.uToast.show({
 							title: '操作失败!',
 							type: 'error'
@@ -273,13 +300,13 @@
 					});
 			},
 			//更换车牌信息
-			changevehicleNo(){
+			changevehicleNo() {
 				this.ShowchangevehicleNo = true;
 				this.handlegetMycars();
 			},
 			// 添加车辆
-			handleAddCar(){
-				if(!this.$u.test.carNo(this.newPlateNumber)){
+			handleAddCar() {
+				if (!this.$u.test.carNo(this.newPlateNumber)) {
 					this.$refs.uToast.show({
 						title: '请正确填写车牌号',
 						type: 'error',
@@ -293,7 +320,7 @@
 				};
 				let that = this;
 				this.$u.api.bindVehicleNo(param)
-					.then(res=>{
+					.then(res => {
 						if (res.code === 200) {
 							this.$refs.uToast.show({
 								title: res.msg,
@@ -308,7 +335,7 @@
 							});
 						}
 					})
-					.catch(err=>{
+					.catch(err => {
 						this.$refs.uToast.show({
 							title: '操作失败!',
 							type: 'error',
@@ -316,12 +343,12 @@
 					});
 			},
 			//新增车牌
-			addvehicleNo(){
+			addvehicleNo() {
 				this.ShowaddvehicleNo = true;
 			},
-			
+
 			// 点击输入框
-			messageInputClick(){
+			messageInputClick() {
 				this.keyboardshow = true;
 			},
 			// 按键被点击(点击退格键不会触发此事件)
@@ -332,17 +359,18 @@
 			// 退格键被点击
 			backspace() {
 				// 删除value的最后一个字符
-				if(this.newPlateNumber.length) this.newPlateNumber = this.newPlateNumber.substr(0, this.newPlateNumber.length - 1);
+				if (this.newPlateNumber.length) this.newPlateNumber = this.newPlateNumber.substr(0, this.newPlateNumber
+					.length - 1);
 			},
 			// 键盘输入完成后确认
-			keyboardConfirm(){
+			keyboardConfirm() {
 				this.colorShow = true;
 			},
 			// 确认颜色
-			confirmColor(e){
+			confirmColor(e) {
 				this.vehicleColor = this.colorList[e].colorCode;
 			},
-			
+
 			payMoney() {
 				this.payWayPop = true
 			},
@@ -351,9 +379,11 @@
 				// uni.showLoading({
 				//     title: '订单查询中'
 				// });
-				this.$u.api.getOrderDetail({id: id})
+				this.$u.api.getOrderDetail({
+						id: id
+					})
 					.then(res => {
-						
+
 						console.log(res)
 						if (res.code === 200) {
 							// 获取页面完整url
@@ -362,14 +392,14 @@
 							const locationLocaturl = window.location.search;
 							// 截取url中的isBack
 							let isBack = getUrlParams(local, "isBack");
-							console.log('isBack',isBack);
-							console.log('isBack',isBack == null || isBack != '1');
+							console.log('isBack', isBack);
+							console.log('isBack', isBack == null || isBack != '1');
 							// 如果没有isBack，则去请求
 							if (!isBack) {
 								// uni.hideLoading();
 								this.show = false
 								clearInterval(this.timer1)
-							} 
+							}
 							this.orderInfo = res.data
 							if (res.data.payStatus === 1) {
 								// uni.hideLoading();
@@ -389,7 +419,9 @@
 			// 查询设备状态
 			getEqumentStatus(orderNo) {
 				console.log(orderNo)
-				this.$u.api.getEquomentInfo({orderNo: orderNo})
+				this.$u.api.getEquomentInfo({
+						orderNo: orderNo
+					})
 					.then(res => {
 						if (res.code === 200) {
 							console.log(res.data)
@@ -418,5 +450,5 @@
 </script>
 
 <style lang="scss" scoped>
-@import './parkingLock.scss';
+	@import './parkingLock.scss';
 </style>

pages/payLists/payLists.scss

@@ -1,3 +1,6 @@
+page {
+	padding-bottom: 240rpx;
+}
 .swiper-wrap{
 	display: flex;
 	flex-direction: column;
@@ -62,7 +65,7 @@
 	width: 100%;
 	position: fixed;
 	z-index: 1000;
-	bottom: 40rpx;
+	bottom: 0;
 }
 .bottom-total{
 	font-size: 32rpx;
@@ -82,7 +85,7 @@
 	.button{
 		position: fixed;
 		left: 20rpx;
-		bottom: 40rpx;
+		bottom: 10rpx;
 		right: 20rpx;
 		z-index: 999;
 	}

pages/payLists/payLists.vue

@@ -1,8 +1,9 @@
 <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%;" >
+		<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">
@@ -14,15 +15,24 @@
 						</view>
 						<view class="pay-center">
 							<view class="pay-center-item">停车泊位：{{payItem.spaceName}}</view>
-							<view class="pay-center-item">入场时间：{{payItem.inTime}}</view>
-							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">出场时间：{{payItem.outTime}}</view>
-							<view class="pay-center-item" v-if="payItem.orderStatus !== 1">停留时间：{{payItem.duration}}</view>
-							<view class="pay-center-item">应付金额：<span class="pay-amount">{{payItem.payAmount}}</span></view>
-							<view class="pay-center-item" v-if="payItem.deviceType != 1">车位锁设备号：{{payItem.deviceNo}}</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="paythis(payItem.orderId)" style="color: #008CFF;"></u-cell-item> -->
-							<u-cell-item title="去支付" @click="choosePayWay(payItem.orderId)" style="color: #008CFF;"></u-cell-item>
+							<u-cell-item title="去支付" @click="choosePayWay(payItem.orderId)" style="color: #008CFF;">
+							</u-cell-item>
 						</view>
 					</view>
 				</view>
@@ -33,36 +43,25 @@
 				累计欠费<span class="total">{{totalCount}}</span>笔,合计<span class="total">{{totalPayAmount}}</span>元
 			</view>
 			<view class="button-wrap" v-if="payList.length&&payList.length>=1">
-			<!-- <button class="button" type="primary" @click="all()">全部缴费</button> -->
-			<button class="button" type="primary" @click="confirmPrice()">全部缴费</button>
-		</view>
+				<!-- <button class="button" type="primary" @click="all()">全部缴费</button> -->
+				<button class="button" type="primary" @click="confirmPrice()">全部缴费</button>
+			</view>
 		</view>
-		
+
 		<!-- 缴费提示-->
-		<u-modal
-			v-model="payTipsPop"
-			:title-style="{color: '#404040'}"
-			title="缴费提示"
-			:show-confirm-button="true"
-			confirm-text="立即缴费"
-			:confirm-style="{backgroundColor: '#3397FA', color: '#fff'}"
-			:show-cancel-button="true"
-			cancel-text="取消"
-			:cancel-style="{backgroundColor: '#EBF1FF', color: '#3397FA'}"
-			@confirm="payTipsPopConfirm"
-		>
+		<u-modal v-model="payTipsPop" :title-style="{color: '#404040'}" title="缴费提示" :show-confirm-button="true"
+			confirm-text="立即缴费" :confirm-style="{backgroundColor: '#3397FA', color: '#fff'}" :show-cancel-button="true"
+			cancel-text="取消" :cancel-style="{backgroundColor: '#EBF1FF', color: '#3397FA'}"
+			@confirm="payTipsPopConfirm">
 			<view class="slot-content">
 				<view class="pay-tips">
-					<text>{{payTipsItem.num}}</text>场停车欠费，共
-					<text>{{payTipsItem.price}}</text>元
+					<text>{{payTipsItem.num || 0}}</text>场停车欠费，共
+					<text>{{payTipsItem.price || 0}}</text>元
 				</view>
 			</view>
 		</u-modal>
 		<!-- 支付方式 -->
-		<PaymentMethod
-			:payWayPop="payWayPop"
-			:curOrderList="currentItem"
-			:jumpUrl="jumpUrl"
+		<PaymentMethod :payWayPop="payWayPop" :curOrderList="currentItem" :jumpUrl="jumpUrl"
 			@closePaymentMethod="closePaymentMethod"></PaymentMethod>
 		<u-toast ref="uToast" />
 	</view>
@@ -79,8 +78,8 @@
 		},
 		data() {
 			return {
-				totalPayAmount:'',
-				totalCount:'',
+				totalPayAmount: '',
+				totalCount: '',
 				currentPayUrl: "",
 				payList: [],
 				list: [],
@@ -115,26 +114,26 @@
 				};
 			}
 		},
-		onLoad(){
+		onLoad() {
 			const href = location.href.split('#')
 			this.jumpUrl = href[0] + '#/pages/center/order/order'
 		},
 		onShow() {
 			// onShow 刷新数据
-			if(this.mescroll){
+			if (this.mescroll) {
 				this.mescroll.triggerDownScroll();
 			}
-			
+
 		},
 		methods: {
-			customBack(){
+			customBack() {
 				this.$u.route({
-					type:'switchTab',
+					type: 'switchTab',
 					url: 'pages/index/index'
 				});
 			},
 			/*下拉刷新的回调*/
-			downCallback(){
+			downCallback() {
 				// 第2种: 下拉刷新和上拉加载调同样的接口, 则不用第1种, 直接mescroll.resetUpScroll()即可
 				this.mescroll.resetUpScroll(); // 重置列表为第一页 (自动执行 page.num=1, 再触发upCallback方法 )
 			},
@@ -143,78 +142,86 @@
 				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',
+				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',
+						});
 					});
-				});
-				
+
 			},
-			paythis(orderId){
-				let orderList=[];
+			paythis(orderId) {
+				let orderList = [];
 				orderList.push(orderId);
-				this.$u.api.payGzbank({orderList: orderList}).then(res=>{
+				this.$u.api.payGzbank({
+					orderList: orderList
+				}).then(res => {
 					let payUrl = res.data.url;
-					this.currentPayUrl=encodeURIComponent(res.data.url);
+					this.currentPayUrl = encodeURIComponent(res.data.url);
 					// return;
 					this.$u.route({
 						url: 'pages/payLists/pay',
 						params: {
-							currentPayUrl:this.currentPayUrl
+							currentPayUrl: this.currentPayUrl
 						}
 					});
-				}).catch(err=>{
+				}).catch(err => {
 					this.$refs.uToast.show({
 						title: err.msg,
 						type: 'error',
 					});
 				});
 			},
-			all(){
-				this.payList.forEach((item, index, arr)=>{
+			all() {
+				this.payList.forEach((item, index, arr) => {
 					console.log(item)
-					if(item.orderId){
+					if (item.orderId) {
 						this.orderList.push(item.orderId)
 					}
 				});
-				
-				this.$u.api.payGzbank({orderList: this.orderList}).then(res=>{
+
+				this.$u.api.payGzbank({
+					orderList: this.orderList
+				}).then(res => {
 					let payUrl = res.data.url;
-					this.currentPayUrl=encodeURIComponent(res.data.url);
+					this.currentPayUrl = encodeURIComponent(res.data.url);
 					// console.log('this.currentPayUrl',this.currentPayUrl);
 					// return;
 					this.$u.route({
 						url: 'pages/payLists/pay',
 						params: {
-							currentPayUrl:this.currentPayUrl
+							currentPayUrl: this.currentPayUrl
 						}
 					});
-				}).catch(err=>{
+				}).catch(err => {
 					this.$refs.uToast.show({
 						title: err.msg,
 						type: 'error',
@@ -229,12 +236,13 @@
 			},
 			// 全部缴费确认
 			confirmPrice() {
-				let orderNum = 0, price = 0
+				let orderNum = 0,
+					price = 0
 				this.currentItem = []
 				this.payList.forEach(item => {
-					if (item.orderStatus !== 4 && item.payStatus !== 1 ) {
+					if (item.orderStatus !== 4 && item.payStatus !== 1) {
 						price += Number(item.payAmount)
-						orderNum ++
+						orderNum++
 						this.currentItem.push(item.orderId)
 					}
 				})
@@ -253,18 +261,20 @@
 			payTipsPopConfirm() {
 				this.payWayPop = true
 			},
-			handleGetOrderinfo(orderId){
-				this.$u.api.getOrderinfo({id:orderId})
-				.then(res=>{
-					this.orderInfo = res.data;
-					console.log('handleGetOrderinfo',JSON.parse(JSON.stringify(res)));
-				}).catch(err=>{
-					this.$refs.uToast.show({
-						title: err.msg,
-						type: 'error',
+			handleGetOrderinfo(orderId) {
+				this.$u.api.getOrderinfo({
+						id: orderId
+					})
+					.then(res => {
+						this.orderInfo = res.data;
+						console.log('handleGetOrderinfo', JSON.parse(JSON.stringify(res)));
+					}).catch(err => {
+						this.$refs.uToast.show({
+							title: err.msg,
+							type: 'error',
+						});
 					});
-				});
-				
+
 			},
 			closePaymentMethod() {
 				this.payWayPop = false
@@ -274,15 +284,15 @@
 </script>
 
 <style>
-/* #ifndef H5 */
-page {
-	height: 100%;
-	background-color: #F6F6FF;
-}
-/* #endif */
+	/* #ifndef H5 */
+	page {
+		height: 100%;
+		background-color: #F6F6FF;
+	}
+
+	/* #endif */
 </style>
 
 <style lang="scss" scoped>
 	@import "./payLists.scss";
 </style>
-