From 77649c76ec1c3afcb93e9963243d637665b3a307 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 21 八月 2026 16:56:28 +0800
Subject: [PATCH] update
---
mingdaojingjiang_uniapp/mingdaojingjiang_uniapp/pages/home/index.vue | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/mingdaojingjiang_uniapp/mingdaojingjiang_uniapp/pages/home/index.vue b/mingdaojingjiang_uniapp/mingdaojingjiang_uniapp/pages/home/index.vue
index 89e0a76..96dd44b 100644
--- a/mingdaojingjiang_uniapp/mingdaojingjiang_uniapp/pages/home/index.vue
+++ b/mingdaojingjiang_uniapp/mingdaojingjiang_uniapp/pages/home/index.vue
@@ -323,14 +323,14 @@
const textMap = {
service: '立即呼叫讲解',
meeting: '下一步',
- payment: '确认支付'
+ payment: '确认下单'
}
return textMap[guideFlowStep.value] || textMap.service
})
-const guideActionLoadingText = computed(() => (guideFlowStep.value === 'payment' ? '支付中...' : '处理中...'))
+const guideActionLoadingText = computed(() => (guideFlowStep.value === 'payment' ? '下单中...' : '处理中...'))
-const guideActionSuccessText = computed(() => (guideFlowStep.value === 'payment' ? '支付成功' : '已完成'))
+const guideActionSuccessText = computed(() => (guideFlowStep.value === 'payment' ? '下单成功' : '已完成'))
const guideActionDisabled = computed(() => {
if (guideFlowStep.value === 'meeting') return !selectedMeetingPointId.value
@@ -902,19 +902,8 @@
const order = activeHomeOrder.value
if (!order || !order.id) return
- const routeMap = {
- pendingPay: '/pages/order-pending-pay/index',
- waiting: '/pages/order-waiting/index',
- pendingGuide: '/pages/order-pending-guide/index',
- serving: '/pages/order-serving/index',
- completed: '/pages/order-completed/index',
- pendingReview: '/pages/order-pending-review/index',
- canceled: '/pages/order-canceled/index'
- }
- const target = routeMap[order.status] || '/pages/orders/index'
-
uni.navigateTo({
- url: `${target}?orderId=${order.id}`
+ url: `${getActiveOrderRoute(order)}?orderId=${order.id}`
})
}
@@ -987,13 +976,13 @@
try {
paymentSubmitting.value = true
- const orderId = await createPendingGuideOrder()
+ const order = await createPendingGuideOrder()
paymentSubmitting.value = false
paymentSuccess.value = true
setTimeout(() => {
uni.navigateTo({
- url: `/pages/order-pending-pay/index?orderId=${orderId}`
+ url: `${getActiveOrderRoute(activeHomeOrder.value)}?orderId=${order.id}`
})
}, 220)
} catch (error) {
@@ -1035,7 +1024,20 @@
peopleCount: selectedServiceQuantity.value
})
activeHomeOrder.value = normalizeActiveHomeOrder(order)
- return order.id
+ return order
+}
+
+function getActiveOrderRoute(order) {
+ const routeMap = {
+ pendingPay: '/pages/order-pending-pay/index',
+ waiting: '/pages/order-waiting/index',
+ pendingGuide: '/pages/order-pending-guide/index',
+ serving: '/pages/order-serving/index',
+ completed: '/pages/order-completed/index',
+ pendingReview: '/pages/order-pending-review/index',
+ canceled: '/pages/order-canceled/index'
+ }
+ return routeMap[order && order.status] || '/pages/orders/index'
}
function normalizeActiveHomeOrder(order) {
--
Gitblit v1.7.1