syle:更新样式
This commit is contained in:
+30
-1
@@ -382,6 +382,33 @@
|
||||
// 提交租借订单
|
||||
const submitRentOrder = async (payWay) => {
|
||||
try {
|
||||
// --- 第一步:先请求订阅消息(必须在用户点击的同步上下文中)---
|
||||
if (payWay === 'wx-score-pay') {
|
||||
console.log('准备请求订阅消息(在异步操作之前),时间:', new Date().toLocaleTimeString());
|
||||
try {
|
||||
await new Promise((resolve, reject) => {
|
||||
uni.requestSubscribeMessage({
|
||||
tmplIds: ['o7OMTIcHnFBR7mvsggxFtdt8FfIgSl-v0swVUefGx6w'],
|
||||
success: (subscribeRes) => {
|
||||
console.log('订阅消息success回调,时间:', new Date()
|
||||
.toLocaleTimeString(), subscribeRes);
|
||||
resolve(subscribeRes);
|
||||
},
|
||||
fail: (subscribeErr) => {
|
||||
console.log('订阅消息fail回调,时间:', new Date().toLocaleTimeString(),
|
||||
subscribeErr);
|
||||
// 订阅失败不影响主流程
|
||||
resolve(subscribeErr);
|
||||
}
|
||||
});
|
||||
});
|
||||
console.log('订阅消息完成,时间:', new Date().toLocaleTimeString());
|
||||
} catch (subscribeError) {
|
||||
console.log('订阅消息异常', subscribeError);
|
||||
}
|
||||
}
|
||||
// --- 订阅消息请求完成 ---
|
||||
|
||||
uni.showLoading({
|
||||
title: '处理中'
|
||||
})
|
||||
@@ -394,7 +421,7 @@
|
||||
|
||||
// 获取后端返回的订单信息
|
||||
const order = rentResult.data
|
||||
console.log('订单信息',order);
|
||||
console.log('订单信息', order);
|
||||
|
||||
// // --- 统一:先更新订单套餐信息 ---
|
||||
// try {
|
||||
@@ -455,6 +482,8 @@
|
||||
const payResult = await initiateWeChatScorePayment(res);
|
||||
// 成功则跳转等待页,轮询在等待页处理
|
||||
if (payResult.errCode == '0') {
|
||||
console.log('支付分授权成功,准备跳转,时间:', new Date().toLocaleTimeString());
|
||||
// 直接跳转(订阅消息已经在前面完成了)
|
||||
uni.redirectTo({
|
||||
url: `/pages/waiting/index?orderNo=${order.orderNo}&deviceId=${deviceId.value}`
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user