diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue index a3ffff5..c0e603f 100644 --- a/components/tabbar/tabbar.vue +++ b/components/tabbar/tabbar.vue @@ -36,16 +36,16 @@ "iconPath": require("@/static/icon1.png"), "selectedIconPath": require("@/static/icon1-cur.png") }, - { - id: 1, - centerItem: false, - width: 72, - height: 65, - "text": "抗战", - "pagePath": "/pages/line/war", - "iconPath": require("@/static/icon5.png"), - "selectedIconPath": require("@/static/icon5-cur.png") - }, + // { + // id: 1, + // centerItem: false, + // width: 72, + // height: 65, + // "text": "抗战", + // "pagePath": "/pages/line/war", + // "iconPath": require("@/static/icon5.png"), + // "selectedIconPath": require("@/static/icon5-cur.png") + // }, { id: 2, centerItem: false, diff --git a/pages.json b/pages.json index c0288e8..ef39e51 100644 --- a/pages.json +++ b/pages.json @@ -17,12 +17,14 @@ "style": { "navigationStyle": "custom" } - }, { - "path": "pages/line/war", - "style": { - "navigationStyle": "custom" - } - }, { + }, + // { + // "path": "pages/line/war", + // "style": { + // "navigationStyle": "custom" + // } + // }, + { "path": "pages/book/index", "style": { "navigationStyle": "custom" @@ -99,12 +101,12 @@ "iconPath": "/static/icon1.png", "selectedIconPath": "/static/icon1-cur.png" }, - { - "text": "抗战", - "pagePath": "pages/line/war", - "iconPath": "/static/icon5.png", - "selectedIconPath": "/static/icon5-cur.png" - }, + // { + // "text": "抗战", + // "pagePath": "pages/line/war", + // "iconPath": "/static/icon5.png", + // "selectedIconPath": "/static/icon5-cur.png" + // }, { "text": "书房", "pagePath": "pages/book/house", diff --git a/pages/index/index.vue b/pages/index/index.vue index 361b0a6..84f57cd 100644 --- a/pages/index/index.vue +++ b/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(() => { - // if (this.progressPercentage < 100) { - // this.progressPercentage++; - // } else { - // clearInterval(this.interval); - // this.showBtn = true - // } - - // }, 30); + this.interval = setInterval(() => { + if (this.progressPercentage < 100) { + this.progressPercentage++; + } else { + clearInterval(this.interval); + this.showBtn = true + } + + }, 30); }, }, }