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() } },