1111

common/nav-calc-utils.js

@@ -1,12 +1,12 @@
 function navParams() {
 
 	let params = {
-		// 胶囊(true)
+		// 是否支持自定义导航栏(小程序 pc版 false)
+		supportCustomBar: true,
+		// 胶囊
 		menuButton: {
 			width: 0,
-			height: 0,
-			// 原生导航栏是否禁止移除
-			nativeNavNoRemove: true
+			height: 0
 		},
 		// 导航栏
 		// 可自定义，wx小程序会强制更改
@@ -51,36 +51,24 @@ function navParams() {
 	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') {
-		// 胶囊windows返回的貌似不对
-		// 所以 padding realNavHeight 都自己设置
-		paddingTop = 5;
-		paddingBottom = 5;
-		realNavHeight = 32
-		params.navBar.fontSize = 14;
-		params.navBar.style = 'center';
+		params.menuButton.supportCustomBar = false;
 	} else {
-		// Harmony,Android
+		// 未测试
 		paddingBottom = paddingTop;
 		params.navBar.fontSize = 17;
 		params.navBar.style = 'left';
-		// windows、macos 未测试
+		// macos 未测试
 	}
-	// params.navBar.paddingRight = params.window.width - menuButton.right;
-	params.navBar.height = realNavHeight + paddingTop + paddingBottom;
+	params.navBar.height = params.menuButton.height + paddingTop + paddingBottom;
 	// 导航栏可用宽度 屏幕左边界到胶囊左边界
 	params.navBar.enableWidth = menuButton.left;
 	params.navBar.disableWidth = params.window.width - params.navBar.enableWidth;