From dcb2bf9882dd4c6b1108d7bfccef431d0c555d2c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 03 七月 2025 16:09:39 +0800
Subject: [PATCH] 横向视频
---
pages/video/video-edit.vue | 5 +
api/video.js | 14 ++++
pages/tabbar/index/home.vue | 110 ++++++++++++++++++++++++++++++++++--
pages/video/home-page.vue | 29 +++++----
4 files changed, 136 insertions(+), 22 deletions(-)
diff --git a/api/video.js b/api/video.js
index cbe9a13..cb46c25 100644
--- a/api/video.js
+++ b/api/video.js
@@ -36,6 +36,20 @@
}
/**
+ * 鏍规嵁鍟嗗搧鑾峰彇鐩稿叧瑙嗛
+ *
+ * @param params
+ */
+ export async function getGoodsSimilarlyVideos(params) {
+ return http.request({
+ url: "/lmk/video/goods/similarly",
+ method: Method.POST,
+ needToken: true,
+ data: params
+ });
+}
+
+/**
* 鑾峰彇澶у仴搴锋帹鑽愯棰�
*
* @param params
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index 4589ccd..b353bdd 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)"
@@ -132,9 +132,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" @click="subscribeAuth(index, item.authorId)" @touchend.stop>
<text class="iconfont"></text>
</view>
</view>
@@ -256,6 +256,7 @@
thubmsUpComment,
cancelThubmsUpComment,
changeThumbsUp,
+ getGoodsSimilarlyVideos
} from "@/api/video.js";
import { changeCollect } from "@/api/collect.js";
import { saveShare, saveShareClickRecord } from "@/api/share.js";
@@ -341,6 +342,17 @@
pageSize: 10,
videoFrom: 'recommend'
},
+ goodsSimilarlyQuery: { // 鐩镐技瑙嗛鏌ヨ
+ pageNumber: 1,
+ pageSize: 10,
+ videoFrom: 'goodsSimilarly',
+ goodsIds: [],
+ currentVideoId: ''
+ },
+ similarlyVideoList: [], // 鐩镐技瑙嗛
+ similarlyNomore: false, // 鏄惁杩樻湁鏇村鐩镐技瑙嗛
+ similaryVideoIndex: 0, // 鐩镐技瑙嗛鐨勬挱鏀句綅缃�
+ similarlyLoading: false, // 鐩镐技瑙嗛鍔犺浇
marginBottom: 0 // 搴曢儴瀹夊叏鍖哄煙
}
},
@@ -399,6 +411,36 @@
}
},
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++;
+ })
+ }
+ },
+ // 璺宠浆鍒版悳绱㈤〉
jumpToSearch() {
uni.navigateTo({
url: '/pages/video/video-search'
@@ -467,6 +509,7 @@
},
// 璺宠浆涓汉涓婚〉
jumpToHomePage(authorId) {
+ console.log("浣滆�卛d", authorId);
uni.navigateTo({
url: "/pages/video/home-page?authorId=" + authorId
})
@@ -710,16 +753,23 @@
this.loading = true;
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) {
@@ -757,10 +807,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()
}
+
},
// 寮�濮嬭Е鎽�
@@ -775,7 +843,7 @@
this.touchXY.endY = e.touches[0].pageY
},
// 缁撴潫瑙︽懜
- handleSwiperEnd(item) {
+ async handleSwiperEnd(item) {
// 闃叉婊戝姩婊氬姩鏉′篃瑙﹀彂璺宠浆
if (this.showProcess) {
return
@@ -787,11 +855,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);
+ }
}
}
// 閲嶇疆鍧愭爣
diff --git a/pages/video/home-page.vue b/pages/video/home-page.vue
index b9a7b49..4188a83 100644
--- a/pages/video/home-page.vue
+++ b/pages/video/home-page.vue
@@ -222,22 +222,25 @@
}
},
onShow() {
- this.getAuthorInfo();
- if (this.currentTab === 'works') {
- this.videoQuery.pageNumber = 1
- this.nomoreVideo = false
- this.getAuthorVideoPage();
- } else if (this.currentTab === 'collect') {
- this.collectVideoQuery.pageNumber = 1
- this.nomoreCollectVideo = false
- this.getAuthorCollectVideoPage()
- } else if (this.currentTab === 'likes') {
- this.likeVideoQuery.pageNumber = 1
- this.nomoreLikeVideo = false
- this.getAuthorLikeVideoPage()
+ if (this.authorId) {
+ this.getAuthorInfo();
+ if (this.currentTab === 'works') {
+ this.videoQuery.pageNumber = 1
+ this.nomoreVideo = false
+ this.getAuthorVideoPage();
+ } else if (this.currentTab === 'collect') {
+ this.collectVideoQuery.pageNumber = 1
+ this.nomoreCollectVideo = false
+ this.getAuthorCollectVideoPage()
+ } else if (this.currentTab === 'likes') {
+ this.likeVideoQuery.pageNumber = 1
+ this.nomoreLikeVideo = false
+ this.getAuthorLikeVideoPage()
+ }
}
},
onLoad(option) {
+ console.log("鏀跺埌鍙傛暟", option);
this.authorId = option.authorId;
this.getAuthorInfo();
this.getAuthorVideoPage();
diff --git a/pages/video/video-edit.vue b/pages/video/video-edit.vue
index 66fcb5d..1cbdbaa 100644
--- a/pages/video/video-edit.vue
+++ b/pages/video/video-edit.vue
@@ -666,7 +666,10 @@
this.loading = true;
this.formData.fileInfo = this.videoInfo;
this.formData["goodsList"] = this.selectedGoodsList.map(item => {return {goodsId: item.goodsId, goodsSkuId: item.id, goodsNum: item.goodsNum}});
- updateVideo(this.formData).then(res => {
+ if (this.formData.videoContentType === 'img') {
+ this.formData.videoImgs = JSON.parse(this.formData.videoImgs)
+ }
+ updateVideo(this.formData).then(res => {
uni.showToast({
title: '瑙嗛宸叉彁浜ゅ鏍竳',
icon: 'success'
--
Gitblit v1.8.0