From 3bff34c3aa7ad412042272ea6a37b7d5b49b8d9b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 26 六月 2025 09:09:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pages/order/fillorder.vue |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index 251f7e7..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"

--
Gitblit v1.8.0