From e40b46a888c16de9407b2df295ea08722ff81636 Mon Sep 17 00:00:00 2001
From: jinhhanhan <1683105490@qq.com>
Date: Thu, 13 Aug 2026 10:20:27 +0800
Subject: [PATCH 1/7] =?UTF-8?q?chore=EF=BC=9A=E8=A7=86=E9=A2=91=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .local.config.js                              |  6 +++-
 components-diy/diy-video-list.vue             | 33 ++++++++++++-------
 components-diy/diy-video.vue                  |  7 ++--
 .../ns-video-player-popup.vue                 | 10 ++++++
 .../goods-detail-view/goods-detail-view.vue   |  3 +-
 5 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/.local.config.js b/.local.config.js
index e78d1de..c272e47 100644
--- a/.local.config.js
+++ b/.local.config.js
@@ -160,6 +160,10 @@ const localDevConfig = ({
 	        uniacid: 228,
 	        domain: 'https://5g.aigc-quickapp.com/',
 	    },  
+		'2797': { //
+		    uniacid: 2797,
+		    domain: 'https://xcx.aigc-quickapp.com/',
+		},
 // })['5g-237']; // 商品分类，没有立即咨询文字
 // })['5g-97']; // 大宗商品贸易，支持自定义字体大小、颜色
 // })['5g-50']; // 燃气安全产品机器人，购物车无反应
@@ -173,7 +177,7 @@ const localDevConfig = ({
 // })['2724']; // 生物菌肥
 // })['2811']; // 选择要使用的环境配置
 // })['local-11']; // 选择要使用的环境配置
-})['228']; // 本地
+})['2797']; // 本地
 // })['local-2']; // 本地
 // })['local-11']; // 本地
 // })['1-test']; // test
diff --git a/components-diy/diy-video-list.vue b/components-diy/diy-video-list.vue
index 2b651f2..b21db73 100644
--- a/components-diy/diy-video-list.vue
+++ b/components-diy/diy-video-list.vue
@@ -54,17 +54,21 @@
 		<!-- 视频播放弹窗 -->
 		<uni-popup ref="videoPopup" type="center" style="background:transparent;width:100%;height:100%;">
 			<view class="video-container" :style="popupVideoStyle">
-				<video 
+				<video
+					:key="video_url"
 					ref="popupVideoRef"
-					class="adaptive-video" 
-					:autoPauseIfNavigate="true" 
+					class="adaptive-video"
+					:autoPauseIfNavigate="true"
 					:autoPauseIfOpenNative="true"
-					:autoplay="false" 
-					:enableAutoRotation="true" 
-					id="myVideo" 
-					:src="video_url" 
+					:autoplay="false"
+					:enableAutoRotation="true"
+					id="myVideo"
+					:src="video_url"
 					:controls="true"
 					object-fit="contain"
+					playsinline
+					webkit-playsinline
+					x5-playsinline
 					@loadedmetadata="onPopupVideoLoaded"
 					@error="onPopupVideoError"
 				></video>
@@ -144,7 +148,7 @@ export default {
 		
 		// 弹窗视频容器样式
 		popupVideoStyle() {
-			let style = 'position:fixed;width:100%;left:0;';
+			let style = 'position:fixed;width:60%;left:50%;margin-left:-30%;';
 			const defaultRatio = 9 / 16;
 
 			let ratio = defaultRatio;
@@ -157,15 +161,15 @@ export default {
 			if (isPortrait) {
 				style += 'top:50%;transform:translateY(-50%);';
 			} else {
-				style += 'top:20%;';
+				style += 'top:25%;';
 			}
 
 			// #ifdef H5
-			style += 'padding-top: ' + (ratio * 100) + '%;';
+			style += 'height:0;padding-top: ' + (ratio * 100) + '%;';
 			// #endif
 
 			// #ifdef MP-WEIXIN
-			style += 'padding-top: ' + (ratio * 100) + '%;';
+			style += 'height:0;padding-top: ' + (ratio * 100) + '%;';
 			// #endif
 
 			// #ifdef MP-HARMONY
@@ -178,7 +182,12 @@ export default {
 	methods: {
 		// 显示视频播放弹窗
 		showVideo(item) {
-			this.video_url = item.videoUrl;
+			let url = item.videoUrl || '';
+			// 处理视频URL：完整链接直接使用，否则通过 $util.img() 转换
+			if (url && url.indexOf('http://') !== 0 && url.indexOf('https://') !== 0) {
+				url = this.$util.img(url);
+			}
+			this.video_url = url;
 			this.popupVideoWidth = 0;
 			this.popupVideoHeight = 0;
 			this.$refs.videoPopup.open();
diff --git a/components-diy/diy-video.vue b/components-diy/diy-video.vue
index f770f7a..3638023 100644
--- a/components-diy/diy-video.vue
+++ b/components-diy/diy-video.vue
@@ -11,6 +11,9 @@
 			:style="videoWarpCss"
 			controls
 			preload="metadata"
+			playsinline
+			webkit-playsinline
+			x5-playsinline
 			@loadedmetadata="onVideoLoaded"
 			@click="handlerClick(videoUrl)"
 		></video>
@@ -106,11 +109,11 @@ export default {
 			}
 
 			// #ifdef H5
-			style += 'padding-top: ' + (ratio * 100) + '%;';
+			style += 'height:0;padding-top: ' + (ratio * 100) + '%;';
 			// #endif
 
 			// #ifdef MP-WEIXIN
-			style += 'padding-top: ' + (ratio * 100) + '%;';
+			style += 'height:0;padding-top: ' + (ratio * 100) + '%;';
 			// #endif
 
 			// #ifdef MP-HARMONY
diff --git a/components/ns-video-player-popup/ns-video-player-popup.vue b/components/ns-video-player-popup/ns-video-player-popup.vue
index e698390..7854046 100644
--- a/components/ns-video-player-popup/ns-video-player-popup.vue
+++ b/components/ns-video-player-popup/ns-video-player-popup.vue
@@ -9,9 +9,13 @@
                 <view class="video-popup-body">
                     <video 
                         v-if="videoUrl" 
+                        id="popupVideoPlayer"
                         :src="videoUrl"
                         controls 
                         autoplay 
+                        playsinline
+                        webkit-playsinline
+                        x5-playsinline
                         class="video-player"
                     ></video>
                     <view v-else class="video-error">{{ $lang('components.ns-video-player-popup.videoUrlNotExist') }}</view>
@@ -22,6 +26,8 @@
 </template>
 
 <script>
+import { playVideoInContext } from '@/common/js/video-helper.js';
+
 export default {
     name: 'ns-video-player-popup',
     props: {
@@ -76,6 +82,10 @@ export default {
          * @param {Object} e - 弹窗状态变化事件
          */
         onVideoPopupChange(e) {
+            // H5 端弹窗显示后触发播放：避免 autoplay 被浏览器拦截 / 弹窗动画未完成被 pause() 打断
+            if (e && e.show) {
+                playVideoInContext('popupVideoPlayer', this);
+            }
             this.$emit('popup-change', e);
         }
     }
diff --git a/pages_goods/_components/goods-detail-view/goods-detail-view.vue b/pages_goods/_components/goods-detail-view/goods-detail-view.vue
index 4851f24..ae42c1e 100644
--- a/pages_goods/_components/goods-detail-view/goods-detail-view.vue
+++ b/pages_goods/_components/goods-detail-view/goods-detail-view.vue
@@ -59,7 +59,8 @@
                     <!-- 商品视频 -->
                     <view class="goods-video" :class="{ show: switchMedia == 'video' }">
                         <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)"
-                            :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"></video>
+                            :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"
+                            playsinline webkit-playsinline x5-playsinline></video>
                     </view>
 
                     <!-- 切换视频、图片 -->

From 475449f04e76022b0733cfef6159a94313038b86 Mon Sep 17 00:00:00 2001
From: jinhhanhan <1683105490@qq.com>
Date: Thu, 13 Aug 2026 10:32:35 +0800
Subject: [PATCH 2/7] =?UTF-8?q?chore=EF=BC=9A=E8=A7=86=E9=A2=91=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E4=B8=8A=E4=B8=8B=E9=BB=91=E8=BE=B9=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components-diy/diy-video-list.vue | 48 +++----------------------------
 1 file changed, 4 insertions(+), 44 deletions(-)

diff --git a/components-diy/diy-video-list.vue b/components-diy/diy-video-list.vue
index b21db73..3eee3e4 100644
--- a/components-diy/diy-video-list.vue
+++ b/components-diy/diy-video-list.vue
@@ -148,34 +148,9 @@ export default {
 		
 		// 弹窗视频容器样式
 		popupVideoStyle() {
-			let style = 'position:fixed;width:60%;left:50%;margin-left:-30%;';
-			const defaultRatio = 9 / 16;
-
-			let ratio = defaultRatio;
-			if (this.popupVideoWidth && this.popupVideoHeight) {
-				ratio = this.popupVideoHeight / this.popupVideoWidth;
-			}
-
-			const isPortrait = ratio > 1;
-
-			if (isPortrait) {
-				style += 'top:50%;transform:translateY(-50%);';
-			} else {
-				style += 'top:25%;';
-			}
-
-			// #ifdef H5
-			style += 'height:0;padding-top: ' + (ratio * 100) + '%;';
-			// #endif
-
-			// #ifdef MP-WEIXIN
-			style += 'height:0;padding-top: ' + (ratio * 100) + '%;';
-			// #endif
-
-			// #ifdef MP-HARMONY
-			style += 'height: ' + (this.windowWidth * ratio) + 'px;';
-			// #endif
-
+			// 固定宽高容器：60%宽 x 50vh高，居中显示
+			// 竖屏视频填满高度→左右留黑边；横屏视频填满宽度→无黑边
+			let style = 'position:fixed;width:60%;height:50vh;left:50%;top:50%;transform:translate(-50%,-50%);';
 			return style;
 		}
 	},
@@ -623,6 +598,7 @@ export default {
 	position: relative;
 	overflow: hidden;
 	background-color: #000;
+	border-radius: 12rpx;
 }
 
 .adaptive-video {
@@ -634,22 +610,6 @@ export default {
 	left: 0;
 }
 
-/* #ifdef MP-WEIXIN */
-.adaptive-video {
-	position: absolute;
-	top: 0;
-	left: 0;
-}
-/* #endif */
-
-/* #ifdef MP-HARMONY */
-.adaptive-video {
-	position: static;
-	display: block;
-	box-sizing: border-box;
-}
-/* #endif */
-
 .video-nav {
 	padding: 16rpx;
 	box-sizing: border-box;

From c536fac4d2118a730de5f523577e4d0f1c76ffac Mon Sep 17 00:00:00 2001
From: jinhhanhan <1683105490@qq.com>
Date: Thu, 13 Aug 2026 11:15:57 +0800
Subject: [PATCH 3/7] =?UTF-8?q?chore=EF=BC=9A=E8=A7=86=E9=A2=91=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=B8=83=E5=B1=80=E6=AD=A3=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components-diy/diy-video-list.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/components-diy/diy-video-list.vue b/components-diy/diy-video-list.vue
index 3eee3e4..2c3138e 100644
--- a/components-diy/diy-video-list.vue
+++ b/components-diy/diy-video-list.vue
@@ -148,9 +148,9 @@ export default {
 		
 		// 弹窗视频容器样式
 		popupVideoStyle() {
-			// 固定宽高容器：60%宽 x 50vh高，居中显示
-			// 竖屏视频填满高度→左右留黑边；横屏视频填满宽度→无黑边
-			let style = 'position:fixed;width:60%;height:50vh;left:50%;top:50%;transform:translate(-50%,-50%);';
+			// 容器横向铺满，黑色背景填满左右边界
+			// 视频用 object-fit:contain 保持原比例居中，左右黑边由容器黑色背景填充
+			let style = 'position:fixed;width:100%;height:50vh;left:50%;top:50%;transform:translate(-50%,-50%);border-radius:0;';
 			return style;
 		}
 	},
@@ -598,7 +598,6 @@ export default {
 	position: relative;
 	overflow: hidden;
 	background-color: #000;
-	border-radius: 12rpx;
 }
 
 .adaptive-video {

From e5406a27ba11338bd86f988f5ef7c20430f56209 Mon Sep 17 00:00:00 2001
From: jinhhanhan <1683105490@qq.com>
Date: Fri, 14 Aug 2026 09:09:07 +0800
Subject: [PATCH 4/7] =?UTF-8?q?chore:=E8=8B=B9=E6=9E=9Cios=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=98=BE=E7=A4=BA=E6=AD=A3=E5=B8=B8=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E7=9A=84=E8=A7=86=E9=A2=91=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E7=AB=96=E7=89=88=E6=A8=AA=E6=9D=BF?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .local.config.js                              |  6 ++-
 common/css/goods_detail.scss                  |  2 +
 .../goods-detail-view/goods-detail-view.vue   | 51 +++++++++++++++++--
 pages_tool/form/formdata.vue                  | 15 +++++-
 4 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/.local.config.js b/.local.config.js
index c272e47..1430734 100644
--- a/.local.config.js
+++ b/.local.config.js
@@ -164,6 +164,10 @@ const localDevConfig = ({
 		    uniacid: 2797,
 		    domain: 'https://xcx.aigc-quickapp.com/',
 		},
+		'5g-95': { // 商品分类，没有立即咨询文字
+		    uniacid: 95,
+		    domain: 'https://5g.aigc-quickapp.com/',
+		},   
 // })['5g-237']; // 商品分类，没有立即咨询文字
 // })['5g-97']; // 大宗商品贸易，支持自定义字体大小、颜色
 // })['5g-50']; // 燃气安全产品机器人，购物车无反应
@@ -177,7 +181,7 @@ const localDevConfig = ({
 // })['2724']; // 生物菌肥
 // })['2811']; // 选择要使用的环境配置
 // })['local-11']; // 选择要使用的环境配置
-})['2797']; // 本地
+})['1']; // 本地
 // })['local-2']; // 本地
 // })['local-11']; // 本地
 // })['1-test']; // test
diff --git a/common/css/goods_detail.scss b/common/css/goods_detail.scss
index f34c2bc..8d6fe96 100644
--- a/common/css/goods_detail.scss
+++ b/common/css/goods_detail.scss
@@ -118,6 +118,8 @@
 	.goods-video video {
 		width: 100%;
 		height: 100%;
+		object-fit: contain;
+		object-position: center;
 	}
 
 	.goods-video .uni-video-cover {
diff --git a/pages_goods/_components/goods-detail-view/goods-detail-view.vue b/pages_goods/_components/goods-detail-view/goods-detail-view.vue
index ae42c1e..5ca54cb 100644
--- a/pages_goods/_components/goods-detail-view/goods-detail-view.vue
+++ b/pages_goods/_components/goods-detail-view/goods-detail-view.vue
@@ -37,7 +37,8 @@
                     :info="goodsSkuDetail.barrageData" />
 
                 <!-- 商品媒体信息 -->
-                <view class="goods-media" :style="{ height: goodsSkuDetail.swiperHeight }">
+                <!-- 视频区域高度：图片态走 swiperHeight；视频态且已拿到竖屏视频元数据时，按视频比例自适应高度（最大 5:4），避免竖屏视频被裁剪成横屏 -->
+                <view class="goods-media" :style="{ height: mediaHeight }">
                     <!-- 商品图片 -->
                     <view class="goods-img" :class="{ show: switchMedia == 'img' }">
                         <swiper class="swiper" @change="swiperChange" :interval="swiperInterval"
@@ -56,10 +57,11 @@
                         </view>
                     </view>
 
-                    <!-- 商品视频 -->
+                    <!-- 商品视频：objectFit=contain 保留原始宽高比，竖屏/横屏均不做强制裁剪 -->
                     <view class="goods-video" :class="{ show: switchMedia == 'video' }">
                         <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)"
-                            :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"
+                            :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="contain"
+                            @loadedmetadata="onVideoLoadedMetadata"
                             playsinline webkit-playsinline x5-playsinline></video>
                     </view>
 
@@ -538,6 +540,8 @@ export default {
     data() {
         // 商品详情骨架屏：模拟「轮播图 + 价格行 + 标题简介 + 规格行 + 商家 + 详情 + 推荐」
         return {
+            // 视频元数据（宽/高），用于竖屏视频自适应容器高度
+            videoInfo: { width: 0, height: 0 },
             // 1. 轮播图：方形 banner 占位
             skeletonBanner: {
                 padding: '0',
@@ -662,6 +666,27 @@ export default {
         };
     },
     computed: {
+        // 媒体容器高度：视频激活且为竖屏时按视频比例撑高，否则保持图片 swiper 高度
+        mediaHeight() {
+            if (
+                this.switchMedia === 'video' &&
+                this.videoInfo.width &&
+                this.videoInfo.height &&
+                this.videoInfo.height > this.videoInfo.width
+            ) {
+                try {
+                    const sys = uni.getSystemInfoSync();
+                    const ratio = this.videoInfo.height / this.videoInfo.width;
+                    const videoHeight = sys.windowWidth * ratio;
+                    // 竖屏视频最大高度限制为屏幕宽度的 5:4，防止 9:16 等过长视频占满整屏
+                    const maxHeight = sys.windowWidth * 1.25;
+                    return Math.min(videoHeight, maxHeight) + 'px';
+                } catch (e) {
+                    // 异常时回退到图片高度
+                }
+            }
+            return this.goodsSkuDetail.swiperHeight;
+        },
         aiAvatarUrl() {
             return this.$util.img(IMAGE_CONFIG.aiAvatar);
         },
@@ -686,6 +711,26 @@ export default {
             return this.goodsSkuDetail && Number(this.goodsSkuDetail.goods_id) > 0;
         }
     },
+    watch: {
+        // 切换商品/视频源时重置视频元数据，防止旧数据影响新视频的高度计算
+        'goodsSkuDetail.video_url'(newVal, oldVal) {
+            if (newVal !== oldVal) {
+                this.videoInfo = { width: 0, height: 0 };
+            }
+        }
+    },
+    methods: {
+        // 视频元数据加载后记录宽高，用于竖屏视频自适应容器高度
+        onVideoLoadedMetadata(e) {
+            const detail = e.detail || {};
+            if (detail.width && detail.height) {
+                this.videoInfo = {
+                    width: Number(detail.width),
+                    height: Number(detail.height)
+                };
+            }
+        }
+    },
     mixins: [scroll, detail]
 };
 </script>
diff --git a/pages_tool/form/formdata.vue b/pages_tool/form/formdata.vue
index 2f371e6..9e6136c 100644
--- a/pages_tool/form/formdata.vue
+++ b/pages_tool/form/formdata.vue
@@ -420,9 +420,22 @@ page {
 	background: #fff;
 }
 
+// iOS 兼容：确保页面内容区域可滚动，避免提交按钮被推出屏幕后无法访问
+.page {
+	min-height: 100vh;
+	// iOS Safari / WebView 需要显式开启 overflow 才能正确滚动
+	overflow-y: auto;
+	-webkit-overflow-scrolling: touch; // iOS 惯性滚动
+	box-sizing: border-box;
+}
+
 .system-form-wrap {
-	overflow: hidden;
+	// 移除 overflow: hidden，避免 iOS 上 textarea 撑开高度时裁剪掉提交按钮
+	// 改用 overflow-visible 让内容自然流动，提交按钮始终可见
+	overflow: visible;
 	margin: 0 0 60rpx 0;
+	// 确保 iOS 上表单区域有足够的底部空间显示提交按钮
+	padding-bottom: env(safe-area-inset-bottom, 40rpx);
 }
 
 // 穿透 diy-form 包装层：消除其自带的 10rpx 圆角与白色背景，

From 83b253bced864961586b170421a004c100d336d0 Mon Sep 17 00:00:00 2001
From: jinhhanhan <1683105490@qq.com>
Date: Fri, 14 Aug 2026 11:21:05 +0800
Subject: [PATCH 5/7] =?UTF-8?q?chore=EF=BC=9A=E8=A1=A8=E5=8D=95=E9=B8=BF?=
 =?UTF-8?q?=E8=92=99=E5=81=9A=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .local.config.js             |  2 +-
 pages_tool/form/formdata.vue | 59 +++++++++++++++++++++++++++++++-----
 2 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/.local.config.js b/.local.config.js
index 1430734..2a94f2a 100644
--- a/.local.config.js
+++ b/.local.config.js
@@ -181,7 +181,7 @@ const localDevConfig = ({
 // })['2724']; // 生物菌肥
 // })['2811']; // 选择要使用的环境配置
 // })['local-11']; // 选择要使用的环境配置
-})['1']; // 本地
+})['192.168.8.118-1']; // 本地
 // })['local-2']; // 本地
 // })['local-11']; // 本地
 // })['1-test']; // test
diff --git a/pages_tool/form/formdata.vue b/pages_tool/form/formdata.vue
index 9e6136c..dac9c20 100644
--- a/pages_tool/form/formdata.vue
+++ b/pages_tool/form/formdata.vue
@@ -1,5 +1,10 @@
 <template>
+	<!-- #ifdef MP-HARMONY -->
+	<view :style="themeColor" class="harmony-root">
+	<!-- #endif -->
+	<!-- #ifndef MP-HARMONY -->
 	<view :style="themeColor">
+	<!-- #endif -->
 		<!--
 		自绘导航栏（仅在 navigationStyle:custom 的端渲染：APP / 微信小程序 / 华为快应用 / 鸿蒙元服务）
 		- pages.json 已为这几端开启 navigationStyle:custom，系统不再提供原生 navbar
@@ -23,6 +28,19 @@
 		</view>
 		<!-- #endif -->
 		<block v-if="detail">
+			<!-- 鸿蒙元服务：用原生 scroll-view 包裹表单，替代 CSS overflow 滚动（ArkUI 不识别 WebKit overflow 语义）。
+			     根容器 harmony-root 占满 100vh 并 flex 列布局，navbar 占顶部固定高度，page flex:1 占剩余，scroll-view 在其内滚动。
+			     提交按钮由 diy-form 内部渲染，处于 scroll-view 内，用户可滚到末尾点击。 -->
+			<!-- #ifdef MP-HARMONY -->
+			<view class="page harmony-page">
+				<scroll-view scroll-y="true" :show-scrollbar="false" class="form-scroll">
+					<view class="system-form-wrap">
+						<diy-form ref="form" :value="diyValue" dataMode="raw" :onSubmit="handleSubmit" />
+					</view>
+				</scroll-view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifndef MP-HARMONY -->
 			<view class="page">
 				<view class="system-form-wrap">
 					<!-- 复用 diy-form：banner / tip / 表单字段 / 提交按钮 全部由其内部渲染，样式（bannerPaddingX/tipColor/submitBgColor 等）由 form_config 控制。
@@ -32,6 +50,7 @@
 					<diy-form ref="form" :value="diyValue" dataMode="raw" :onSubmit="handleSubmit" />
 				</view>
 			</view>
+			<!-- #endif -->
 		</block>
 		<block v-else>
 			<ns-empty :text="complete ? $lang('form.formdata.submitSuccess') : $lang('form.formdata.noFormInfo')"
@@ -420,23 +439,49 @@ page {
 	background: #fff;
 }
 
-// iOS 兼容：确保页面内容区域可滚动，避免提交按钮被推出屏幕后无法访问
+// ===== 非鸿蒙端（H5 / 微信小程序 / App）：保留原有 WebKit 滚动 / 安全区处理 =====
+// 鸿蒙走下方 MP-HARMONY 专属的 scroll-view 方案，不编译这些 WebKit 属性
+/* #ifdef H5 || MP-WEIXIN || APP-PLUS */
 .page {
 	min-height: 100vh;
-	// iOS Safari / WebView 需要显式开启 overflow 才能正确滚动
 	overflow-y: auto;
-	-webkit-overflow-scrolling: touch; // iOS 惯性滚动
+	-webkit-overflow-scrolling: touch;
 	box-sizing: border-box;
 }
-
 .system-form-wrap {
-	// 移除 overflow: hidden，避免 iOS 上 textarea 撑开高度时裁剪掉提交按钮
-	// 改用 overflow-visible 让内容自然流动，提交按钮始终可见
 	overflow: visible;
 	margin: 0 0 60rpx 0;
-	// 确保 iOS 上表单区域有足够的底部空间显示提交按钮
 	padding-bottom: env(safe-area-inset-bottom, 40rpx);
 }
+/* #endif */
+
+// ===== 鸿蒙元服务：用原生 scroll-view 做滚动容器 =====
+// ArkUI 不识别 WebKit 的 overflow / -webkit-overflow-scrolling，必须用 scroll-view 组件（编译为 ArkUI Scroll）。
+// 根容器 harmony-root 占满 100vh 并 flex 列布局，navbar 占顶部固定高度，page flex:1 占剩余空间，
+// scroll-view 在 page 内 flex:1 获得确定高度后内部滚动。提交按钮由 diy-form 渲染在 scroll-view 内，可滚动到。
+/* #ifdef MP-HARMONY */
+.harmony-root {
+	height: 100vh;
+	display: flex;
+	flex-direction: column;
+}
+.harmony-page {
+	flex: 1;
+	min-height: 0; // 允许内容收缩，内部 scroll-view 才能拿到确定高度并正确滚动
+	display: flex;
+	flex-direction: column;
+}
+.form-scroll {
+	flex: 1;
+	height: 100%;
+}
+.system-form-wrap {
+	// 不再用 overflow:hidden 裁剪；提交按钮在 scroll-view 内，滚动可见
+	overflow: visible;
+	margin: 0 0 60rpx 0;
+	padding-bottom: 40rpx; // 鸿蒙不识别 env(safe-area-inset-bottom)，固定值兜底
+}
+/* #endif */
 
 // 穿透 diy-form 包装层：消除其自带的 10rpx 圆角与白色背景，
 // 让 form 内容区域保持与原始 ns-newform 接入时一致的视觉

From 5d7facc94dc8514e913fee566537161207c4327a Mon Sep 17 00:00:00 2001
From: jinhhanhan <1683105490@qq.com>
Date: Fri, 14 Aug 2026 15:03:23 +0800
Subject: [PATCH 6/7] =?UTF-8?q?chore=EF=BC=9A=E7=AB=96=E7=89=88=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E5=9C=A8=E5=AE=B9?=
 =?UTF-8?q?=E5=99=A8=E9=87=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .local.config.js                              |  2 +-
 .../goods-detail-view/goods-detail-view.vue   | 49 +------------------
 2 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/.local.config.js b/.local.config.js
index 2a94f2a..1430734 100644
--- a/.local.config.js
+++ b/.local.config.js
@@ -181,7 +181,7 @@ const localDevConfig = ({
 // })['2724']; // 生物菌肥
 // })['2811']; // 选择要使用的环境配置
 // })['local-11']; // 选择要使用的环境配置
-})['192.168.8.118-1']; // 本地
+})['1']; // 本地
 // })['local-2']; // 本地
 // })['local-11']; // 本地
 // })['1-test']; // test
diff --git a/pages_goods/_components/goods-detail-view/goods-detail-view.vue b/pages_goods/_components/goods-detail-view/goods-detail-view.vue
index 5ca54cb..83f7aee 100644
--- a/pages_goods/_components/goods-detail-view/goods-detail-view.vue
+++ b/pages_goods/_components/goods-detail-view/goods-detail-view.vue
@@ -37,8 +37,7 @@
                     :info="goodsSkuDetail.barrageData" />
 
                 <!-- 商品媒体信息 -->
-                <!-- 视频区域高度：图片态走 swiperHeight；视频态且已拿到竖屏视频元数据时，按视频比例自适应高度（最大 5:4），避免竖屏视频被裁剪成横屏 -->
-                <view class="goods-media" :style="{ height: mediaHeight }">
+                <view class="goods-media" :style="{ height: goodsSkuDetail.swiperHeight }">
                     <!-- 商品图片 -->
                     <view class="goods-img" :class="{ show: switchMedia == 'img' }">
                         <swiper class="swiper" @change="swiperChange" :interval="swiperInterval"
@@ -57,11 +56,10 @@
                         </view>
                     </view>
 
-                    <!-- 商品视频：objectFit=contain 保留原始宽高比，竖屏/横屏均不做强制裁剪 -->
+                    <!-- 商品视频：objectFit=contain 保留原始宽高比，在固定高度的图片容器内居中播放 -->
                     <view class="goods-video" :class="{ show: switchMedia == 'video' }">
                         <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)"
                             :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="contain"
-                            @loadedmetadata="onVideoLoadedMetadata"
                             playsinline webkit-playsinline x5-playsinline></video>
                     </view>
 
@@ -540,8 +538,6 @@ export default {
     data() {
         // 商品详情骨架屏：模拟「轮播图 + 价格行 + 标题简介 + 规格行 + 商家 + 详情 + 推荐」
         return {
-            // 视频元数据（宽/高），用于竖屏视频自适应容器高度
-            videoInfo: { width: 0, height: 0 },
             // 1. 轮播图：方形 banner 占位
             skeletonBanner: {
                 padding: '0',
@@ -666,27 +662,6 @@ export default {
         };
     },
     computed: {
-        // 媒体容器高度：视频激活且为竖屏时按视频比例撑高，否则保持图片 swiper 高度
-        mediaHeight() {
-            if (
-                this.switchMedia === 'video' &&
-                this.videoInfo.width &&
-                this.videoInfo.height &&
-                this.videoInfo.height > this.videoInfo.width
-            ) {
-                try {
-                    const sys = uni.getSystemInfoSync();
-                    const ratio = this.videoInfo.height / this.videoInfo.width;
-                    const videoHeight = sys.windowWidth * ratio;
-                    // 竖屏视频最大高度限制为屏幕宽度的 5:4，防止 9:16 等过长视频占满整屏
-                    const maxHeight = sys.windowWidth * 1.25;
-                    return Math.min(videoHeight, maxHeight) + 'px';
-                } catch (e) {
-                    // 异常时回退到图片高度
-                }
-            }
-            return this.goodsSkuDetail.swiperHeight;
-        },
         aiAvatarUrl() {
             return this.$util.img(IMAGE_CONFIG.aiAvatar);
         },
@@ -711,26 +686,6 @@ export default {
             return this.goodsSkuDetail && Number(this.goodsSkuDetail.goods_id) > 0;
         }
     },
-    watch: {
-        // 切换商品/视频源时重置视频元数据，防止旧数据影响新视频的高度计算
-        'goodsSkuDetail.video_url'(newVal, oldVal) {
-            if (newVal !== oldVal) {
-                this.videoInfo = { width: 0, height: 0 };
-            }
-        }
-    },
-    methods: {
-        // 视频元数据加载后记录宽高，用于竖屏视频自适应容器高度
-        onVideoLoadedMetadata(e) {
-            const detail = e.detail || {};
-            if (detail.width && detail.height) {
-                this.videoInfo = {
-                    width: Number(detail.width),
-                    height: Number(detail.height)
-                };
-            }
-        }
-    },
     mixins: [scroll, detail]
 };
 </script>

From 92599453c299b668c09376bfc56d5275f65ee274 Mon Sep 17 00:00:00 2001
From: jinhhanhan <1683105490@qq.com>
Date: Fri, 14 Aug 2026 15:10:03 +0800
Subject: [PATCH 7/7] =?UTF-8?q?chore=EF=BC=9A=E7=AB=96=E7=89=88=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=A4=A7=E5=B0=8F=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .local.config.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.local.config.js b/.local.config.js
index 1430734..85293e8 100644
--- a/.local.config.js
+++ b/.local.config.js
@@ -168,6 +168,10 @@ const localDevConfig = ({
 		    uniacid: 95,
 		    domain: 'https://5g.aigc-quickapp.com/',
 		},   
+		'5g-160': { // 商品分类，没有立即咨询文字
+		    uniacid: 160,
+		    domain: 'https://5g.aigc-quickapp.com/',
+		},   
 // })['5g-237']; // 商品分类，没有立即咨询文字
 // })['5g-97']; // 大宗商品贸易，支持自定义字体大小、颜色
 // })['5g-50']; // 燃气安全产品机器人，购物车无反应
@@ -181,7 +185,7 @@ const localDevConfig = ({
 // })['2724']; // 生物菌肥
 // })['2811']; // 选择要使用的环境配置
 // })['local-11']; // 选择要使用的环境配置
-})['1']; // 本地
+})['5g-160']; // 本地
 // })['local-2']; // 本地
 // })['local-11']; // 本地
 // })['1-test']; // test