From 538e4f454ba3126ef92278ab9cb675adb9e3b287 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 27 三月 2025 09:30:55 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.3
---
apps/taro/src/stores/modules/system.ts | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/apps/taro/src/stores/modules/system.ts b/apps/taro/src/stores/modules/system.ts
index 8c5572f..65d531c 100644
--- a/apps/taro/src/stores/modules/system.ts
+++ b/apps/taro/src/stores/modules/system.ts
@@ -85,20 +85,24 @@
},
setNavigationBarHeight(systemInfo: Taro.getSystemInfoSync.Result) {
- const { right, height, width, top } = Taro.getMenuButtonBoundingClientRect();
+ try {
+ if (!isWeb) {
+ const { right, height, width, top } = Taro.getMenuButtonBoundingClientRect();
- let navigationBarHeight = 0;
+ this.menuButtonHeight = height;
+ this.menuButtonWidth = width;
+ this.menuButtonTop = top;
+ this.menuButtonRightDistance = systemInfo.screenWidth - right;
+ }
+ let navigationBarHeight = 0;
- if (systemInfo.platform === 'android') {
- navigationBarHeight = 48;
- } else {
- navigationBarHeight = 44;
- }
- this.menuButtonHeight = height;
- this.menuButtonWidth = width;
- this.menuButtonTop = top;
- this.menuButtonRightDistance = systemInfo.screenWidth - right;
- this.navigationBarHeight = navigationBarHeight;
+ if (systemInfo.platform === 'android') {
+ navigationBarHeight = 48;
+ } else {
+ navigationBarHeight = 44;
+ }
+ this.navigationBarHeight = navigationBarHeight;
+ } catch (error) {}
},
setTabIndex(tabIndex: number) {
--
Gitblit v1.9.1