去除抗战

components/tabbar/tabbar.vue

@@ -36,16 +36,16 @@
 						"iconPath": require("@/static/icon1.png"),
 						"selectedIconPath": require("@/static/icon1-cur.png")
 					},
-					{
+					// {
-						id: 1,
+					// 	id: 1,
-						centerItem: false,
+					// 	centerItem: false,
-						width: 72,
+					// 	width: 72,
-						height: 65,
+					// 	height: 65,
-						"text": "抗战",
+					// 	"text": "抗战",
-						"pagePath": "/pages/line/war",
+					// 	"pagePath": "/pages/line/war",
-						"iconPath": require("@/static/icon5.png"),
+					// 	"iconPath": require("@/static/icon5.png"),
-						"selectedIconPath": require("@/static/icon5-cur.png")
+					// 	"selectedIconPath": require("@/static/icon5-cur.png")
-					},
+					// },
 					{
 						id: 2,
 						centerItem: false,

pages.json

@@ -17,12 +17,14 @@
 		"style": {
 			"navigationStyle": "custom"
 		}
-	}, {
+	}, 
-		"path": "pages/line/war",
+	// {
-		"style": {
+	// 	"path": "pages/line/war",
-			"navigationStyle": "custom"
+	// 	"style": {
-		}
+	// 		"navigationStyle": "custom"
-	}, {
+	// 	}
+	// }, 
+	{
 		"path": "pages/book/index",
 		"style": {
 			"navigationStyle": "custom"
@@ -99,12 +101,12 @@
 				"iconPath": "/static/icon1.png",
 				"selectedIconPath": "/static/icon1-cur.png"
 			},
-			{
+			// {
-				"text": "抗战",
+			// 	"text": "抗战",
-				"pagePath": "pages/line/war",
+			// 	"pagePath": "pages/line/war",
-				"iconPath": "/static/icon5.png",
+			// 	"iconPath": "/static/icon5.png",
-				"selectedIconPath": "/static/icon5-cur.png"
+			// 	"selectedIconPath": "/static/icon5-cur.png"
-			},
+			// },
 			{
 				"text": "书房",
 				"pagePath": "pages/book/house",

pages/index/index.vue

@@ -42,7 +42,7 @@
 				progressPercentage: 0,
 				interval: null,
 				isShare: false,
-				showBtn: true,
+				showBtn: false,
 				navBarBoxHeight: 0,
 			}
 		},
@@ -63,7 +63,7 @@
 			// #endif
 		},
 		beforeDestroy() {
-			// clearInterval(this.interval);
+			clearInterval(this.interval);
 		},
 		methods: {
 			toHome() {
@@ -72,15 +72,15 @@
 				})
 			},
 			start() {
-				// this.interval = setInterval(() => {
+				this.interval = setInterval(() => {
-				// 	if (this.progressPercentage < 100) {
+					if (this.progressPercentage < 100) {
-				// 		this.progressPercentage++;
+						this.progressPercentage++;
-				// 	} else {
+					} else {
-				// 		clearInterval(this.interval);
+						clearInterval(this.interval);
-				// 		this.showBtn = true
+						this.showBtn = true
-				// 	}
+					}
-
+
-				// }, 30);
+				}, 30);
 			},
 		},
 	}