From 818fbcd2dc3073ab4dacdff2b19cea56552f32fc Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 23 六月 2025 15:33:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/order/fillorder.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index d22f3d7..802a719 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -705,16 +705,17 @@
url: "/pages/order/myOrder?status=0",
});
} else {
- // #ifdef MP-WEIXIN
- // 寰俊灏忕▼搴忎腑鐐瑰嚮鍒涘缓璁㈠崟鐩存帴寮�濮嬫敮浠�
- this.pay(res.data.result.sn);
- // #endif
+ //娉ㄩ噴鎺夌洿鎺ヨ皟鍙栧井淇℃敮浠� 璧版敹閾跺彴鏀粯
+ // // #ifdef MP-WEIXIN
+ // // 寰俊灏忕▼搴忎腑鐐瑰嚮鍒涘缓璁㈠崟鐩存帴寮�濮嬫敮浠�
+ // this.pay(res.data.result.sn);
+ // // #endif
- // #ifndef MP-WEIXIN
+ // // #ifndef MP-WEIXIN
this.navigateTo(
`/pages/cart/payment/payOrder?trade_sn=${res.data.result.sn}`
);
- // #endif
+ // // #endif
}
} else {
uni.showToast({
--
Gitblit v1.8.0