111

common/nav-calc-utils.js

@@ -14,6 +14,9 @@ function navParams() {
 		unit: 'px'
 	}
 
+	// 同步获取信息
+	let info = uni.getSystemInfoSync();
+
 	// 获取胶囊高度
 	// 以下示例数据都 来自 iPhoneX 75%大小的微信模拟器
 	// #ifdef MP-WEIXIN
@@ -37,11 +40,11 @@ function navParams() {
 	let navPaddingRight = menuButton.width + menuButtonHorizontalPadding * 2
 
 	params.unit = 'rpx'
-	params.navHeightPx = navHeight + params.unit
-	params.statusBarHeightPx = statusBarHeight + params.unit
-	params.navUseHeightPx = navMaxUseHeight + params.unit
-	params.navVerticalPaddingPx = menuButtonVerticalPadding + params.unit
-	params.navPaddingRightPx = navPaddingRight + params.unit
+	params.navHeight = navHeight + params.unit
+	params.statusBarHeight = statusBarHeight + params.unit
+	params.navUseHeight = navMaxUseHeight + params.unit
+	params.navVerticalPadding = menuButtonVerticalPadding + params.unit
+	params.navPaddingRight = navPaddingRight + params.unit
 	// #endif
 
 	return params