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/tabbar/cart/cartList.vue |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index d15dfdc..c6e1e61 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -68,7 +68,12 @@
                 </u-checkbox-group>
                 <span class="invalid" v-else style="font-size: 24rpx">澶辨晥</span>
               </view>
-              <u-image border-radius="10" :fade="true" @click="navigateToGoods(skuItem)" width="160rpx" height="160rpx"
+<!-- 			  <video border-radius="10" :fade="true" @click="navigateToGoods(skuItem)" 
+			  v-if="skuItem.goodsSku.goodsVideo" :src="skuItem.goodsSku.goodsVideo"
+			   style="width: 160rpx;height: 160rpx;"
+			  :initial-time="0"
+			  	:controls="false" object-fit="contain" :show-play-btn="false" :show-center-play-btn="false"/> -->
+              <u-image  border-radius="10" :fade="true" @click="navigateToGoods(skuItem)" width="160rpx" height="160rpx"
                 :src="skuItem.goodsSku.thumbnail" />
             </view>
             <view class="goods-content">

--
Gitblit v1.8.0