diff --git a/miniprogram/src/pages/comprehensive/pay/index.vue b/miniprogram/src/pages/comprehensive/pay/index.vue index c40362d..705651e 100644 --- a/miniprogram/src/pages/comprehensive/pay/index.vue +++ b/miniprogram/src/pages/comprehensive/pay/index.vue @@ -24,7 +24,7 @@ 支付方式 order.value?.business_type === 'stored_value') +const isWechatOnlyOrder = computed(() => order.value?.business_type !== 'private_booking') const canUseBalance = computed(() => { - if (isStoredValueOrder.value) return false return toAmountNumber(balance.value.balance) >= toAmountNumber(order.value?.amount) }) const canPay = computed(() => order.value?.status === 'pending_pay' && (payMethod.value !== 'balance' || canUseBalance.value)) @@ -107,16 +106,12 @@ onUnmounted(() => { }) const loadPage = async () => { - const [orderData, balanceData] = await Promise.all([ - orderApi.getOrderDetail(orderId.value), - memberApi.getBalance() - ]) - order.value = orderData - balance.value = balanceData - if (isStoredValueOrder.value) { - payMethod.value = 'wechat' - } else if (!canUseBalance.value) { + order.value = await orderApi.getOrderDetail(orderId.value) + if (isWechatOnlyOrder.value) { payMethod.value = 'wechat' + } else { + balance.value = await memberApi.getBalance() + payMethod.value = canUseBalance.value ? 'balance' : 'wechat' } updateCountdownTimer() } @@ -140,22 +135,15 @@ const stopCountdown = () => { const padTime = (value) => String(value).padStart(2, '0') const selectMethod = (method) => { - if (method === 'balance') { - if (isStoredValueOrder.value) { - uni.showToast({ title: '储值卡订单仅支持微信支付', icon: 'none' }) - return - } - if (!canUseBalance.value) { - uni.showToast({ title: '余额不足', icon: 'none' }) - return - } + if (method === 'balance' && !canUseBalance.value) { + uni.showToast({ title: '余额不足', icon: 'none' }) + return } payMethod.value = method } const pay = async () => { if (!canPay.value || isSubmitting.value) return - if (isStoredValueOrder.value && payMethod.value === 'balance') return isSubmitting.value = true try { if (payMethod.value === 'balance') { diff --git a/miniprogram/src/pages/comprehensive/private/index.vue b/miniprogram/src/pages/comprehensive/private/index.vue index 8863720..2519b2b 100644 --- a/miniprogram/src/pages/comprehensive/private/index.vue +++ b/miniprogram/src/pages/comprehensive/private/index.vue @@ -372,7 +372,8 @@ async function refresh() { } defineExpose({ - refresh + refresh, + loadGrid }) diff --git a/miniprogram/src/pages/ice/private/index.vue b/miniprogram/src/pages/ice/private/index.vue index 52444dd..f314151 100644 --- a/miniprogram/src/pages/ice/private/index.vue +++ b/miniprogram/src/pages/ice/private/index.vue @@ -10,7 +10,8 @@ diff --git a/miniprogram/src/pages/private/index.vue b/miniprogram/src/pages/private/index.vue index 1eef816..e9d9db8 100644 --- a/miniprogram/src/pages/private/index.vue +++ b/miniprogram/src/pages/private/index.vue @@ -7,7 +7,7 @@