From 9bce51f651aad297ef9eb6df832bfdaf1de05d84 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 22 四月 2026 14:27:54 +0800
Subject: [PATCH] 青岛推送
---
node_modules/@dcloudio/uni-ui/lib/uni-nav-bar/uni-nav-bar.vue | 64 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/node_modules/@dcloudio/uni-ui/lib/uni-nav-bar/uni-nav-bar.vue b/node_modules/@dcloudio/uni-ui/lib/uni-nav-bar/uni-nav-bar.vue
index 46806c1..2e0ec96 100644
--- a/node_modules/@dcloudio/uni-ui/lib/uni-nav-bar/uni-nav-bar.vue
+++ b/node_modules/@dcloudio/uni-ui/lib/uni-nav-bar/uni-nav-bar.vue
@@ -1,18 +1,14 @@
<template>
<view class="uni-navbar" :class="{'uni-dark':dark, 'uni-nvue-fixed': fixed}">
- <view class="uni-navbar__content" :class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
- :style="{ 'background-color': themeBgColor, 'border-bottom-color':themeColor }" >
+ <view class="uni-navbar__content" :class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }" :style="{ 'background-color': themeBgColor }">
<status-bar v-if="statusBar" />
- <view :style="{ color: themeColor,backgroundColor: themeBgColor ,height:navbarHeight}"
- class="uni-navbar__header">
- <view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left"
- :style="{width:leftIconWidth}">
+ <view :style="{ color: themeColor,backgroundColor: themeBgColor ,height:navbarHeight,width:showMenuButtonWidth?navWidth+'px':'100%'}" class="uni-navbar__header">
+ <view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left" :style="{width:leftIconWidth}">
<slot name="left">
<view class="uni-navbar__content_view" v-if="leftIcon.length > 0">
<uni-icons :color="themeColor" :type="leftIcon" size="20" />
</view>
- <view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length > 0 }" class="uni-navbar-btn-text"
- v-if="leftText.length">
+ <view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length > 0 }" class="uni-navbar-btn-text" v-if="leftText.length">
<text :style="{ color: themeColor, fontSize: '12px' }">{{ leftText }}</text>
</view>
</slot>
@@ -20,13 +16,11 @@
<view class="uni-navbar__header-container " @tap="onClickTitle">
<slot>
<view class="uni-navbar__header-container-inner" v-if="title.length>0">
- <text class="uni-nav-bar-text uni-ellipsis-1"
- :style="{color: themeColor }">{{ title }}</text>
+ <text class="uni-nav-bar-text uni-ellipsis-1" :style="{color: themeColor }">{{ title }}</text>
</view>
</slot>
</view>
- <view @click="onClickRight" class="uni-navbar__header-btns uni-navbar__header-btns-right"
- :style="{width:rightIconWidth}">
+ <view @click="onClickRight" class="uni-navbar__header-btns uni-navbar__header-btns-right" :style="{width:rightIconWidth}">
<slot name="right">
<view v-if="rightIcon.length">
<uni-icons :color="themeColor" :type="rightIcon" size="22" />
@@ -38,12 +32,10 @@
</view>
</view>
</view>
- <!-- #ifndef APP-NVUE -->
<view class="uni-navbar__placeholder" v-if="fixed">
<status-bar v-if="statusBar" />
<view class="uni-navbar__placeholder-view" :style="{ height:navbarHeight}" />
</view>
- <!-- #endif -->
</view>
</template>
@@ -52,8 +44,8 @@
const getVal = (val) => typeof val === 'number' ? val + 'px' : val;
/**
- *
- *
+ *
+ *
* NavBar 鑷畾涔夊鑸爮
* @description 瀵艰埅鏍忕粍浠讹紝涓昏鐢ㄤ簬澶撮儴瀵艰埅
* @tutorial https://ext.dcloud.net.cn/plugin?id=52
@@ -140,9 +132,18 @@
type: [Number, String],
default: 60
},
+ showMenuButtonWidth: {
+ type: Boolean,
+ default: false
+ },
stat: {
type: [Boolean, String],
default: ''
+ }
+ },
+ data() {
+ return {
+ navWidth: 'auto'
}
},
computed: {
@@ -169,6 +170,21 @@
return this.color || '#333'
},
navbarHeight() {
+ // #ifdef MP-WEIXIN
+ if (this.fixed && this.height === 0) {
+ const menuBtnInfo = uni.getMenuButtonBoundingClientRect()
+ const winInfo = uni.getWindowInfo()
+ const statusHeight = winInfo.statusBarHeight
+ const spaceHeight = menuBtnInfo.top - statusHeight
+ return getVal(menuBtnInfo.height + spaceHeight * 2)
+ }
+ // #endif
+ // #ifndef MP-WEIXIN
+ if (this.fixed && this.height === 0) {
+ return getVal(44)
+ }
+ // #endif
+
return getVal(this.height)
},
leftIconWidth() {
@@ -177,6 +193,15 @@
rightIconWidth() {
return getVal(this.rightWidth)
}
+ },
+ created() {
+ // #ifdef MP-WEIXIN
+ if (this.fixed) {
+ const menuBtnInfo = uni.getMenuButtonBoundingClientRect()
+ this.navWidth = menuBtnInfo.left
+ }
+ // #endif
+
},
mounted() {
if (uni.report && this.stat && this.title !== '') {
@@ -205,6 +230,7 @@
position: sticky;
/* #endif */
}
+
.uni-navbar {
// box-sizing: border-box;
}
@@ -244,13 +270,14 @@
}
.uni-navbar__header {
+ padding: 0 10px;
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
- padding: 0 10px;
flex-direction: row;
height: $nav-height;
font-size: 12px;
+ box-sizing: border-box;
}
.uni-navbar__header-btns {
@@ -311,14 +338,13 @@
// box-sizing: border-box;
}
-
.uni-navbar__placeholder-view {
height: $nav-height;
}
.uni-navbar--fixed {
position: fixed;
- z-index: 99;
+ z-index: 998;
/* #ifdef H5 */
left: var(--window-left);
right: var(--window-right);
--
Gitblit v1.9.3