update

pages.json

@@ -1196,21 +1196,20 @@
 	"globalStyle": {
 		"pageOrientation": "portrait",
 		"navigationBarTitleText": "Hello uniapp",
-		// #ifndef H5
 		"navigationBarTextStyle": "white",
 		"navigationBarBackgroundColor": "#007AFF",
-		// #endif
-		// #ifdef  H5
-		"navigationBarTextStyle": "black",
-		"navigationBarBackgroundColor": "#F1F1F1",
-		// #endif
 		"backgroundColor": "#F8F8F8",
 		"backgroundColorTop": "#F4F5F6",
 		"backgroundColorBottom": "#F4F5F6",
 		"mp-360": {
 			"navigationStyle": "custom"
 		},
-		"maxWidth": 1190
+		"h5": {
+			"maxWidth": 1190,
+			"navigationBarTextStyle": "black",
+			"navigationBarBackgroundColor": "#F1F1F1"
+		}
+
 	},
 	"tabBar": {
 		"color": "#7A7E83",

windows/left-window.vue

@@ -51,26 +51,28 @@
 			},
 			$route: {
 				immediate: true,
-				handler(newRoute) {
-					if (newRoute.path === '/') {
-						uni.redirectTo({
-							url: 'pages/component/view/view'
-						})
-					} else if (!newRoute.matched.length) {
-						uni.redirectTo({
-							url: 'pages/error/404'
-						})
-					} else {
-						let active = newRoute.path.split('/')[2]
-						if (this.nav.includes(active)) {
-							if (active === 'component') {
-								active = 'componentPage'
+				handler(newRoute) {
+					if (this.matchLeftWindow) {
+						if (newRoute.path === '/') {
+							uni.redirectTo({
+								url: 'pages/component/view/view'
+							})
+						} else if (!newRoute.matched.length) {
+							uni.redirectTo({
+								url: 'pages/error/404'
+							})
+						} else {
+							let active = newRoute.path.split('/')[2]
+							if (this.nav.includes(active)) {
+								if (active === 'component') {
+									active = 'componentPage'
+								}
+								if (active === 'template') {
+									active = 'templatePage'
+								}
+								this.setActive(active)
 							}
-							if (active === 'template') {
-								active = 'templatePage'
-							}
-							this.setActive(active)
-						}
+						}
 					}
 				}
 			}

windows/top-window.vue

@@ -86,7 +86,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style>
 	.top-window-header {
 		height: 60px;
 		padding: 0 15px;
@@ -104,15 +104,13 @@
 		flex-direction: row;
 		align-items: center;
 		flex: 1;
-
-		image {
-			height: 30px;
-			width: 30px;
-		}
-
-		text {
-			margin-left: 8px;
-		}
+	}
+	.logo image {
+		height: 30px;
+		width: 30px;
+	}
+	.logo text {
+		margin-left: 8px;
 	}
 	.right-header {
 		display: flex;
@@ -130,7 +128,6 @@
 		border-bottom: 2px solid;
 	}
 	.tab-bar-flex {
-		// flex: 1;
 		width: 360px;
 	}
 	.phone-link {