Merge branch 'feature/20250529home' into 'dev'

Feature/20250529home

See merge request sparkprojects/20250528_FHQ1!39

pages/product/product.vue

@@ -2,12 +2,18 @@
 	<view class="container">
 		<image :key="index" v-for="(item, index) in imgList" mode="widthFix" class="productimg" :src="item.imgUrl">
 		</image>
-		<view class="btnbox">
-			<image v-if="productId&&skuId" @tap="buyHandler" class="btnbuy" :src="$baseUrl + 'brandpage/btnbuy.png'"></image>
+		<view class="btnbox" v-if="productId && skuId">
+			<image @tap="buyHandler" class="btnbuy" :src="$baseUrl + 'brandpage/btnbuy.png'"></image>
 			<button class="btnshare" open-type="share" style="background: none; border: none; padding: 0;">
 				<image class="btnshare" :src="$baseUrl + 'brandpage/btnshare.png'"></image>
 			</button>
 		</view>
+		<view class="btnbox" v-else>
+			<button class="btnshare2" open-type="share" style="background: none; border: none; padding: 0;">
+				<image class="btnshare2" :src="$baseUrl + 'brandpage/btnsharebig.png'"></image>
+			</button>
+		</view>
+	
 	</view>
 </template>
 
@@ -37,9 +43,9 @@ export default {
 		this.contentImg = contentImg;
 		this.contentImgLen = contentImgLen;
 		this.shareTitle = shareTitle;
-		this.shareImg =  this.$baseUrl + shareImg;
+		this.shareImg = this.$baseUrl + shareImg;
 		// this.shareImg = "https://yun.duiba.com//fh/"+shareImg;
-		
+
 
 		console.log("this.shareImg:", this.shareImg);
 
@@ -112,6 +118,14 @@ export default {
 			width: 350rpx;
 			height: 75rpx;
 		}
+		button.btnshare2::after {
+			border: none !important;
+		}
+
+		.btnshare2 {
+			width: 718rpx;
+			height: 75rpx;
+		}
 	}
 }
 </style>

views/Brand.vue

@@ -110,18 +110,24 @@
 					<rich-text class="desc" :nodes="this.qrInfoList[this.popupIndex].desc">
 
 					</rich-text>
-					<image @tap="previewImage($baseUrl + this.qrInfoList[this.popupIndex].qrUrl)" class="qrcode" :src="$baseUrl + this.qrInfoList[this.popupIndex].qrUrl"></image>
+					<image :show-menu-by-longpress="true" class="qrcode" :src="$baseUrl + this.qrInfoList[this.popupIndex].qrUrl"></image>
 					<image @tap="downloadHandler($baseUrl + this.qrInfoList[this.popupIndex].qrUrl)" class="btndownload"
 						:src="$baseUrl + 'homepage/btn_download.png'"></image>
 				</view>
 				<view v-else class="popup-content" style="height: 899rpx;">
-					<image @tap="previewImage($baseUrl + 'brandpage/hexiaofei.png')" class="xingmahui" :src="$baseUrl + 'brandpage/hexiaofei.png'"></image>
+					<image class="xingmahui" :src="$baseUrl + 'brandpage/hexiaofei.png'"></image>
 					<image class="btnclose" @tap="closePop" :src="$baseUrl + 'homepage/btnclose.png'"></image>
 				</view>
 			</uni-popup>
 		</view>
 		<view v-if="showVideo" class="video-popup">
-			<video :src="currentVideoUrl" controls autoplay style="width: 100vw; height: 56vw;"></video>
+			<video
+				:src="currentVideoUrl"
+				controls
+				autoplay
+				:style="{ width: videoWidth + 'px', height: videoHeight + 'px' }"
+				@loadedmetadata="onVideoLoadedMeta"
+			></video>
 			<view class="close-btn-bottom" @tap="closeVideo">×</view>
 		</view>
 	</view>
@@ -155,9 +161,9 @@ export default {
 			popupIndex: 0,
 			showVideo: false,
 			testVideoUrl: '',
-			channel: {}
-
-
+			channel: {},
+			videoWidth: 375,
+			videoHeight: 210
 		}
 	},
 	mounted() {
@@ -293,6 +299,13 @@ export default {
 				current: url // 当前显示的图片
 			});
 		},
+		onVideoLoadedMeta(e) {
+			const { width, height } = e.detail;
+			const pageWidth = uni.upx2px(750);
+			const ratio = height / width;
+			this.videoWidth = pageWidth;
+			this.videoHeight =pageWidth;// pageWidth * ratio;
+		}
 	}
 }
 </script>
@@ -438,6 +451,7 @@ export default {
 						text-align: center;
 						height: 100rpx;
 						white-space: pre-wrap;
+						
 					}
 				}
 
@@ -601,7 +615,7 @@ export default {
 
 					.infobox {
 						margin-left: 15rpx;
-
+						margin-right: 30rpx;
 						.infoimg {
 							width: 500rpx;
 							height: 400rpx;
@@ -619,6 +633,7 @@ export default {
 							font-size: 24rpx;
 							color: black;
 							margin-top: 10rpx;
+							padding-right: 40rpx;
 						}
 					}
 				}

views/Home.vue

@@ -119,12 +119,12 @@
 					<rich-text class="desc" :nodes="this.qrInfoList[this.popupIndex].desc">
 
 					</rich-text>
-					<image @tap="previewImage($baseUrl + this.qrInfoList[this.popupIndex].qrUrl)" class="qrcode" :src="$baseUrl + this.qrInfoList[this.popupIndex].qrUrl"></image>
+					<image :show-menu-by-longpress="true"  class="qrcode" :src="$baseUrl + this.qrInfoList[this.popupIndex].qrUrl"></image>
 					<image @tap="downloadHandler($baseUrl + this.qrInfoList[this.popupIndex].qrUrl)" class="btndownload"
 						:src="$baseUrl + 'homepage/btn_download.png'"></image>
 				</view>
 				<view v-else class="popup-content" style="height: 977rpx;">
-					<image @tap="previewImage($baseUrl + 'homepage/xingmahui.png')" class="xingmahui" :src="$baseUrl + 'homepage/xingmahui.png'"></image>
+					<image class="xingmahui" :src="$baseUrl + 'homepage/xingmahui.png'"></image>
 					<image class="btnclose" @tap="closePop" :src="$baseUrl + 'homepage/btnclose.png'"></image>
 				</view>
 			</uni-popup>