From cbafbc0a3a704cc48e76ef0862ffcf74433186ff Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 25 八月 2025 18:48:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/video/home-page.vue | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/pages/video/home-page.vue b/pages/video/home-page.vue
index de28ae4..5580ded 100644
--- a/pages/video/home-page.vue
+++ b/pages/video/home-page.vue
@@ -50,7 +50,7 @@
>
浣滃搧{{`(${videoTotal})`}}
</view>
- <view
+ <view
class="tab-item"
:class="{active: currentTab === 'collect'}"
@click="switchTab('collect')"
@@ -65,7 +65,9 @@
鍠滄
</view>
</view>
-
+
+
+
<!-- 瑙嗛鍒楄〃 -->
<scroll-view class="video-list" scroll-y :show-scrollbar="false" @scrolltolower="getPage" v-show="currentTab === 'works' && videoList.length > 0">
<view class="video-container">
@@ -104,7 +106,10 @@
</view>
</view>
</scroll-view>
- <scroll-view class="video-list" scroll-y :show-scrollbar="false" @scrolltolower="getPage" v-show="currentTab === 'collect' && collectVideoList.length > 0">
+ <view>
+ <mycollect v-show ="currentTab ==='collect'"></mycollect>
+ </view>
+ <!-- <scroll-view class="video-list" scroll-y :show-scrollbar="false" @scrolltolower="getPage" v-show="currentTab === 'collect' && collectVideoList.length > 0">
<view class="video-container">
<view
class="video-item"
@@ -121,7 +126,7 @@
:show-center-play-btn="false"
object-fit="cover"></video>
- <!-- <image class="video-cover" :src="getCoverUrl(item)"></image> -->
+
<view class="video-info">
<view class="video-stats">
<view class="stat">
@@ -132,7 +137,7 @@
</view>
</view>
</view>
- </scroll-view>
+ </scroll-view> -->
<scroll-view class="video-list" scroll-y :show-scrollbar="false" @scrolltolower="getPage" v-show="currentTab === 'likes' && likeVideoList.length > 0">
<view class="video-container">
<view
@@ -195,8 +200,10 @@
import {getAuthorInfo, getAuthorVideoPage, getAuthorCollectVideoPage, getAuthorLikeVideoPage} from '@/api/user.js'
import {subscribe, unSubscribe, delVideo, updateVideo, userDownVideo} from '@/api/video.js'
+import mycollect from '@/pages/video/myCollect.vue'
export default {
- components: {DropdownMenu},
+ components: {DropdownMenu,
+ mycollect},
data() {
return {
options: [
--
Gitblit v1.8.0