From e50f021ddf73b80f5a1273b8b01e7dd4344a4cdc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:17:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/order/fillorder.vue | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index d22f3d7..251f7e7 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -379,7 +379,7 @@
<div class="tabbar-right">鎻愪氦璁㈠崟</div>
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
- <div class="tabbar-right">寰俊鏀粯</div>
+ <div class="tabbar-right">绔嬪嵆鏀粯</div>
<!-- #endif -->
</div>
</div>
@@ -705,16 +705,9 @@
url: "/pages/order/myOrder?status=0",
});
} else {
- // #ifdef MP-WEIXIN
- // 寰俊灏忕▼搴忎腑鐐瑰嚮鍒涘缓璁㈠崟鐩存帴寮�濮嬫敮浠�
- this.pay(res.data.result.sn);
- // #endif
-
- // #ifndef MP-WEIXIN
this.navigateTo(
`/pages/cart/payment/payOrder?trade_sn=${res.data.result.sn}`
);
- // #endif
}
} else {
uni.showToast({
--
Gitblit v1.8.0