From b6b1a34a610795ed5ea8dd8658955ea4c9a0d401 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 27 六月 2025 15:54:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/tabbar/index/home.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index 4e2f810..078a1bb 100644
--- a/pages/tabbar/index/home.vue
+++ b/pages/tabbar/index/home.vue
@@ -1,6 +1,6 @@
<template>
<view class="video-container">
- <top-bar selectedTitleIndex="home" @changeTab="topBarChange" class="topBar"></top-bar>
+ <top-bar selectedTitleIndex="home" textColor="white" @changeTab="topBarChange" class="topBar"></top-bar>
<!-- 瑙嗛鍔犺浇 -->
<zero-loading v-show="videoLoading" type="circle" color="#0ebd57" text=""></zero-loading>
<!-- 瑙嗛鍒楄〃 -->
@@ -36,7 +36,7 @@
:autoplay="index === currentIndex"
:controls="false"
:loop="true"
- :object-fit="item.objectFit"
+ :object-fit="item.videoFit"
:enable-progress-gesture="false"
:show-center-play-btn="false"
class="video-item"
@@ -53,6 +53,7 @@
@touchstart.stop="handleTouchStart"
@touchmove.stop="handleTouchMove"
@touchend.stop="handleTouchEnd"
+ :style="{bottom: marginBottom + 'px'}"
class="container">
<!-- 杩涘害鏉� - 鏁翠釜鍖哄煙鍙嫋鍔� -->
<view class="process-warp" :style="{ opacity: showProcess ? 1 : 0 }">
@@ -118,7 +119,7 @@
<!-- 瑙嗛淇℃伅灞� -->
- <view class="video-info">
+ <view class="video-info" :style="{bottom: marginBottom + 20 + 'px'}">
<view>
<text class="video-author">@{{item.authorName}}</text>
</view>
@@ -326,7 +327,8 @@
pageNumber: 1,
pageSize: 10,
videoFrom: 'recommend'
- }
+ },
+ marginBottom: 0 // 搴曢儴瀹夊叏鍖哄煙
}
},
onShow() {
@@ -348,6 +350,7 @@
this.startHidenTime = Date.now()
},
onLoad(option) {
+ this.marginBottom = uni.getSystemInfoSync().safeAreaInsets.bottom
const token = storage.getAccessToken();
if (! token) {
this.wxSilentLogin(() => {
--
Gitblit v1.8.0