|
|
@@ -287,7 +287,7 @@
|
|
|
class="coupon-item"
|
|
|
:class="{
|
|
|
'is-selected': params.couponId === coupon.ticketRecordId,
|
|
|
- 'is-disabled': orderData.sumPriceSum <= coupon.consumeScore / 100
|
|
|
+ 'is-disabled': orderData.sumPriceSum < (coupon.consumeScore / 100) || orderData.sumPriceSum < (coupon.useThreshold / 100)
|
|
|
}"
|
|
|
@click="handleCouponClick(coupon)"
|
|
|
>
|
|
|
@@ -298,7 +298,10 @@
|
|
|
<!-- <div class="condition">满{{ coupon.consumeScore / 100 }}可用</div> -->
|
|
|
</div>
|
|
|
<div class="right-part">
|
|
|
- <div class="name">{{ coupon.productName }}</div>
|
|
|
+ <div class="name">
|
|
|
+ {{ coupon.productName }}
|
|
|
+ <el-tag v-if="coupon.useThreshold">满{{coupon.useThreshold / 100}}减</el-tag>
|
|
|
+ </div>
|
|
|
<div class="date">券码:{{ coupon.ticketNo }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -529,7 +532,7 @@ const handleScanInput = (event: KeyboardEvent) => {
|
|
|
console.log("=====---", e)
|
|
|
// 支付失败
|
|
|
payingDialogVisible.value = false // 隐藏支付中对话框
|
|
|
- feedback.notifySuccess('支付失败，请重试')
|
|
|
+ feedback.notifySuccess('支付失败，请重试!')
|
|
|
data.canScan = true
|
|
|
scanDialogVisible.value = true
|
|
|
// 添加键盘事件监听
|
|
|
@@ -630,7 +633,7 @@ const checkout = () => {
|
|
|
}
|
|
|
// 添加优惠券点击处理方法
|
|
|
const handleCouponClick = (coupon: any) => {
|
|
|
- if (orderData.sumPriceSum <= coupon.consumeScore / 100) {
|
|
|
+ if (orderData.sumPriceSum < coupon.consumeScore / 100 || orderData.sumPriceSum < (coupon.useThreshold / 100)) {
|
|
|
return
|
|
|
}
|
|
|
if (params.couponId === coupon.ticketRecordId) {
|
