From bfdadd3f45f4ee3a2779e61fc08df453dd28f6a9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 08 八月 2025 15:57:29 +0800
Subject: [PATCH] 全屏按钮位置问题
---
pages/tabbar/index/home.vue | 203 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 186 insertions(+), 17 deletions(-)
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index 3f07dde..d51340e 100644
--- a/pages/tabbar/index/home.vue
+++ b/pages/tabbar/index/home.vue
@@ -26,7 +26,7 @@
@click="togglePlay(index)"
v-show="!currentVideoIsPlaying"
>
- <image src="/static/video/play.png" style="width: 45px;height: 45px" mode="aspectFit"></image>
+ <image src="/pages/subComponents/static/video/play.png" style="width: 45px;height: 45px" mode="aspectFit"></image>
</view>
<video
v-if="index >= currentIndex - videoLiveOffset && index <= currentIndex + videoLiveOffset"
@@ -34,12 +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="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)"
@@ -48,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"
@@ -56,9 +70,10 @@
:style="{bottom: marginBottom + 'px'}"
class="container">
<!-- 杩涘害鏉� - 鏁翠釜鍖哄煙鍙嫋鍔� -->
- <view class="process-warp" :style="{ opacity: showProcess ? 1 : 0 }">
+ <!-- <view class="process-warp" :style="{ opacity: showProcess ? 1 : 0 }"> -->
+ <view class="process-warp">
<!-- 鏄剧ず褰撳墠杩涘害 -->
- <view class="progress-text">{{ hasPlayTime }}/{{formartDuration}}</view>
+ <view v-show="isTouch" class="progress-text">{{ hasPlayTime }}/{{formartDuration}}</view>
<view
class="progress-bar"
id="progressBar"
@@ -70,6 +85,7 @@
</view>
</view>
</view>
+
<view style="width: 100%; height: 100%;" v-else-if="item.videoContentType === 'img'">
<uni-swiper-dot
:info="item.imgs"
@@ -122,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;"></text>
+ <text class="iconfont" @click="jumpToSearch" style="position: absolute;right: 42px;bottom: 50rpx;"></text>
</view>
<view style="width: 100%;word-wrap: break-word;white-space: normal;overflow-wrap: break-word;">
<text class="video-title">{{item.title}}</text>
@@ -189,7 +205,7 @@
<view style="display: flex;">
<image class="comment-avatar" :src="comment.userAvatar || '/static/default-avatar.png'"></image>
<view class="comment-content">
- <text class="nickname">{{comment.userNickname}}</text>
+ <text class="nickname">{{comment.userNickname}} <text v-if="userId===comment.userId">(鎴�)</text> </text>
<text class="content">{{comment.commentContent}}</text>
<view style="position: relative;">
<text class="time">{{formatTime(comment.createTime)}}</text>
@@ -205,8 +221,8 @@
<view class="reply-content">
<view style="display: flex;">
<image class="comment-reply-avatar" :src="reply.replyUserAvatar || '/static/default-avatar.png'"></image>
- <text class="nickname">{{reply.userNickname}}</text>
- <text v-if="reply.replyUserId && reply.masterCommentId !== reply.replyId" class="reply-to"><text style="margin-right: 10rpx;font-size: 28rpx;" class="iconfont"></text>{{reply.replyUserNickname}}</text>
+ <text class="nickname">{{reply.userNickname}}<text v-if="userId===comment.userId">(鎴�)</text></text>
+ <text v-if="reply.replyUserId && reply.masterCommentId !== reply.replyId" class="reply-to"><text style="margin-right: 10rpx;font-size: 28rpx;" class="iconfont"></text>{{reply.replyUserNickname}}<text v-if="userId===comment.userId">(鎴�)</text></text>
</view>
<text class="content">{{reply.commentContent}}</text>
<view class="reply-footer">
@@ -266,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},
@@ -276,6 +293,12 @@
},
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, // 鎾斁鍒扮鍑犲紶鍥�--绱㈠紩
currentGoodsIndex: 0, // 鎾斁鍒扮鍑犱釜鍟嗗搧--绱㈠紩
currentTime: 0,
@@ -288,7 +311,7 @@
barWidth: 0, // 杩涘害鏉″搴�
isDragging: false, // 鏄惁姝ｅ湪鎷栧姩
processHidenTimer: null, // 杩涘害鏉￠殣钘忓畾鏃跺櫒
- showProcess: false, // 鏄惁鏄剧ず杩涘害鏉�
+ showProcess: true, // 鏄惁鏄剧ず杩涘害鏉�
videoNoMore: false, // 鏄惁杩樻湁鏇村瑙嗛
commentNoMore: false, // 鏄惁杩樻湁鏇村璇勮
commentQuery: {
@@ -359,6 +382,9 @@
}
},
onShow() {
+ if(!this.userId){
+ this.getUserId()
+ }
// const token = storage.getAccessToken();
// if (! token) {
// this.wxSilentLogin(() => {
@@ -367,6 +393,12 @@
// } else {
// this.loadVideos();
// }
+ if (this.videoList.length < 1) {
+ this.loading = false;
+ this.videoNoMore = false;
+ console.log('瑙﹀彂鏁版嵁鍔犺浇')
+ this.loadVideos();
+ }
// 濡傛灉瑙嗛鎸変笅鏆傚仠鍚庡垏鎹㈤〉闈㈠啀鍥炲埌椤甸潰鏃讹紝鍙畻鏆傚仠鏃堕棿锛堝洜涓烘殏鍋滄椂闂村拰绂诲紑椤甸潰鏃堕棿鏄噸澶嶇殑锛屽彧绠椾竴涓級
if(this.startHidenTime !== 0 && this.currentVideoIsPlaying) {
const duration = Date.now() - this.startHidenTime
@@ -377,19 +409,44 @@
this.startHidenTime = Date.now()
},
onLoad(option) {
+
+ console.log('-----------鍒嗕韩鍑虹殑鏁版嵁---------->',option)
+ //澶勭悊鎵爜鍑烘潵鐨勮棰�
this.marginBottom = uni.getSystemInfoSync().safeAreaInsets.bottom
+ // 妫�鏌ユ槸鍚﹀瓨鍦╭鍙傛暟
+ let queryParam = this.videoQuery;
+ if (option.q) {
+ // 鍙岄噸瑙ｇ爜锛氬井淇″URL杩涜浜嗕袱娆＄紪鐮�
+ const decodedUrl = decodeURIComponent(decodeURIComponent(option.q));
+ console.log('鍘熷URL:', decodedUrl);
+
+ // 瑙ｆ瀽URL涓殑鏌ヨ鍙傛暟
+ const params = this.parseUrlParams(decodedUrl);
+ const shareType = params.shareType;
+ const videoId = params.videoId;
+ queryParam.videoId = videoId
+ console.log('瑙ｆ瀽鍙傛暟:', { shareType, videoId });
+ }
const token = storage.getAccessToken();
if (! token) {
this.wxSilentLogin(() => {
- this.loadVideos();
// 鍒ゆ柇鏄笉鏄偣鍑诲垎浜摼鎺ヨ繘鏉ョ殑
if (option.userId && option.videoId) {
+ queryParam.videoId = option.videoId
// 淇濆瓨鍒嗕韩鐐瑰嚮璁板綍
saveShareClickRecord({refId: option.videoId, shareUserId: option.userId})
}
+ console.log('------------------------>',queryParam)
+ this.loadVideos(queryParam);
})
} else {
- this.loadVideos();
+ if (option.userId && option.videoId) {
+ queryParam.videoId = option.videoId
+ // 淇濆瓨鍒嗕韩鐐瑰嚮璁板綍
+ saveShareClickRecord({refId: option.videoId, shareUserId: option.userId})
+ }
+ console.log('------------------------2>',queryParam)
+ this.loadVideos(queryParam);
}
},
onShareAppMessage(e) {
@@ -409,10 +466,63 @@
return {
title: videoInfo.title,
path: `/pages/tabbar/index/home?videoId=${videoInfo.id}&userId=${userInfo.id}`,
- imageUrl: videoInfo.coverUrl
}
},
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;
+ },
+ // 瑙ｆ瀽URL鍙傛暟
+ parseUrlParams(url) {
+ const params = {};
+ // 澶勭悊鍙兘瀛樺湪鐨刪ash锛堝鏋滄湁鐨勮瘽锛�
+ const cleanUrl = url.split('#')[0];
+ const queryStr = cleanUrl.split('?')[1] || '';
+
+ queryStr.split('&').forEach(pair => {
+ const [key, value] = pair.split('=');
+ if (key) {
+ // 濡傛灉鍊煎瓨鍦紝鍒欒В鐮侊紝鍚﹀垯璁句负绌哄瓧绗︿覆
+ params[key] = value ? decodeURIComponent(value) : '';
+ }
+ });
+
+ return params;
+ },
// 鏌ヨ褰撳墠瑙嗛鐨勫叧鑱旇棰戯紙鎸備簡鍚屼竴鍟嗗搧鐨勶級
async getGoodsSimilarly() {
if (this.similarlyLoading || this.similarlyNomore) return Promise.resolve();;
@@ -715,6 +825,7 @@
getVideoComments(this.commentQuery).then(res => {
this.commentsTotal = res.data.total;
this.comments = res.data.data;
+ console.log('------------------------>',this.comments)
this.commentQuery.pageNumber += 2;
this.commentQuery.pageSize /= 2;
}).catch(() => {
@@ -750,10 +861,38 @@
},
// 鍔犺浇瑙嗛鏁版嵁
- async loadVideos() {
+ async loadVideos(param) {
if (this.loading || this.videoNoMore) return;
this.loading = true;
-
+ if(param){
+ getRecommendVideos(param).then(res => {
+ // 鏂板涓�涓瓧娈电敤浜庡惊鐜椂鐨刱ey
+ const data = res.data.data.map(item => {
+ return {
+ ...item,
+ updateKey: item.id
+ }
+ })
+ if (this.videoQuery.pageNumber === 1) {
+ this.videoList = data;
+ } else {
+ this.videoList = [
+ ...this.videoList,
+ ...data.filter(
+ (newItem) => !this.videoList.some((oldItem) => oldItem.id === newItem.id)
+ ),
+ ];
+
+ }
+ this.loading = false;
+ if(res.data.data.length < this.videoQuery.pageSize) {
+ this.videoNoMore = true;
+ return;
+ }
+ this.videoQuery.pageNumber++;
+
+ })
+ }else{
getRecommendVideos(this.videoQuery).then(res => {
// 鏂板涓�涓瓧娈电敤浜庡惊鐜椂鐨刱ey
const data = res.data.data.map(item => {
@@ -781,6 +920,7 @@
this.videoQuery.pageNumber++;
})
+ }
},
// 婊戝姩鍒囨崲瑙嗛
@@ -1005,6 +1145,7 @@
handleTouchStart(e) {
this.isDragging = true;
this.showProcess = true;
+ this.isTouch = true;
this.startProgress = this.progress; // 璁板綍寮�濮嬫椂鐨勮繘搴�
this.startX = e.touches[0].pageX;
console.log("璁板綍寮�濮嬫椂鐨勮繘搴�", this.startProgress);
@@ -1028,7 +1169,8 @@
videoContext.seek(this.duration * this.progress / 100)
videoContext.play()
this.processHidenTimer = setTimeout(() => {
- this.showProcess = false;
+ // this.showProcess = true;
+ this.isTouch = false;
}, 1000);
},
@@ -1087,6 +1229,28 @@
</script>
<style scoped>
+ .fullscreen-btn {
+ position: absolute;
+ right: 45rpx;
+ bottom: 70rpx;
+ 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);
+
+ }
+ /* 鍥炬爣鏍峰紡 */
+ .fullscreen-icon {
+ width: 36rpx;
+ height: 36rpx;
+ opacity: 0.9;
+ }
::v-deep .custom-tabbar {
border-top: none !important;
}
@@ -1470,16 +1634,21 @@
.progress-bar {
position: relative;
width: 100%;
- height: 16px;
- background-color: #eee;
+ height: 5px;
+ background-color: rgba(255, 255, 255, 0.2); /* 鍗婇�忔槑鑳屾櫙 */
overflow: hidden;
+ border-radius: 1.5px;
+ cursor: pointer;
+ transition: height 0.2s;
}
.progress-fill {
+
position: absolute;
left: 0;
top: 0;
height: 100%;
+ border-radius: 2px;
background-color: lightgray;
transition: width 0.1s;
}
--
Gitblit v1.8.0