diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue
index cfd15d8..4f46e2c 100644
--- a/pagesOrder/pay-order/pay-order.vue
+++ b/pagesOrder/pay-order/pay-order.vue
@@ -395,8 +395,8 @@
uni.$off('choose-quan')
uni.$on('choose-quan', (arr) => {
console.log(arr);
- const manjianCoup = arr.filter(v => v.type == 1)
- let productCoup = arr.filter(v => v.type == 2)
+ const manjianCoup = arr.filter(v => v.type == 1&&v.num>=1)
+ let productCoup = arr.filter(v => v.type == 2&&v.num>=1)
console.log(productCoup);
//商品券分组
let coupMap={}
@@ -413,10 +413,9 @@
for(let i in arr){
const coup=arr[i]
const proCoupStartIndex=returnProCoupStartIndex(arr,i)
- console.log(proCoupStartIndex);
- console.log($goodsPayPriceMap[coup.proId]);
- coup.discountAmount=returnProductCoupAllPrice($goodsPayPriceMap[coup.proId],proCoupStartIndex,coup.num)
- console.log(coup.discountAmount);
+ const num=Math.min($goodsPayPriceMap[coup.proId].length,coup.num)
+ coup.num=num
+ coup.discountAmount=returnProductCoupAllPrice($goodsPayPriceMap[coup.proId],proCoupStartIndex,num).toFixed(2)
}
}
console.log(productCoup);
diff --git a/pagesOrder/quan/quan.vue b/pagesOrder/quan/quan.vue
index 132da06..9ab6782 100644
--- a/pagesOrder/quan/quan.vue
+++ b/pagesOrder/quan/quan.vue
@@ -21,7 +21,7 @@
有效期:
- {{item.endTime}}
+ {{dayjs(item.endTime).format('YYYY-MM-DD HH:mm:ss') }}
{{ formatStr(item.useRestrictions)}}
@@ -65,7 +65,7 @@
有效期:
- {{item.endTime}}
+ {{dayjs(item.endTime).format('YYYY-MM-DD HH:mm:ss') }}
{{ formatStr(item.useRestrictions)}}
@@ -138,6 +138,7 @@
onMounted
} from 'vue';
import color from '@/commons/color.js'
+ import dayjs from 'dayjs';
import {
getSafeBottomHeight
} from '@/commons/utils/safe-bottom.js'
diff --git a/pagesOrder/quan_util.js b/pagesOrder/quan_util.js
index ff5bd96..903c60e 100644
--- a/pagesOrder/quan_util.js
+++ b/pagesOrder/quan_util.js
@@ -58,8 +58,9 @@ export function returnProductCoupon(coup, goodsArr, vipUser, selCoupArr = []) {
const discountAmount = (price * coup.num).toFixed(2)
console.log(discountAmount);
- const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
+ // const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
// const canUse=discountAmount>0
+ const canUse=coup.use
return {
...coup,
discountAmount: discountAmount,
@@ -166,7 +167,9 @@ export function returnProductCouponAllPrice(coupArr, goodsArr, vipUser) {
}
const proCoupStartIndex=returnProCoupStartIndex(arr,i)
console.log(proCoupStartIndex);
- total+=returnProductCoupAllPrice(goodsPayPriceMap[coup.proId],proCoupStartIndex,coup.num)
+ const coupNum=Math.min(goodsPayPriceMap[coup.proId].length,coup.num)
+ console.log(coupNum);
+ total+=returnProductCoupAllPrice(goodsPayPriceMap[coup.proId],proCoupStartIndex,coupNum)
}
}