From c034d4cdaf348594c443b4acd5f4c3b166e4d420 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 17 七月 2025 16:30:31 +0800
Subject: [PATCH] Merge branch 'dev' into dev_fix_sub
---
pages/tabbar/index/home.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index b353bdd..a3fe2dc 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"
@@ -120,13 +120,15 @@
<!-- 瑙嗛淇℃伅灞� -->
<view class="video-info" :style="{bottom: marginBottom + 20 + 'px'}">
- <view>
- <text class="video-author" @click="jumpToSearch">@{{item.authorName}}</text>
+ <view style="width: 100%; position: relative;">
+ <text class="video-author">@{{item.authorName}}</text>
+ <text class="iconfont" @click="jumpToSearch" style="position: absolute;right: 45px;"></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>
<!-- 鍙充晶浜掑姩鎸夐挳 -->
@@ -365,6 +367,9 @@
// } else {
// this.loadVideos();
// }
+ if (this.videoList.length < 1) {
+ this.loadVideos();
+ }
// 濡傛灉瑙嗛鎸変笅鏆傚仠鍚庡垏鎹㈤〉闈㈠啀鍥炲埌椤甸潰鏃讹紝鍙畻鏆傚仠鏃堕棿锛堝洜涓烘殏鍋滄椂闂村拰绂诲紑椤甸潰鏃堕棿鏄噸澶嶇殑锛屽彧绠椾竴涓級
if(this.startHidenTime !== 0 && this.currentVideoIsPlaying) {
const duration = Date.now() - this.startHidenTime
@@ -1116,7 +1121,7 @@
}
.video-info {
- width: 70%;
+ width: 100%;
position: absolute;
bottom: 20px;
left: 20px;
--
Gitblit v1.8.0