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/kitchen/KitchenVideo.vue | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/pages/kitchen/KitchenVideo.vue b/pages/kitchen/KitchenVideo.vue
index adb9b71..0223187 100644
--- a/pages/kitchen/KitchenVideo.vue
+++ b/pages/kitchen/KitchenVideo.vue
@@ -2,7 +2,7 @@
<view class="video-container">
<!-- 瑙嗛鍔犺浇 -->
<zero-loading v-show="videoLoading" type="circle" color="#0ebd57" text=""></zero-loading>
- <view class="showLeft" @click="showDrawer('showLeft')" v-if="!showLeft">
+ <view class="showLeft" @click="showDrawer('showLeft')" v-if="!showLeft" :style="{top: buttonHeight+'px'}">
<uni-icons type="right" size="30"></uni-icons>
</view>
<!-- 瑙嗛鍒楄〃 -->
@@ -39,7 +39,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"
@@ -56,6 +56,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 }">
@@ -121,7 +122,7 @@
<!-- 瑙嗛淇℃伅灞� -->
- <view class="video-info">
+ <view class="video-info" :style="{bottom: marginBottom + 20 + 'px'}">
<view>
<text class="video-author">@{{item.authorName}}</text>
</view>
@@ -237,8 +238,8 @@
</view>
</view>
</uni-popup>
- <uni-drawer ref="showLeft" mode="left" width="120" :cus-style="true" height="93vh"
- @change="change($event,'showLeft')" class="navigationLeft">
+ <uni-drawer ref="showLeft" mode="left" width="120" :cus-style="true" height="80vh"
+ @change="change($event,'showLeft')" class="navigationLeft" :drawerTop="buttonHeight">
<scroll-view class="typeNavigation" :scroll-y="true" :show-scrollbar="false">
<view class="typeNavigationItem" :class="{typeNavigationItemCheck:currentCategort ==item.id}"
@click="chooseCategory(item.id)" v-for="item in categoryList" :key="item.id">
@@ -247,6 +248,8 @@
</scroll-view>
</uni-drawer>
<view v-if="videoList.length===0" style="display: flex;align-items: center;justify-content: center;background-color: #fff;height: 100%">褰撳墠娌℃湁鍙互鏌ョ湅鐨勮棰�</view>
+
+ <custom-tabbar bgColor="#ffffff" selected="kitchen"></custom-tabbar>
</view>
</template>
@@ -272,6 +275,7 @@
},
data() {
return {
+ buttonHeight:0,
showLeft:false,
currentCategort: '',
categoryList: [],
@@ -346,7 +350,8 @@
pageSize: 6,
videoFrom: 'recommend',
videoType: 'cook'
- }
+ },
+ marginBottom: 0 // 搴曢儴瀹夊叏鍖哄煙
}
},
onShow() {
@@ -362,8 +367,12 @@
this.startHidenTime = Date.now()
},
onLoad() {
- this.getKitchenTypeList();
- this.loadVideos();
+ this.marginBottom = uni.getSystemInfoSync().safeAreaInsets.bottom
+ // 鑾峰彇鐘舵�佹爮楂樺害
+ const systemInfo = uni.getSystemInfoSync();
+ this.buttonHeight = systemInfo.statusBarHeight;
+ this.getKitchenTypeList();
+ this.loadVideos();
},
onReady() {
// 鍒濆鍖栬棰戜笂涓嬫枃
@@ -937,7 +946,6 @@
.showLeft {
display: flex;
- top: 50rpx;
left: 0;
align-items: center;
justify-content: flex-start;
@@ -958,7 +966,6 @@
.video-item {
width: 100%;
height: 100%;
- object-fit: cover;
}
.play-icon {
@@ -1405,18 +1412,18 @@
}
.typeNavigationItem {
- padding: 24rpx;
- font-size: 28rpx;
- color: black;
- margin-top: 10rpx;
- border-radius: 12rpx;
- border: 1rpx solid gray;
+ padding: 24rpx;
+ font-size: 28rpx;
+ color: black;
+ margin-top: 10rpx;
}
+
.typeNavigationItemCheck {
- background-color: #42b993;
- color: #fff;
- border: 0;
+ color: #ef321e;
+ font-size: 32rpx;
+ font-weight: bold;
+ border: 0;
}
.container ::v-deep .navigationLeft .uni-drawer__content {
--
Gitblit v1.8.0