From 7673b8272cfd9fc21161b70e35c263e455b59966 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 27 六月 2025 10:57:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/kitchen/KitchenVideo.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pages/kitchen/KitchenVideo.vue b/pages/kitchen/KitchenVideo.vue
index adb9b71..327a597 100644
--- a/pages/kitchen/KitchenVideo.vue
+++ b/pages/kitchen/KitchenVideo.vue
@@ -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"
@@ -237,7 +237,7 @@
</view>
</view>
</uni-popup>
- <uni-drawer ref="showLeft" mode="left" width="120" :cus-style="true" height="93vh"
+ <uni-drawer ref="showLeft" mode="left" width="120" :cus-style="true" height="80vh"
@change="change($event,'showLeft')" class="navigationLeft">
<scroll-view class="typeNavigation" :scroll-y="true" :show-scrollbar="false">
<view class="typeNavigationItem" :class="{typeNavigationItemCheck:currentCategort ==item.id}"
@@ -247,6 +247,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>
--
Gitblit v1.8.0