修复判断是否有可用优惠券

pages/order/components/orderInfo.vue

@@ -258,7 +258,8 @@
 		watchEffect,
 		defineExpose,
 		toRaw,
-		onMounted
+		onMounted,
+		nextTick
 
 	} from 'vue'
 	import {
@@ -420,9 +421,9 @@
 	// 跳转
 	const goUrl = (item) => {
 		const canDikouGoodsArr = props.nowCarts
-		const goodsOrderPrice = props.listinfo.totalPrices
+		// const goodsOrderPrice = props.listinfo.totalPrices
 		// const user=uni.cache.get('shopUserInfo')
-		uni.setStorageSync('goodsOrderPrice', goodsOrderPrice)
+		uni.setStorageSync('goodsOrderPrice', cartStore.orderCostSummary.goodsRealAmount)
 
 		if (props.isBwc) {
 			uni.showToast({
@@ -563,17 +564,18 @@
 		}
 	}
 	
-
+	// 初始化订单计算可能为计算完毕，所以判断监听价格变化后再获取优惠券
-	onMounted(async () => {
+	let loadFinish = false
-		getConsumeDiscount()
+	watch(() => cartStore.orderCostSummary.goodsRealAmount,async (newval) => {
-		//积分可抵扣最大金额
+		if (newval && !loadFinish) {
-		const goodsOrderPrice = cartStore.orderCostSummary.goodsRealAmount - cartStore.orderCostSummary
+			const goodsOrderPrice = cartStore.orderCostSummary.goodsRealAmount
 			const dinnerType = cartStore.dinnerType
 			const shopInfo = cartStore.shopInfo
 			const shopId = cartStore.shopInfo.shopId
 			const user = uni.cache.get('shopUserInfo')
 			const shopUserId = user.id
 			const allGoods = cartStore.allGoods
+
 			hasCouponCanUse.value = await returnHasCouponCanUse({
 				goodsOrderPrice,
 				dinnerType,
@@ -584,6 +586,11 @@
 				user
 			})
 			console.log('hasCouponCanUse', hasCouponCanUse.value);
+		}
+	})
+	onMounted(() => {
+		getConsumeDiscount()
+
 	})
 </script>
 

utils/coupon.js

@@ -18,7 +18,8 @@ export async function returnHasCouponCanUse(args) {
 	if(!res||res.length<=0){
 		return false
 	}
-
+	console.log('returnHasCouponCanUse:goodsOrderPrice',goodsOrderPrice);
+	console.log('returnHasCouponCanUse:allGoods',allGoods);
 	const canDikouGoodsArr = UTILS.returnCanDikouGoods(allGoods, [], user);
 	for (let i = 0; i < res.length; i++) {
 		const coupon = res[i]

utils/goods-utils.js

@@ -126,12 +126,11 @@ export function returnCouponCanUse(args) {
 		selCoupon,
 		shopInfo
 	} = args;
-
 	// 优惠券未启用
 	if (!coupon.use) {
 		return {
 			canUse: false,
-			reason: "优惠券未启用"
+			reason:coupon.noUseRestrictions||  "不在可用时间段内"
 		};
 	}