From 74756690fd55fe9ccca002f73e06d9d88161cc3a Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 06 八月 2025 16:26:55 +0800
Subject: [PATCH] 取消商品参数展示,首页视频全屏播放

---
 pages/product/product/goods/-goods-intro.vue |   15 ++++---
 pages/tabbar/index/static/off_screen.png     |    0 
 pages/product/goods.vue                      |    2 
 pages/tabbar/index/static/on_screen.png      |    0 
 pages/tabbar/index/home.vue                  |   83 ++++++++++++++++++++++++++++++++++++++---
 5 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 3ef8357..e74e3dc 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -187,7 +187,7 @@
           <storeLayout v-if="false" id="main7" :storeDetail="storeDetail" :goodsDetail="goodsDetail" :res="recommendList" />
 
           <!-- 瀹濊礉璇︽儏 -->
-          <GoodsIntro id="main9" :res="goodsDetail" :goodsParams="goodsParams" :goodsId="goodsDetail.goodsId"
+         <GoodsIntro id="main9" :res="goodsDetail" :goodsParams="goodsParams" :goodsId="goodsDetail.goodsId"
             v-if="goodsDetail.id" />
 
           <!-- 瀹濊礉鎺ㄨ崘 -->
diff --git a/pages/product/product/goods/-goods-intro.vue b/pages/product/product/goods/-goods-intro.vue
index 15093f4..c72b939 100644
--- a/pages/product/product/goods/-goods-intro.vue
+++ b/pages/product/product/goods/-goods-intro.vue
@@ -23,15 +23,18 @@
         </view>
       </view>
     </view>
-
-    <view class="detail-box">
+	<!-- 鎾戣捣搴曢儴鍐呭 -->
+	<view style="height: 100px;">
+		
+	</view>
+ <!--   <view class="detail-box">
       <view class="goods-detail">
         <view class="detail_padding">
           <div class="goods-detail-box">
-            <div class="goods-detail-item goods-active">鍟嗗搧鍙傛暟</div>
-          </div>
+            <div class="goods-detail-item goods-active">鍟嗗搧鍙傛暟321</div>
+          </div> -->
           <!-- <u-divider>鍟嗗搧鍙傛暟</u-divider> -->
-          <div class="param-list" v-if="goodsParams.length == 0">
+       <!--   <div class="param-list" v-if="goodsParams.length == 0">
             <u-empty text="鏆傛棤鍟嗗搧鍙傛暟" mode="list"></u-empty>
           </div>
           <div
@@ -55,7 +58,7 @@
           </div>
         </view>
       </view>
-    </view>
+    </view> -->
   </div>
 </template>
 
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index 1214d3a..3c231fc 100644
--- a/pages/tabbar/index/home.vue
+++ b/pages/tabbar/index/home.vue
@@ -34,14 +34,18 @@
 				:ref="'video'+index"
 				:src="item.videoUrl"
 				:autoplay="index === currentIndex"
-				:controls="false"
+				:controls="isControls"
 				:loop="true"
 				:object-fit="item.videoFit"
 				:enable-progress-gesture="false"
 				:show-center-play-btn="false"
-				:show-progress="true"
-				:show-fullscreen-btn="true"
+				:show-progress="false"
+				:show-fullscreen-btn="isControls"
+				:show-play-btn="isControls"
+				:show-mute-btn="false"
 				class="video-item"
+				
+				@fullscreenchange="onFullscreenChange"
 				@play="onPlay(item.id, index)"
 				@pause="onPause(index)"
 				@ended="onEnded(index)"
@@ -50,6 +54,14 @@
 				@loadedmetadata="onLoadedMetadata($event)"
 				@waiting="videoWaiting(index)"
 			  ></video>
+			   <view class="fullscreen-btn">
+			        <image 
+			          class="fullscreen-icon" 
+			          :src="isFullScreen ? off_screen : on_screen"
+			          mode="aspectFit"
+					  @click="requestFullScreen('video'+index,item)"
+			        ></image>
+			    </view>
 			  <!-- 鑷畾涔夋帶鍒舵潯 -->
 			  <view
 				@touchstart.stop="handleTouchStart"
@@ -73,6 +85,7 @@
 				</view>
 			  </view>
 		</view>
+		
 		<view style="width: 100%; height: 100%;" v-else-if="item.videoContentType === 'img'">
 		  <uni-swiper-dot
 			:info="item.imgs"
@@ -125,7 +138,7 @@
         <view class="video-info" :style="{bottom: marginBottom + 20 + 'px'}">
 		  <view style="width: 100%; position: relative;">
 			  <text class="video-author">@{{item.authorName}}</text>
-			  <text class="iconfont" @click="jumpToSearch" style="position: absolute;right: 45px;">&#xe64e;</text>
+			  <text class="iconfont" @click="jumpToSearch" style="position: absolute;right: 42px;bottom: 50rpx;">&#xe64e;</text>
 		  </view>
           <view style="width: 100%;word-wrap: break-word;white-space: normal;overflow-wrap: break-word;">
 			  <text class="video-title">{{item.title}}</text>
@@ -269,6 +282,7 @@
 import { getUserInfo } from "@/api/members";
 import storage from "@/utils/storage.js";
 import TopBar from "@/components/TopBar.vue";
+import { nextTick } from "vue";
 
 export default {
   components: {TopBar},
@@ -279,6 +293,10 @@
   },
   data() {
     return {
+		isControls:false,
+		on_screen: require('@/pages/tabbar/index/static/on_screen.png'),
+		off_screen: require('@/pages/tabbar/index/static/off_screen.png'),
+		isFullScreen:false,
 		isTouch:false,
 		userId :'',
 		currentImgIndex: 0, // 鎾斁鍒扮鍑犲紶鍥�--绱㈠紩
@@ -450,7 +468,40 @@
   		path: `/pages/tabbar/index/home?videoId=${videoInfo.id}&userId=${userInfo.id}`,
   	}
   },
-  methods: {  
+  methods: {
+	  requestFullScreen(id,item){
+		  console.log(item)
+		 
+		  const videoContext = uni.createVideoContext(id, this)
+		  // 鏍规嵁瑙嗛鏂瑰悜鍐冲畾鍏ㄥ睆鏂瑰悜
+		    const direction = this.shouldUseLandscape(item) ? 90 : 0;
+		    
+		    // 鍏堟殏鍋滆棰戯紙閬垮厤鍒囨崲鏃剁殑澹伴煶闂锛�
+		    // videoContext.pause();
+	
+		  // 璇锋眰鍏ㄥ睆
+		   videoContext.requestFullScreen({
+		     direction: direction,
+		   });
+		   
+		   
+	  },
+	  shouldUseLandscape(item) {
+		if(item.videoFit === 'cover'){
+			return false
+		}
+	    // 榛樿妯睆锛堟牴鎹笟鍔¢渶姹傝皟鏁达級
+	    return true;
+	  },
+	  // 鍏ㄥ睆鐘舵�佸彉鍖栦簨浠�
+	      onFullscreenChange(e) {
+	        console.log('鍏ㄥ睆鐘舵�佸彉鍖�:', e.detail.fullScreen)
+			if(e.detail.fullScreen){
+				 this.isControls = true;
+			}else{
+				this.isControls = false;
+			}
+	      },
 	  getUserId(){
 		  const {id} = uni.getStorageSync('user_info_obj_dev')
 		  this.userId = id;
@@ -1178,6 +1229,26 @@
 </script>
 
 <style scoped>
+	.fullscreen-btn {
+	  width: 60rpx;
+	  height: 60rpx;
+	  border-radius: 50%;
+	  background-color: rgba(0, 0, 0, 0.4);
+	  display: flex;
+	  justify-content: center;
+	  align-items: center;
+	  z-index: 999;
+	  backdrop-filter: blur(10rpx);
+	  border: 1rpx solid rgba(255, 255, 255, 0.2);
+	  margin-top: -90rpx;
+	  margin-left: 15rpx;
+	}
+	/* 鍥炬爣鏍峰紡 */
+	.fullscreen-icon {
+	  width: 36rpx;
+	  height: 36rpx;
+	  opacity: 0.9;
+	}
 	::v-deep .custom-tabbar {
 		border-top: none !important;
 	}
@@ -1194,7 +1265,7 @@
 
 	.video-item {
 	  width: 100%;
-	  height: 100%;
+	  height: 70%;
 	  /* object-fit: cover; */
 	}
 	.play-icon {
diff --git a/pages/tabbar/index/static/off_screen.png b/pages/tabbar/index/static/off_screen.png
new file mode 100644
index 0000000..ac723c6
--- /dev/null
+++ b/pages/tabbar/index/static/off_screen.png
Binary files differ
diff --git a/pages/tabbar/index/static/on_screen.png b/pages/tabbar/index/static/on_screen.png
new file mode 100644
index 0000000..366c7b4
--- /dev/null
+++ b/pages/tabbar/index/static/on_screen.png
Binary files differ

--
Gitblit v1.8.0