From be80b22a4a0fcd33e1b17ebdb86eba91cc7de4d2 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 18:59:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/order/fillorder.vue | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index d22f3d7..7661f62 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -148,6 +148,11 @@
"
:span="3"
>
+<!-- <video v-if="val.goodsSku.goodsVideo" :src="val.goodsSku.goodsVideo"
+ style="width: 200rpx;height: 200rpx;border-radius: 10rpx;"
+ :initial-time="0"
+ :controls="false" object-fit="contain" :show-play-btn="false" :show-center-play-btn="false"
+ ></video> -->
<u-image
borderRadius="10rpx"
width="200rpx"
@@ -379,7 +384,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 +710,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