From c0005d06e538782aad901b337c9d3c4f5235f1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A3=AE?= Date: Sun, 10 May 2020 16:37:16 +0800 Subject: [PATCH 1/2] feat(NavBar): support custom-style --- packages/nav-bar/index.ts | 6 ++++++ packages/nav-bar/index.wxml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/nav-bar/index.ts b/packages/nav-bar/index.ts index 82225680..3386e2f2 100644 --- a/packages/nav-bar/index.ts +++ b/packages/nav-bar/index.ts @@ -15,6 +15,7 @@ VantComponent({ }, leftText: String, rightText: String, + customStyle: String, leftArrow: Boolean, border: { type: Boolean, @@ -33,13 +34,18 @@ VantComponent({ data: { statusBarHeight: 0, height: 44, + baseStyle: '', }, created() { const { statusBarHeight } = wx.getSystemInfoSync(); + const { safeAreaInsetTop, zIndex } = this.data; + const paddingTop = safeAreaInsetTop ? statusBarHeight : 0; + const baseStyle = `z-index: ${zIndex};padding-top: ${paddingTop}px;`; this.setData({ statusBarHeight, height: 44 + statusBarHeight, + baseStyle }); }, diff --git a/packages/nav-bar/index.wxml b/packages/nav-bar/index.wxml index 9bc58bcb..941bf563 100644 --- a/packages/nav-bar/index.wxml +++ b/packages/nav-bar/index.wxml @@ -4,7 +4,7 @@ From 01eec35569d6dae08c2c8bcf7a0ac2358ccb3559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A3=AE?= Date: Sun, 10 May 2020 17:05:00 +0800 Subject: [PATCH 2/2] feat(NavBar): add doc --- packages/nav-bar/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/nav-bar/README.md b/packages/nav-bar/README.md index a62fecc2..8550acfb 100644 --- a/packages/nav-bar/README.md +++ b/packages/nav-bar/README.md @@ -60,6 +60,7 @@ Page({ | placeholder | 固定在顶部时是否开启占位 | _boolean_ | `false` | - | | border | 是否显示下边框 | _boolean_ | `true` | - | | z-index | 元素 z-index | _number_ | `1` | - | +| custom-style | 自定义样式 | _string_ | - | - | | safe-area-inset-top | 是否留出顶部安全距离(状态栏高度) | _boolean_ | `true` | - | ### Slot