diff --git a/common/nav-calc-utils.js b/common/nav-calc-utils.js index f97af61..d8169e6 100644 --- a/common/nav-calc-utils.js +++ b/common/nav-calc-utils.js @@ -9,13 +9,7 @@ function navParams() { // 导航栏 // 可自定义,wx小程序会强制更改 navBar: { - // wx小程序是胶囊距离状态栏的距离 - paddingTop: 0, - // wx小程序是paddingTop*2 - paddingBottom: 0, height: 0, - // 导航栏可用高度 高度-内边距 - enableHeight: 0, // 导航栏字体大小 wx小程序 ios:13,Android:17 fontSize: 0, // 导航栏样式 wx小程序时:ios:center,Android:left @@ -57,24 +51,24 @@ function navParams() { let menuButton = uni.getMenuButtonBoundingClientRect(); params.menuButton.width = menuButton.width; params.menuButton.height = menuButton.height; - params.navBar.paddingTop = menuButton.top - params.statusBarHeight; + let paddingTop = menuButton.top - params.statusBarHeight; + let paddingBottom = 0; if (params.os.osName === 'ios') { - params.navBar.paddingBottom = params.navBar.paddingTop * 2; + paddingBottom = paddingTop * 2; params.navBar.fontSize = 13; params.navBar.style = 'center'; } else { // Harmony,Android - params.navBar.paddingBottom = params.navBar.paddingTop; + paddingBottom = paddingTop; params.navBar.fontSize = 17; params.navBar.style = 'left'; // windows、macos 未测试 } // params.navBar.paddingRight = params.window.width - menuButton.right; - params.navBar.height = params.menuButton.height + params.navBar.paddingTop + params.navBar.paddingBottom; + params.navBar.height = params.menuButton.height + paddingTop + paddingBottom; // 导航栏可用宽度 屏幕左边界到胶囊左边界 params.navBar.enableWidth = menuButton.left; params.navBar.disableWidth = params.window.width - params.navBar.enableWidth; - params.navBar.enableHeight = params.navBar.height - params.navBar.paddingTop - params.navBar.paddingBottom; // #endif params.navStatusHeight = params.statusBarHeight + params.navBar.height