diff --git a/framework/0-conf.js b/framework/0-conf.js index 0031c6f..6367448 100644 --- a/framework/0-conf.js +++ b/framework/0-conf.js @@ -1,5 +1,5 @@ // const debug = process.env.NODE_ENV == 'development' ? true : false; -const debug = true +const debug = false // #ifdef H5 const proxyApi = "/api" // #endif diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue index 4417cc6..9bf1f3c 100644 --- a/pages/order/components/orderInfo.vue +++ b/pages/order/components/orderInfo.vue @@ -479,9 +479,7 @@ } watch(() => maxMoney.value, (newval) => { console.log('maxMoney.value', newval); - if (usePoints.value) { getMaxPointsDiscount() - } }) watch(() => usePoints.value, (newval) => { if (newval) { @@ -548,8 +546,13 @@ const consumeDiscountRes = await consumeDiscount({ shopId: uni.cache.get('shopId'), }) + if(!consumeDiscountRes){ + favorablelist.value = back_favorablelist.filter(v => v.name != '新客立减') + return + } if (!consumeDiscountRes.isUse) { favorablelist.value = back_favorablelist.filter(v => v.name != '新客立减') + return } if (consumeDiscountRes && consumeDiscountRes.isUse) { newUserDiscount.value = consumeDiscountRes.amount diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue index 81fe261..052a306 100644 --- a/pages/order/confirm-order.vue +++ b/pages/order/confirm-order.vue @@ -783,7 +783,21 @@ } else { //后付 - + + // 购物车有数据 + if (!cartStore.isEmpty) { + usePoints=cartStore.orderCostSummary.pointUsed + const res = await createOrder() + //历史订单数据 + const res1 = await APIgetOrderById({ + orderId: res.id + }) + console.log('历史订单数据',res1); + orderRemarker.value=res1.remark; + cartStore.setOldOrder(res1) + goToPay() + return + } // 先调用历史订单 let APIhistoryOrderres = await APIhistoryOrder({ tableCode: listinfo.tableCode