From 37d6867881ec2f66829ac8f4e098252c6d031628 Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Thu, 21 Apr 2022 21:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=20relaunchForXxx=20=E4=BB=8E=20user.t?=
 =?UTF-8?q?ool.uniapp=20=E4=B8=AD=E8=BF=81=E7=A7=BB=E5=88=B0=20main.js=20?=
 =?UTF-8?q?=E5=B9=B6=E6=94=B9=E4=B8=BA=20=E4=B8=8B=E5=88=92=E7=BA=BF?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 usertool.js | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/usertool.js b/usertool.js
index 5bd3da9..a344316 100644
--- a/usertool.js
+++ b/usertool.js
@@ -541,28 +541,18 @@ export default {
     }, 1000)
   },
 
-  relaunchForAll ({ envar = this.envar || wo?.envar } = {}) {
-    uni.reLaunch({ url: envar?.Start_Page_For_All })
-  },
-  relaunchForOnline ({ envar = this.envar || wo?.envar } = {}) {
-    process.env.NODE_ENV === 'production' && wo.ss.User.onlineUser.uuid && uni.reLaunch({ url: envar?.Start_Page_For_Online })
-  },
-  relaunchForOffline ({ envar = this.envar || wo?.envar } = {}) {
-    process.env.NODE_ENV === 'production' && ! wo.ss.User.onlineUser.uuid && uni.reLaunch({ url: envar?.Start_Page_For_Offline })
-  },
-  // 在手机上跳转到标签页需要 switchTab，在PC上跳转到菜单页需要 navigateTo 或 redirectTo。因此在这里用 gotoPage 和 backtoPage 来弥补差异。
-  navigate_page (pageName, { pagesJson = this.pagesJson || wo?.pagesJson, envar = this.envar || wo?.envar } = {}) {
-    if (! envar?.onPC && pagesJson?.tabBar?.list?.find((item) => item?.pagePath?.substr(6) === pageName)) {
-      uni.switchTab({ url: pageName })
+  // 注意，即使在 PC 上 topWindow 代替了 tabBar 时，从标签页转化而来的菜单页，也是用 switchTab 跳转。
+  goto_page (pageName, { forget = false, pagesJson = this.pagesJson || wo?.pagesJson } = {}) {
+    if (pageName) {
+      if (pagesJson?.tabBar?.list?.find((item) => item?.pagePath?.substr(6) === pageName)) {
+        uni.switchTab({ url: pageName })
+      } else if (forget) {
+        uni.navigateTo({ url: pageName })
+      }else {
+        uni.redirectTo({ url: pageName })
+      }
     } else {
-      uni.navigateTo({ url: pageName })
-    }
-  },
-  redirect_page (pageName, { pagesJson = this.pagesJson || wo?.pagesJson, envar = this.envar || wo?.envar } = {}) {
-    if (! envar?.onPC && pagesJson?.tabBar?.list?.find((item) => item?.pagePath?.substr(6) === pageName)) {
-      uni.switchTab({ url: pageName })
-    } else {
-      uni.redirectTo({ url: pageName })
+      uni.navigateBack()
     }
   },