diff --git a/App.uvue b/App.uvue index cc8f6f83912044e77de08d461c63d058adf9c3f6..2666e1ef49f7d1c94cb03363dcfd9f2f5c7ef936 100644 --- a/App.uvue +++ b/App.uvue @@ -139,10 +139,5 @@ .uni-top-window uni-tabbar .uni-tabbar { background-color: #fff !important; } - - .uni-app--showleftwindow .uni-page-head-btn { - display: none !important; - } - /* #endif */ diff --git a/pages/tabBar/API.uvue b/pages/tabBar/API.uvue index 00f66ca9be5771dfa1ad54fd65f83a360831ac87..9bf40b06a469039e102b27fafbea9bc724ddbd06 100644 --- a/pages/tabBar/API.uvue +++ b/pages/tabBar/API.uvue @@ -74,8 +74,12 @@ goPage(url : string) { if (url == '/set-tab-bar') { this.showPop() - } else { - uni.navigateTo({ url }) + } else { + if(this.hasLeftWin) { + uni.reLaunch({ url }) + } else { + uni.navigateTo({ url }) + } } }, showPop: function () { diff --git a/pages/tabBar/CSS.uvue b/pages/tabBar/CSS.uvue index ec2589b7140933e071306acd0c3b594b8d35bfad..63343d89e514aad950ba5a8dae1cb42fdc8013e8 100644 --- a/pages/tabBar/CSS.uvue +++ b/pages/tabBar/CSS.uvue @@ -66,8 +66,12 @@ } }, methods: { - goPage(url : string) { - uni.navigateTo({ url }) + goPage(url : string) { + if(this.hasLeftWin) { + uni.reLaunch({ url }) + } else { + uni.navigateTo({ url }) + } }, }, // #ifdef WEB diff --git a/pages/tabBar/component.uvue b/pages/tabBar/component.uvue index 306e66d6e77ac98a7b758250748de2f497669134..431373a286667e3201d4ceb75d8a7cfbeb58fe56 100644 --- a/pages/tabBar/component.uvue +++ b/pages/tabBar/component.uvue @@ -74,8 +74,12 @@ } }, methods: { - goPage(url : string) { - uni.navigateTo({ url }) + goPage(url : string) { + if(this.hasLeftWin) { + uni.reLaunch({ url }) + } else { + uni.navigateTo({ url }) + } }, // #ifdef UNI-APP-X && APP upgradePopupShow() { diff --git a/pages/tabBar/template.uvue b/pages/tabBar/template.uvue index 422f1759c256b4e86aec0b78f50cb091a9fb2db8..3a3208a448e9f5c7bd8f11ca6368d3487ae6ec5f 100644 --- a/pages/tabBar/template.uvue +++ b/pages/tabBar/template.uvue @@ -262,10 +262,12 @@ const url = e.url.indexOf('platform') > -1 ? e.url - : `/pages/template/${e.url}/${e.url}` - uni.navigateTo({ - url, - }) + : `/pages/template/${e.url}/${e.url}` + if(this.hasLeftWin) { + uni.reLaunch({ url }) + } else { + uni.navigateTo({ url }) + } }, }, // #ifdef WEB