|
@@ -272,7 +272,7 @@ export default {
|
|
|
this.btnLoading = false
|
|
|
}
|
|
|
}, 10000)
|
|
|
- const { parkingRecord, discountInfo = {}, parkingRule = {}} = this.orderDetail;
|
|
|
+ const { parkingRecord, discountInfo = {}, parkingRule = {}, parkInfo = {}} = this.orderDetail;
|
|
|
const { coupons, points, memberGrade = [], paperCoupons = [], consume = [], newMemberPoints= {} } = discountInfo
|
|
|
const { hourPrice } = parkingRule
|
|
|
try {
|
|
@@ -377,23 +377,12 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
- // 新会员积分, 默认带上了,然后不加也不影响
|
|
|
- // if ( newMemberPoints?.discountFee ) {
|
|
|
- // params.discountInfo.paperCoupons = paperCoupons.filter(elm => {
|
|
|
- // if ( !elm.discountFee ) {
|
|
|
- // return false
|
|
|
- // }
|
|
|
- // return {
|
|
|
- // ...elm,
|
|
|
- // "discountFee": elm.discountFee,
|
|
|
- // // discountTime: elm.discountFee / hourPrice * 60
|
|
|
- // }
|
|
|
- // })
|
|
|
- // }
|
|
|
console.log('下单时的参数', params);
|
|
|
- const unlicensed = this.$route.query?.vehicleNo ? this.$route.query?.vehicleNo.indexOf('临') > -1 : false; // true: 临时车牌;false:燃油车牌
|
|
|
- const res = await ordersAndPrepay(params, unlicensed);
|
|
|
- // console.log('orderDetail', res);
|
|
|
+ const unlicensed = parkingRecord.vehicleNo.indexOf('临') > -1; // true: 临时车牌;false:燃油车牌
|
|
|
+ const res = await ordersAndPrepay({
|
|
|
+ params, unlicensed,
|
|
|
+ buildingId: parkInfo.buildingId
|
|
|
+ });
|
|
|
if (res?.paymentType === 'NO_FEE_PAY') {
|
|
|
this.btnLoading = false;
|
|
|
this.isPay = false
|