From c1626f0e66bb1301668698c71c490a0bdc1c6a0e Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 25 八月 2025 18:48:31 +0800
Subject: [PATCH] 跳转
---
pages/tabbar/index/home.vue | 457 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 420 insertions(+), 37 deletions(-)
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index 87916dc..fe1fcd6 100644
--- a/pages/tabbar/index/home.vue
+++ b/pages/tabbar/index/home.vue
@@ -14,7 +14,7 @@
>
<swiper-item
v-for="(item, index) in videoList"
- :key="item.id"
+ :key="item.updateKey"
@touchstart="handleSwiperStart"
@touchmove="handleSwiperMove"
@touchend="handleSwiperEnd(item)"
@@ -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"
@@ -120,21 +136,23 @@
<!-- 瑙嗛淇℃伅灞� -->
<view class="video-info" :style="{bottom: marginBottom + 20 + 'px'}">
- <view>
+ <view style="width: 100%; position: relative;">
<text class="video-author">@{{item.authorName}}</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>
<text class="video-tag" v-for="(tag, index) in item.tagList" :key="tag.id">#{{tag.tagName}}</text>
</view>
+
</view>
<!-- 鍙充晶浜掑姩鎸夐挳 -->
<view class="action-buttons">
<view class="avatar-container">
- <image class="avatar" @click="jumpToHomePage(item.authorId)" :src="item.authorAvatar" mode="aspectFill"></image>
+ <image class="avatar" @click="jumpToHomePage(item.authorId)" @touchend.stop :src="item.authorAvatar" mode="aspectFill"></image>
<!-- 鍏虫敞鍥炬爣 - 浣跨敤缁濆瀹氫綅 -->
- <view v-if="!item.subscribeThisAuthor" class="follow-icon" @click="subscribeAuth(index, item.authorId)">
+ <view v-if="!item.subscribeThisAuthor" class="follow-icon" @click="subscribeAuth(index, item.authorId)" @touchend.stop>
<text class="iconfont"></text>
</view>
</view>
@@ -184,11 +202,13 @@
</view>
<view v-else class="comment-item" v-for="(comment, index) in comments" :key="comment.id">
- <view style="display: flex;">
+ <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="content">{{comment.commentContent}}</text>
+ <view @click="replyClick(comment)">
+ <text class="nickname">{{comment.userNickname}} <text v-if="userId===comment.userId">(鎴�)</text> </text>
+ <text class="content">{{comment.commentContent}}</text>
+ </view>
<view style="position: relative;">
<text class="time">{{formatTime(comment.createTime)}}</text>
<text @click="openReply(comment)" class="reply-btu time">鍥炲</text>
@@ -200,11 +220,11 @@
<!-- 鍥炲鍒楄〃 -->
<view class="reply-list" v-if="comment.replies && comment.replies.length > 0">
<view class="reply-item" v-for="(reply, replyIndex) in comment.replies" :key="reply.id">
- <view class="reply-content">
+ <view class="reply-content" @click="replyClick(reply)">
<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">
@@ -243,6 +263,16 @@
<custom-tabbar bgColor="#333333" selected="index" selectedTextColor="#ffffff"></custom-tabbar>
+
+ <ActivityPopup
+ :show="activityPopup.show"
+ :activityTitle="activityPopup.title"
+ :activityDesc="activityPopup.desc"
+ :activityImage="activityPopup.image"
+ :endTime="activityPopup.endTime"
+ :prizeActivityId="activityPopup.prizeActivityId"
+ @close="onClosePopup"
+ />
</view>
</template>
@@ -256,23 +286,38 @@
thubmsUpComment,
cancelThubmsUpComment,
changeThumbsUp,
+ getGoodsSimilarlyVideos,
+ removeByIdVideoComment,
} from "@/api/video.js";
+
+import ActivityPopup from '@/pages/ActivityPopup/ActivityPopup.vue'
+import { mapState, mapMutations } from 'vuex'
+import {setPopupRedisTime,getPopupAcitivty} from '@/api/popup.js'
import { changeCollect } from "@/api/collect.js";
import { saveShare, saveShareClickRecord } from "@/api/share.js";
import { silentLogin } from "@/api/connect.js";
import { getUserInfo } from "@/api/members";
import storage from "@/utils/storage.js";
import TopBar from "@/components/TopBar.vue";
-
+import { nextTick } from "vue";
+import {getVideoCover } from "@/api/common.js"
export default {
- components: {TopBar},
+ components: {TopBar,ActivityPopup},
computed: {
hasPlayTime() {
return this.sliderFormatTime(this.progress > 0 ? this.duration * this.progress / 100 : 0);
- }
+ },
+ // 閿欒锛氭病鏈夌敤 ... 灞曞紑锛屽鑷� activityPopup 鏄嚱鏁�
+ ...mapState(['activityPopup'])
},
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,
@@ -285,7 +330,7 @@
barWidth: 0, // 杩涘害鏉″搴�
isDragging: false, // 鏄惁姝ｅ湪鎷栧姩
processHidenTimer: null, // 杩涘害鏉￠殣钘忓畾鏃跺櫒
- showProcess: false, // 鏄惁鏄剧ず杩涘害鏉�
+ showProcess: true, // 鏄惁鏄剧ず杩涘害鏉�
videoNoMore: false, // 鏄惁杩樻湁鏇村瑙嗛
commentNoMore: false, // 鏄惁杩樻湁鏇村璇勮
commentQuery: {
@@ -341,10 +386,28 @@
pageSize: 10,
videoFrom: 'recommend'
},
+ goodsSimilarlyQuery: { // 鐩镐技瑙嗛鏌ヨ
+ pageNumber: 1,
+ pageSize: 10,
+ videoFrom: 'goodsSimilarly',
+ goodsIds: [],
+ currentVideoId: ''
+ },
+ similarlyVideoList: [], // 鐩镐技瑙嗛
+ similarlyNomore: false, // 鏄惁杩樻湁鏇村鐩镐技瑙嗛
+ similaryVideoIndex: 0, // 鐩镐技瑙嗛鐨勬挱鏀句綅缃�
+ similarlyLoading: false, // 鐩镐技瑙嗛鍔犺浇
marginBottom: 0 // 搴曢儴瀹夊叏鍖哄煙
}
},
onShow() {
+
+ this.openActivityPopup()
+
+
+ if(!this.userId){
+ this.getUserId()
+ }
// const token = storage.getAccessToken();
// if (! token) {
// this.wxSilentLogin(() => {
@@ -353,6 +416,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
@@ -363,19 +432,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) {
@@ -392,13 +486,190 @@
shareUser: userInfo.id
}
saveShare(data)
- return {
- title: videoInfo.title,
- path: `/pages/tabbar/index/home?videoId=${videoInfo.id}&userId=${userInfo.id}`,
- imageUrl: videoInfo.coverUrl
- }
- },
+ // getVideoCover(videoInfo.id).then(res =>{
+ // if(res.statusCode === 200){
+ // imageUrl = res.data.data
+ // console.log(imageUrl)
+ // return {
+ // title: videoInfo.title,
+ // path: `/pages/tabbar/index/home?videoId=${videoInfo.id}&userId=${userInfo.id}`,
+ // imageUrl: imageUrl
+ // }
+ // }
+
+ // })
+ console.log(videoInfo)
+ return {
+ title: videoInfo.title,
+ path: `/pages/tabbar/index/home?videoId=${videoInfo.id}&userId=${userInfo.id}`,
+ imageUrl: videoInfo.coverUrl
+ }
+ // 淇濆瓨鍒嗕韩璁板綍
+ },
methods: {
+ async openActivityPopup() {
+ await getPopupAcitivty().then(res =>{
+ if(res.statusCode === 200){
+ let obj = res.data.data;
+ if(obj.enableStatus === 'ON'){
+ setPopupRedisTime().then(res =>{
+ if(res.statusCode === 200){
+ if(res.data.state){
+ this.showActivityPopup({
+ title: obj.activityName,
+ desc: obj.activityDes,
+ image: obj.activityCoverUrl,
+ endTime:new Date(obj.endTime).getTime(),
+ prizeActivityId:obj.id
+ })
+ }else{
+ this.hideActivityPopup()
+ }
+
+ }
+ });
+ }
+
+ }
+ })
+
+ },
+ ...mapMutations(['showActivityPopup','hideActivityPopup']), // 寮曞叆Vuex鐨勬柟娉�
+ onClosePopup() {
+ this.hideActivityPopup()
+ },
+ replyClick(reply){
+
+ if(this.userId === reply.userId){
+ let that = this;
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '浣犵‘瀹氳鍒犻櫎鍚�',
+ success: function (res) {
+ if (res.confirm) {
+ console.log('纭畾');
+ //璋冪敤鍒犻櫎鐨勯�昏緫
+ console.log(reply)
+ removeByIdVideoComment(reply.id).then(res =>{
+ const item = {
+ id:reply.videoId
+ }
+ that.commentQuery.pageNumber = 1;
+ //閲嶆柊鏇存柊璇勮
+ that.showComments(item);
+ })
+
+ } else if (res.cancel) {
+ console.log('鍙栨秷');
+ }
+ }
+ });
+
+ }
+ console.log(reply)
+ },
+ // 鎴彇瑙嗛褰撳墠甯�
+ captureVideoFrame(videoCtx) {
+ return new Promise((resolve) => {
+ videoCtx.requestFrame(() => {
+ wx.canvasToTempFilePath({
+ canvasId: 'shareCanvas',
+ success: (res) => resolve(res),
+ fail: () => resolve({ tempFilePath: '/assets/default-cover.jpg' })
+ });
+ });
+ });
+ },
+ 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();;
+ const video = this.videoList[this.currentIndex];
+ if (video.goodsList && video.goodsList.length > 0) {
+ this.goodsSimilarlyQuery.goodsIds = video.goodsList.map(goods => goods.goodsId);
+ this.goodsSimilarlyQuery.currentVideoId = video.id;
+ if (this.similarlyVideoList.length < 1) {
+ this.similarlyVideoList.push(video); // 纭繚鍘熻棰戞槸妯悜瑙嗛鐨勭涓�涓厓绱�
+ }
+ this.similarlyLoading = true;
+ return getGoodsSimilarlyVideos(this.goodsSimilarlyQuery).then(res => {
+
+ this.similarlyVideoList = [
+ ...this.similarlyVideoList,
+ ...res.data.data.filter(
+ (newItem) => !this.similarlyVideoList.some((oldItem) => oldItem.id === newItem.id)
+ ),
+ ];
+
+ this.similarlyLoading = false;
+ if(res.data.data.length < this.goodsSimilarlyQuery.pageSize) {
+ this.similarlyNomore = true;
+ return;
+ }
+ this.goodsSimilarlyQuery.pageNumber++;
+ })
+ }
+ },
+ // 璺宠浆鍒版悳绱㈤〉
+ jumpToSearch() {
+ uni.navigateTo({
+ url: '/pages/video/video-search'
+ });
+ },
+ // 鍒囨崲椤堕儴瀵艰埅鏍�
topBarChange(titleObj) {
if (titleObj.index === 'home') {
uni.switchTab({
@@ -461,6 +732,7 @@
},
// 璺宠浆涓汉涓婚〉
jumpToHomePage(authorId) {
+ console.log("浣滆�卛d", authorId);
uni.navigateTo({
url: "/pages/video/home-page?authorId=" + authorId
})
@@ -652,6 +924,7 @@
this.commentQuery.pageNumber++;
})
},
+
// 鏄剧ず璇勮寮圭獥
async showComments(item) {
this.commentForm.videoId = item.id;
@@ -664,6 +937,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(() => {
@@ -699,21 +973,56 @@
},
// 鍔犺浇瑙嗛鏁版嵁
- 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 => {
- console.log(res, "瑙嗛鏁版嵁");
+ // 鏂板涓�涓瓧娈电敤浜庡惊鐜椂鐨刱ey
+ const data = res.data.data.map(item => {
+ return {
+ ...item,
+ updateKey: item.id
+ }
+ })
if (this.videoQuery.pageNumber === 1) {
- this.videoList = res.data.data;
+ this.videoList = data;
} else {
this.videoList = [
...this.videoList,
- ...res.data.data.filter(
+ ...data.filter(
(newItem) => !this.videoList.some((oldItem) => oldItem.id === newItem.id)
),
];
+
}
this.loading = false;
if(res.data.data.length < this.videoQuery.pageSize) {
@@ -723,6 +1032,7 @@
this.videoQuery.pageNumber++;
})
+ }
},
// 婊戝姩鍒囨崲瑙嗛
@@ -751,10 +1061,28 @@
// 鎾斁褰撳墠瑙嗛
const videoContext1 = uni.createVideoContext(`video${this.currentIndex}`, this);
videoContext1.play()
+
+ // 涓嬫粦鏃讹紝闇�瑕佸皢涓婁竴涓棰戦噸缃负鍘熷瑙嗛(濡傛灉妯悜婊戝姩浜嗙浉鍏宠棰�)
+ if (this.similaryVideoIndex !== 0) {
+ this.videoList[oldIndex] = this.similarlyVideoList[0]
+ }
+ this.similarlyVideoList = [];
+ this.similaryVideoIndex = 0;
+ this.similarlyNomore = false;
+ this.similarlyLoading = false;
+ this.goodsSimilarlyQuery = {
+ pageNumber: 1,
+ pageSize: 6,
+ videoFrom: 'goodsSimilarly',
+ goodsIds: [],
+ currentVideoId: ''
+ }
+
// 濡傛灉鍓╀綑瑙嗛涓嶈冻锛岃Е鍙戣姹傝幏鍙栨洿澶氳棰�
if (this.videoList.length - 1 < this.currentIndex + this.videoLiveOffset) {
this.loadVideos()
}
+
},
// 寮�濮嬭Е鎽�
@@ -769,7 +1097,7 @@
this.touchXY.endY = e.touches[0].pageY
},
// 缁撴潫瑙︽懜
- handleSwiperEnd(item) {
+ async handleSwiperEnd(item) {
// 闃叉婊戝姩婊氬姩鏉′篃瑙﹀彂璺宠浆
if (this.showProcess) {
return
@@ -781,11 +1109,37 @@
if (Math.abs(diffX) > Math.abs(diffY)) {
if (diffX > 0) {
console.log('鍙虫粦')
- if (item.goodsList && item.goodsList.length > 0) {
+ if (this.similaryVideoIndex !== 0) {
+ // 濡傛灉婊戝姩浜嗘í鍚戣棰戯紝閭ｄ箞鍙虫粦灏卞仛瑙嗛鍒囨崲鑰屼笉鏄烦杞晢鍝侀〉
+ // 鍒囨崲涓嬩竴涓棰�
+ const oldIndex = this.similaryVideoIndex;
+ this.similaryVideoIndex = Math.max(this.similaryVideoIndex - 1, 0);
+ if (this.similaryVideoIndex < oldIndex) {
+ // 鎶婄珫鍚戣棰戠殑褰撳墠鎾斁浣嶇疆鏇挎崲涓烘í鍚戣棰戠殑褰撳墠绱㈠紩鍏冪礌
+ const video = this.similarlyVideoList[this.similaryVideoIndex];
+ video["updateKey"] = video.id + this.similaryVideoIndex
+ this.videoList.splice(this.currentIndex, 1, video);
+ // this.videoList[this.currentIndex] = video
+ }
+ }
+ else if (item.goodsList && item.goodsList.length > 0) {
this.jumpToPay(item.id)
}
} else {
console.log('宸︽粦')
+ if (this.similarlyVideoList.length < 1 || this.similarlyVideoList.length - this.similaryVideoIndex - 1 <= 3) {
+ // 鐩稿叧瑙嗛涓虹┖鎴栬�呭墿浣欒棰戜笉瓒筹紝瑙﹀彂鍔犺浇鐩稿叧瑙嗛
+ await this.getGoodsSimilarly()
+ }
+ // 鍒囨崲涓嬩竴涓棰�
+ const oldIndex = this.similaryVideoIndex;
+ this.similaryVideoIndex = Math.min(this.similaryVideoIndex + 1, this.similarlyVideoList.length - 1);
+ if (this.similaryVideoIndex > oldIndex) {
+ // 鎶婄珫鍚戣棰戠殑褰撳墠鎾斁浣嶇疆鏇挎崲涓烘í鍚戣棰戠殑褰撳墠绱㈠紩鍏冪礌
+ const video = this.similarlyVideoList[this.similaryVideoIndex];
+ video["updateKey"] = video.id + this.similaryVideoIndex
+ this.videoList.splice(this.currentIndex, 1, video);
+ }
}
}
// 閲嶇疆鍧愭爣
@@ -903,6 +1257,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);
@@ -926,7 +1281,8 @@
videoContext.seek(this.duration * this.progress / 100)
videoContext.play()
this.processHidenTimer = setTimeout(() => {
- this.showProcess = false;
+ // this.showProcess = true;
+ this.isTouch = false;
}, 1000);
},
@@ -985,6 +1341,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;
}
@@ -1016,7 +1394,7 @@
}
.video-info {
- width: 70%;
+ width: 100%;
position: absolute;
bottom: 20px;
left: 20px;
@@ -1368,16 +1746,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