Merge branch 'feat/camcard' of http://git.aigc-quickapp.com/Uniapp/lucky_shop into feat/camcard

2026-10-22 14:26:32 +08:00
parent 6c2619a33c d64e989c25
commit 9b33fb7719
6 changed files with 72 additions and 7 deletions
--- a/common/js/goods_detail_base.js
+++ b/common/js/goods_detail_base.js
@@ -115,7 +115,12 @@ export default {
 				}

 				//媒体
-				if (this.goodsSkuDetail.video_url) this.switchMedia = "video";
+				// 媒体显示顺序以后台商品「高级设置 → 媒体显示顺序」media_order 为准
+				// (1=主图在前 2=视频在前); 真正渲染媒体区的是 goods-detail-view 组件,
+				// 组件内部按同一规则切换, 这里保持一致避免两处规则打架
+				if (this.goodsSkuDetail.video_url) {
+					this.switchMedia = (Number(this.goodsSkuDetail.media_order) === 2) ? "video" : "img";
+				}

 				if (!Array.isArray(this.goodsSkuDetail.sku_images)) {
 					if (this.goodsSkuDetail.sku_images) this.goodsSkuDetail.sku_images = this.goodsSkuDetail.sku_images.split(",");