From 7e6ac79baa48aa30a98e5343e013a9120f3dabae Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 03 七月 2025 16:28:06 +0800
Subject: [PATCH] update 移除商店中的商品显示 修改神厨页面
---
pages/product/shopPage.vue | 12 +++---
pages/kitchen/KitchenVideo.vue | 76 ++++++++++++++++++++++++++++++++++----
pages.json | 3 -
uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue | 4 -
4 files changed, 76 insertions(+), 19 deletions(-)
diff --git a/pages.json b/pages.json
index 99b0f4d..a071262 100644
--- a/pages.json
+++ b/pages.json
@@ -836,8 +836,7 @@
{
"path": "shopPage",
"style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom"
+ "navigationBarTitleText": ""
}
},
{
diff --git a/pages/kitchen/KitchenVideo.vue b/pages/kitchen/KitchenVideo.vue
index 8bafd83..0017aaf 100644
--- a/pages/kitchen/KitchenVideo.vue
+++ b/pages/kitchen/KitchenVideo.vue
@@ -1,5 +1,15 @@
<template>
<view class="video-container">
+ <view class="choosePlatType" :style="{top: menueButton + 'px'}">
+ <view class="platTypeItem" v-for="item in choosePlat" :key="item.type" @click="chooseType=item.type">
+ <view class="platTypeItenName">
+ {{item.name}}
+ </view>
+ <view class="platTypeItemChoose" v-if="chooseType===item.type" >
+ </view>
+ </view>
+
+ </view>
<!-- 瑙嗛鍔犺浇 -->
<zero-loading v-show="videoLoading" type="circle" color="#0ebd57" text=""></zero-loading>
<view class="showLeft" @click="showDrawer('showLeft')" v-if="!showLeft" :style="{top: buttonHeight+'px'}">
@@ -242,7 +252,7 @@
</view>
</view>
</uni-popup>
- <uni-drawer ref="showLeft" mode="left" width="120" :cus-style="true" height="80vh"
+ <uni-drawer v-if="leftHeight" ref="showLeft" mode="left" width="120" :cus-style="true" :height="`${leftHeight}px`"
@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}"
@@ -280,6 +290,13 @@
},
data() {
return {
+ choosePlat:[
+ {type:'platForm',name:'骞冲彴'},
+ {type:'custom',name:'鐢ㄦ埛'}
+ ],
+ chooseType:'platForm',
+ leftHeight:null,
+ menueButton:0,
buttonHeight:0,
showLeft:false,
currentCategort: '',
@@ -358,7 +375,7 @@
}
},
onShow() {
- this.showDrawer('showLeft')
+ // this.showDrawer('showLeft')
this.loadVideos()
// 濡傛灉瑙嗛鎸変笅鏆傚仠鍚庡垏鎹㈤〉闈㈠啀鍥炲埌椤甸潰鏃讹紝鍙畻鏆傚仠鏃堕棿锛堝洜涓烘殏鍋滄椂闂村拰绂诲紑椤甸潰鏃堕棿鏄噸澶嶇殑锛屽彧绠椾竴涓級
if (this.startHidenTime !== 0 && this.currentVideoIsPlaying) {
@@ -370,10 +387,18 @@
this.startHidenTime = Date.now()
},
onLoad() {
- this.marginBottom = uni.getSystemInfoSync().safeAreaInsets.bottom
- // 鑾峰彇鐘舵�佹爮楂樺害
- const systemInfo = uni.getSystemInfoSync();
- this.buttonHeight = systemInfo.statusBarHeight;
+ this.marginBottom = uni.getSystemInfoSync().safeAreaInsets.bottom
+ // 鑾峰彇鐘舵�佹爮楂樺害
+ const systemInfo = uni.getSystemInfoSync();
+ console.log('systemInfo------------------------>',systemInfo.windowHeight)
+ const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+ console.log('menuButtonInfo--------------------------->',menuButtonInfo)
+ const {top,height} = menuButtonInfo
+ this.buttonHeight = systemInfo.statusBarHeight+height;
+ this.menueButton = top;
+ console.log('systemInfo.safeAreaInsets.bottom>',systemInfo.safeAreaInsets.bottom)
+ this.leftHeight = systemInfo.windowHeight - top -50 - systemInfo.safeAreaInsets.bottom -22;
+ console.log('-------------leftHeight------------------------>',this.leftHeight)
this.getKitchenTypeList();
this.loadVideos();
},
@@ -954,7 +979,42 @@
::v-deep .custom-tabbar {
border-top: none !important;
}
-
+.choosePlatType{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: fixed;
+ z-index: 9999;
+ left: 0;
+ right: 0;
+
+}
+.platTypeItem{
+ width: 80rpx;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ height: 60rpx;
+
+}
+.platTypeItem:nth-child(n+1){
+ margin-left: 32rpx;
+}
+.platTypeItemChoose{
+ margin-top: 15rpx;
+ width: 40%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background-color: #fff;
+ height: 4rpx;
+ border-radius: 5rpx;
+}
+.platTypeItenName{
+ color: #fff;
+ font-weight: bold;
+ font-size: 32rpx;
+}
.video-container {
position: relative;
width: 100%;
@@ -970,7 +1030,7 @@
background-color: #b6b6b6;
opacity: 0.8;
position: fixed;
- z-index: 999;
+ z-index: 99999;
height: 70rpx;
width: 50rpx;
border-radius: 0 50% 50% 0;
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 9269be2..f7774bc 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -81,29 +81,29 @@
</scroll-view>
<!-- 鍩虹搴楅摵妯″紡 -->
- <div v-if="basePageData">
+<!-- <div v-if="basePageData">
<u-tabs :list="tabs" :active-color="mainColor" :is-scroll="false" :current="current" @change="changeTab"></u-tabs>
<div class="content" v-if="current == 0">
<u-empty style='margin-top:100rpx' v-if="goodsList.length == 0" class="empty" text='鏆傛棤鍟嗗搧淇℃伅'></u-empty>
<goodsTemplate style="width:100%;" v-else :res="goodsList" :storeName="false" />
- </div>
+ </div> -->
<!-- 鍏ㄩ儴鍒嗙被 -->
- <div class="category" v-if="current == 1">
+<!-- <div class="category" v-if="current == 1">
<div class="category-item" v-for="(item,index) in categoryList" :key="index">
<div class="flex" @click="getCategoryGoodsList(item)">
<div>{{item.labelName}}</div>
<div>
<u-icon color="#999" name="arrow-right"></u-icon>
</div>
- </div>
+ </div> -->
<!-- 鍒嗙被瀛愮骇 -->
- <div class="child-list" v-if="item.children && item.children.length!=0">
+<!-- <div class="child-list" v-if="item.children && item.children.length!=0">
<div class="child" @click="getCategoryGoodsList(child)" :key='i' v-for="(child,i) in item.children">{{child.labelName}}
</div>
</div>
</div>
</div>
- </div>
+ </div> -->
<!-- 妤煎眰瑁呬慨妯″紡 -->
<div v-if="enablePageData">
diff --git a/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
index 61baab5..a520e4a 100644
--- a/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
+++ b/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.vue
@@ -90,15 +90,13 @@
watchTimer: null,
drawerWidth: 220,
drawerHeight: null,
- drawerTop:0
}
},
created() {
// #ifndef APP-NVUE
this.drawerWidth = this.width
this.drawerHeight = this.height
- this.drawerTop = this.drawerTop
- console.log("鎵ц浜�",this.drawerHeight,this.height)
+ console.log("鎵ц浜�",this.width,this.height)
// #endif
this.rightMode = this.mode === 'right'
},
--
Gitblit v1.8.0