From 0b56f3b787131de650e9e3eb9f62ed29ff1985cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BA=9A=E7=90=AA?= <wangyaqi988@163.com>
Date: Sat, 3 Aug 2024 15:11:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=BD=E5=B1=8F?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=A1=B6=E9=83=A8=E8=BF=94=E5=9B=9E=E7=AE=AD?=
 =?UTF-8?q?=E5=A4=B4=E9=94=99=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.uvue                    |  5 -----
 pages/tabBar/API.uvue       |  8 ++++++--
 pages/tabBar/CSS.uvue       |  8 ++++++--
 pages/tabBar/component.uvue |  8 ++++++--
 pages/tabBar/template.uvue  | 10 ++++++----
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/App.uvue b/App.uvue
index cc8f6f83..2666e1ef 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 */
 </style>
diff --git a/pages/tabBar/API.uvue b/pages/tabBar/API.uvue
index 00f66ca9..9bf40b06 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 ec2589b7..63343d89 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 306e66d6..431373a2 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 422f1759..3a3208a4 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
-- 
GitLab