diff --git a/common/nav-calc-utils.js b/common/nav-calc-utils.js index 04c193c..8716681 100644 --- a/common/nav-calc-utils.js +++ b/common/nav-calc-utils.js @@ -5,8 +5,8 @@ function navParams() { menuButton: { width: 0, height: 0, - // 原生导航栏是否支持移除 - nativeNavCanRemove: true + // 原生导航栏是否禁止移除 + nativeNavNoRemove: true }, // 导航栏 // 可自定义,wx小程序会强制更改 @@ -45,29 +45,33 @@ function navParams() { params.os.osName = info.osName // 获取胶囊相关内容 - // 以下示例数据都 来自 iPhoneX 7nWidth - - // 获取胶囊相关内容 - // 以下示例数据都 来自 iPhoneX 75%大小的微信模拟器 // #ifdef MP-WEIXIN let menuButton = uni.getMenuButtonBoundingClientRect(); params.menuButton.width = menuButton.width; params.menuButton.height = menuButton.height; let paddingTop = menuButton.top - params.statusBarHeight; let paddingBottom = 0; + let realNavHeight = 0 if (params.os.osName === 'ios') { paddingBottom = paddingTop * 2; + realNavHeight = params.menuButton.height; params.navBar.fontSize = 13; params.navBar.style = 'center'; + params.menuButton.nativeNavNoRemove = false; } else if (params.os.osName === 'android') { paddingBottom = paddingTop; + realNavHeight = params.menuButton.height; params.navBar.fontSize = 17; params.navBar.style = 'left'; + params.menuButton.nativeNavNoRemove = false; } else if (params.os.osName === 'windows') { - paddingBottom = paddingTop; - params.navBar.fontSize = 17; + // 胶囊windows返回的貌似不对 + // 所以 padding realNavHeight 都自己设置 + paddingTop = 5; + paddingBottom = 5; + realNavHeight = 32 + params.navBar.fontSize = 14; params.navBar.style = 'center'; - params.menuButton.nativeNavCanRemove = false; } else { // Harmony,Android paddingBottom = paddingTop; @@ -76,7 +80,7 @@ function navParams() { // windows、macos 未测试 } // params.navBar.paddingRight = params.window.width - menuButton.right; - params.navBar.height = params.menuButton.height + paddingTop + paddingBottom; + params.navBar.height = realNavHeight + paddingTop + paddingBottom; // 导航栏可用宽度 屏幕左边界到胶囊左边界 params.navBar.enableWidth = menuButton.left; params.navBar.disableWidth = params.window.width - params.navBar.enableWidth;