From f2cb18b54d5b774d046086a4b75acda16e61ce65 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 03 七月 2025 16:46:02 +0800
Subject: [PATCH] 横向视频同步至其它视频页面

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

diff --git a/pages/video/video-play.vue b/pages/video/video-play.vue
index cb2bb48..2f204fa 100644
--- a/pages/video/video-play.vue
+++ b/pages/video/video-play.vue
@@ -130,9 +130,9 @@
         <!-- 鍙充晶浜掑姩鎸夐挳 -->
         <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" @touchend.stop @click="subscribeAuth(index, item.authorId)">
 				 <text class="iconfont">&#xe629;</text>
 			   </view>
 		   </view>
@@ -252,6 +252,7 @@
 	thubmsUpComment, 
 	cancelThubmsUpComment,
 	changeThumbsUp,
+	getGoodsSimilarlyVideos
 } from "@/api/video.js";
 import { changeCollect } from "@/api/collect.js";
 import { saveShare } from "@/api/share.js";
@@ -334,6 +335,17 @@
 			videoFrom: '',
 			keyword: ''
 		},
+		goodsSimilarlyQuery: { // 鐩镐技瑙嗛鏌ヨ
+			pageNumber: 1,
+			pageSize: 10,
+			videoFrom: 'goodsSimilarly',
+			goodsIds: [],
+			currentVideoId: ''
+		},
+		similarlyVideoList: [], // 鐩镐技瑙嗛
+		similarlyNomore: false, // 鏄惁杩樻湁鏇村鐩镐技瑙嗛
+		similaryVideoIndex: 0, // 鐩镐技瑙嗛鐨勬挱鏀句綅缃�
+		similarlyLoading: false, // 鐩镐技瑙嗛鍔犺浇
 		marginBottom: 0, // 搴曢儴瀹夊叏鍖哄煙
 		windowHeight: 0 // 鍙娇鐢ㄥ睆骞曢珮搴�
     }
@@ -411,6 +423,35 @@
   	}
   },
   methods: {
+	  // 鏌ヨ褰撳墠瑙嗛鐨勫叧鑱旇棰戯紙鎸備簡鍚屼竴鍟嗗搧鐨勶級
+	  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++;
+	  			  })
+	  		  }
+	  },
 	  // 鐐瑰嚮鍟嗗搧璺宠浆
 	  jumpToPay(videoId) {
 	  		uni.navigateTo({
@@ -680,18 +721,25 @@
       this.loading = true;
       
 	  getRecommendVideos(this.videoQuery).then(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) {
+		  if(data.length < this.videoQuery.pageSize) {
 			  this.videoNoMore = true;
 			  return;
 		  }
@@ -725,6 +773,23 @@
     	// 鎾斁褰撳墠瑙嗛
     	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()
@@ -742,7 +807,7 @@
 	    this.touchXY.endY = e.touches[0].pageY
 	},
 	// 缁撴潫瑙︽懜
-	handleSwiperEnd(item) {
+	async handleSwiperEnd(item) {
 		// 闃叉婊戝姩婊氬姩鏉′篃瑙﹀彂璺宠浆
 		if (this.showProcess) {
 			return
@@ -755,11 +820,37 @@
 	    if (Math.abs(diffX) > Math.abs(diffY)) {
 	      if (diffX > 0) {
 	        console.log('鍙虫粦')
-			if (item.goodsList && item.goodsList.length > 0) {
-				this.jumpToPay(item.id)
-			}
+	    	if (this.similaryVideoIndex !== 0) {
+	    		// 濡傛灉婊戝姩浜嗘í鍚戣棰戯紝閭d箞鍙虫粦灏卞仛瑙嗛鍒囨崲鑰屼笉鏄烦杞晢鍝侀〉
+	    		// 鍒囨崲涓嬩竴涓棰�
+	    		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);
+	    	}
 	      }
 	    }
 	    // 閲嶇疆鍧愭爣

--
Gitblit v1.8.0