From 2c91cfe544051bd73981669e4a7102394cc76b04 Mon Sep 17 00:00:00 2001 From: msh-agent Date: Sun, 3 May 2026 02:35:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(order):=20=E6=8F=90=E4=BA=A4=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=B8=8E=E6=8B=89=E8=B5=B7=E6=94=AF=E4=BB=98=E5=88=86?= =?UTF-8?q?=E7=A6=BB=EF=BC=8C=E6=94=AF=E6=8C=81=E5=8F=96=E6=B6=88=E5=90=8E?= =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E6=94=AF=E4=BB=98=EF=BC=88test-0415=20?= =?UTF-8?q?=E5=8F=8D=E9=A6=886-3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - onCreate 旧逻辑：orderCreate 后直接 getOrderPay → requestPayment，强制弹支付 - 现行：orderCreate 成功后 redirectTo /pages/order/order_payment，由用户主动「去支付」 - payment() else 分支同步纠正，避免重复点击「提交订单」时还会绕过支付页直接拉起 - order_payment 自带重试/取消处理，二次支付链路顺畅 Co-Authored-By: Claude Opus 4.7 (1M context) --- .../pages/order/order_confirm/index.vue | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/msh_single_uniapp/pages/order/order_confirm/index.vue b/msh_single_uniapp/pages/order/order_confirm/index.vue index 39910ce..d7cc5b1 100644 --- a/msh_single_uniapp/pages/order/order_confirm/index.vue +++ b/msh_single_uniapp/pages/order/order_confirm/index.vue @@ -621,7 +621,11 @@ that.onCreate(data); // #endif } else { - this.getOrderPay(that.orderNo, '支付成功'); + // 已经有 orderNo（用户从 confirm 页重复点击）：跳转到支付页而非直接拉起（test-0415 反馈6-3） + uni.hideLoading(); + uni.redirectTo({ + url: `/pages/order/order_payment/index?orderNo=${that.orderNo}&payPrice=${that.orderInfoVo.payFee}` + }); } }, @@ -641,8 +645,16 @@ }); }, onCreate(data) { + // test-0415 反馈6-3：提交订单不再强制拉起支付，统一跳转到支付页由用户手动确认 + // 旧逻辑 createOrder → 立即 requestPayment，取消后留在 confirm 页，二次支付难以触发 + // 现行：createOrder → 进入 order_payment 页（具备重试与取消处理） + let that = this; orderCreate(data).then(res => { - this.getOrderPay(res.data.orderNo, '支付成功'); + this.orderNo = res.data.orderNo; + uni.hideLoading(); + uni.redirectTo({ + url: `/pages/order/order_payment/index?orderNo=${this.orderNo}&payPrice=${this.orderInfoVo.payFee}` + }); }).catch(err => { uni.hideLoading(); return that.$util.Tips({