From a0c8beb675a09577ed7b195777090f508715f970 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 27 六月 2025 14:40:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pages/video/video-play.vue |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pages/video/video-play.vue b/pages/video/video-play.vue
index e16b6ac..157db00 100644
--- a/pages/video/video-play.vue
+++ b/pages/video/video-play.vue
@@ -18,7 +18,7 @@
 		@touchmove="handleSwiperMove"
 		@touchend="handleSwiperEnd(item)"
 		 >
-      	<view style="width: 100%;height: 100%;" v-if="item.videoContentType === 'video'">
+      	<view :style="{width: '100%', height: windowHeight - marginBottom + 'px'}" v-if="item.videoContentType === 'video'">
       		  <!-- 鎾斁鎸夐挳锛堜粎褰撹棰戞殏鍋滄椂鏄剧ず锛� -->
       		  <view 
       			class="play-icon" 
@@ -35,7 +35,7 @@
       			:autoplay="index === currentIndex"
       			:controls="false"
       			:loop="true"
-      			:object-fit="item.objectFit"
+      			:object-fit="item.videoFit"
       			:enable-progress-gesture="false"
 				:show-center-play-btn="false"
       			class="video-item"
@@ -319,7 +319,9 @@
 			pageSize: 10,
 			authorId: '',
 			videoFrom: ''
-		}
+		},
+		marginBottom: 0, // 搴曢儴瀹夊叏鍖哄煙
+		windowHeight: 0 // 鍙娇鐢ㄥ睆骞曢珮搴�
     }
   },
   onShow() {
@@ -340,6 +342,8 @@
   	
   },
   onLoad(option) {
+	  this.marginBottom = uni.getSystemInfoSync().safeAreaInsets.bottom
+	  this.windowHeight = uni.getSystemInfoSync().windowHeight
 	  const playInfo = uni.getStorageSync("playInfo", playInfo);
 	  if(playInfo) {
 		  this.currentIndex = playInfo.playIndex;
@@ -951,7 +955,7 @@
 	.video-info {
 	  width: 70%;
 	  position: absolute;
-	  bottom: 20px;
+	  bottom: 40px;
 	  left: 20px;
 	  color: #f8f8f8;
 	  z-index: 10;
@@ -1294,7 +1298,7 @@
 	  flex-direction: column;
 	  align-items: center;
 	  position: absolute;
-	  bottom: 0;
+	  bottom: 20px;
 	  width: 100%;
 	}
 	

--
Gitblit v1.8.0