|
@@ -299,7 +299,8 @@
|
|
|
>
|
|
>
|
|
|
<div class="left-part">
|
|
<div class="left-part">
|
|
|
<div class="amount-wrapper">
|
|
<div class="amount-wrapper">
|
|
|
- <div class="amount">{{ coupon.consumeScore / 100 }}</div>
|
|
|
|
|
|
|
+ <div class="amount" v-if="coupon.productType !== 'DISCOUNT'">{{ coupon.consumeScore / 100 }} <span style="font-size: 12px">元</span></div>
|
|
|
|
|
+ <div class="amount" v-else>{{ coupon.discount }} <span style="font-size: 12px">折</span></div>
|
|
|
</div>
|
|
</div>
|
|
|
<!-- <div class="condition">满{{ coupon.consumeScore / 100 }}可用</div> -->
|
|
<!-- <div class="condition">满{{ coupon.consumeScore / 100 }}可用</div> -->
|
|
|
</div>
|
|
</div>
|
|
@@ -484,7 +485,8 @@ import {
|
|
|
cancelOrder,
|
|
cancelOrder,
|
|
|
getUserIdByMobile,
|
|
getUserIdByMobile,
|
|
|
queryUserMemberInfo,
|
|
queryUserMemberInfo,
|
|
|
- cashPay
|
|
|
|
|
|
|
+ cashPay,
|
|
|
|
|
+ calPayAmount
|
|
|
} from '@/api/order'
|
|
} from '@/api/order'
|
|
|
import feedback from '@/utils/feedback'
|
|
import feedback from '@/utils/feedback'
|
|
|
// const route = useRoute()
|
|
// const route = useRoute()
|
|
@@ -874,30 +876,41 @@ const checkout = () => {
|
|
|
// })
|
|
// })
|
|
|
}
|
|
}
|
|
|
// 添加优惠券点击处理方法
|
|
// 添加优惠券点击处理方法
|
|
|
-const handleCouponClick = (coupon: any) => {
|
|
|
|
|
- if (
|
|
|
|
|
- orderData.sumPriceSum < coupon.consumeScore / 100 ||
|
|
|
|
|
- orderData.sumPriceSum < coupon.useThreshold / 100
|
|
|
|
|
- ) {
|
|
|
|
|
- return
|
|
|
|
|
- }
|
|
|
|
|
- if (params.couponId === coupon.ticketRecordId) {
|
|
|
|
|
- params.couponId = ''
|
|
|
|
|
- params.couponNo = ''
|
|
|
|
|
- params.couponName = ''
|
|
|
|
|
- params.couponAmount = '-'
|
|
|
|
|
- orderData.payAmount = orderData.sumPriceSum
|
|
|
|
|
- return
|
|
|
|
|
- }
|
|
|
|
|
|
|
+const handleCouponClick = async (coupon: any) => {
|
|
|
|
|
+ // 取消选中
|
|
|
|
|
+ if (params.couponId === coupon.ticketRecordId) {
|
|
|
|
|
+ params.couponId = ''
|
|
|
|
|
+ params.couponNo = ''
|
|
|
|
|
+ params.couponName = ''
|
|
|
|
|
+ params.couponAmount = '-'
|
|
|
|
|
+ orderData.payAmount = orderData.sumPriceSum
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ if (coupon.productType === 'DISCOUNT') {
|
|
|
|
|
+ const res = await calPayAmount({amount: orderData.sumPriceSum, ticketId: coupon.ticketRecordId})
|
|
|
balancePaymentPhone.value = data.phone
|
|
balancePaymentPhone.value = data.phone
|
|
|
params.couponId = coupon.ticketRecordId
|
|
params.couponId = coupon.ticketRecordId
|
|
|
params.couponNo = coupon.ticketNo
|
|
params.couponNo = coupon.ticketNo
|
|
|
params.couponName = coupon.productName
|
|
params.couponName = coupon.productName
|
|
|
- params.couponAmount = (coupon.consumeScore / 100).toFixed(2)
|
|
|
|
|
- // 计算支付金额
|
|
|
|
|
- orderData.payAmount = (
|
|
|
|
|
- Number(orderData.sumPriceSum) - Number(coupon.consumeScore / 100)
|
|
|
|
|
- ).toFixed(2)
|
|
|
|
|
|
|
+ params.couponAmount = (Number(orderData.sumPriceSum) - Number(res.single)).toFixed(2)
|
|
|
|
|
+ orderData.payAmount = res.single
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (
|
|
|
|
|
+ orderData.sumPriceSum < coupon.consumeScore / 100 ||
|
|
|
|
|
+ orderData.sumPriceSum < coupon.useThreshold / 100
|
|
|
|
|
+ ) {
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ balancePaymentPhone.value = data.phone
|
|
|
|
|
+ params.couponId = coupon.ticketRecordId
|
|
|
|
|
+ params.couponNo = coupon.ticketNo
|
|
|
|
|
+ params.couponName = coupon.productName
|
|
|
|
|
+ params.couponAmount = (coupon.consumeScore / 100).toFixed(2)
|
|
|
|
|
+ // 计算支付金额
|
|
|
|
|
+ orderData.payAmount = (
|
|
|
|
|
+ Number(orderData.sumPriceSum) - Number(coupon.consumeScore / 100)
|
|
|
|
|
+ ).toFixed(2)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const open = (item: any, num?: number, orderNumber?: any) => {
|
|
const open = (item: any, num?: number, orderNumber?: any) => {
|
|
@@ -1215,6 +1228,13 @@ const add = (item: any) => {
|
|
|
orderLoading.value = false
|
|
orderLoading.value = false
|
|
|
nextTick(() => {
|
|
nextTick(() => {
|
|
|
scrollbarRef.value!.setScrollTop(innerRef.value!.clientHeight)
|
|
scrollbarRef.value!.setScrollTop(innerRef.value!.clientHeight)
|
|
|
|
|
+ if (params.couponId) {
|
|
|
|
|
+ params.couponId = ''
|
|
|
|
|
+ params.couponNo = ''
|
|
|
|
|
+ params.couponName = ''
|
|
|
|
|
+ params.couponAmount = '-'
|
|
|
|
|
+ orderData.payAmount = orderData.sumPriceSum
|
|
|
|
|
+ }
|
|
|
})
|
|
})
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
@@ -1334,6 +1354,13 @@ const handleAddGoods = (item: any) => {
|
|
|
})
|
|
})
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
|
|
+ if (params.couponId) {
|
|
|
|
|
+ params.couponId = ''
|
|
|
|
|
+ params.couponNo = ''
|
|
|
|
|
+ params.couponName = ''
|
|
|
|
|
+ params.couponAmount = '-'
|
|
|
|
|
+ orderData.payAmount = orderData.sumPriceSum
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
//只有正常执行了接口才触发
|
|
//只有正常执行了接口才触发
|
|
|
const addHandle = (item: { summary: any }) => {
|
|
const addHandle = (item: { summary: any }) => {
|
|
@@ -1392,6 +1419,14 @@ const reduce = (item: any) => {
|
|
|
orderLoading.value = false
|
|
orderLoading.value = false
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ if (params.couponId) {
|
|
|
|
|
+ params.couponId = ''
|
|
|
|
|
+ params.couponNo = ''
|
|
|
|
|
+ params.couponName = ''
|
|
|
|
|
+ params.couponAmount = '-'
|
|
|
|
|
+ orderData.payAmount = orderData.sumPriceSum
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
//只有正常执行了接口才触发
|
|
//只有正常执行了接口才触发
|
|
|
const reduceHandle = (item: { summary: number }) => {
|
|
const reduceHandle = (item: { summary: number }) => {
|