1111

common/nav-calc-utils.js

@@ -2,15 +2,16 @@ function navParams() {
 
 	let params = {
 		// 导航栏整体高度：状态栏+导航啦
-		navHeightPx: '0px',
+		navHeight: '0px',
 		// 状态栏高度
-		statusBarHeightPx: '0px',
+		statusBarHeight: '0px',
 		// 导航栏可用高度(去除状态栏)
-		navUseHeightPx: '0px',
+		navUseHeight: '0px',
 		// 导航栏垂直内间距
-		navVerticalPaddingPx: '0px',
+		navVerticalPadding: '0px',
 		// 导航栏右内间距
-		navPaddingRightPx: '0px'
+		navPaddingRight: '0px',
+		unit: 'px'
 	}
 
 	// 获取胶囊高度
@@ -35,11 +36,12 @@ function navParams() {
 	// 导航栏paddingRight 101 实际252.5(253)像素
 	let navPaddingRight = menuButton.width + menuButtonHorizontalPadding * 2
 
-	params.navHeightPx = navHeight + 'px'
+	params.unit = 'rpx'
-	params.statusBarHeightPx = statusBarHeight + 'px'
+	params.navHeightPx = navHeight + params.unit
-	params.navUseHeightPx = navMaxUseHeight + 'px'
+	params.statusBarHeightPx = statusBarHeight + params.unit
-	params.navVerticalPaddingPx = menuButtonVerticalPadding + 'px'
+	params.navUseHeightPx = navMaxUseHeight + params.unit
-	params.navPaddingRightPx = navPaddingRight + 'px'
+	params.navVerticalPaddingPx = menuButtonVerticalPadding + params.unit
+	params.navPaddingRightPx = navPaddingRight + params.unit
 	// #endif
 
 	return params