From 0b8ee272d9119dcb304a15da86fd69a18ee6930d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 24 六月 2025 18:42:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/order/fillorder.vue | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index 802a719..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,17 +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