From e8e0f55bff0fcc8896a08ab96759671ddff4f1be Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Wed, 31 Jul 2019 14:24:01 +0800
Subject: [PATCH] refactor isTabBarPage

---
 src/platforms/app-plus/service/api/util.js | 29 +++-------------------
 src/platforms/app-plus/service/bridge.js   | 25 +++++++++++++++++++
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/platforms/app-plus/service/api/util.js b/src/platforms/app-plus/service/api/util.js
index 2ee4b79f3..e6221cfbf 100644
--- a/src/platforms/app-plus/service/api/util.js
+++ b/src/platforms/app-plus/service/api/util.js
@@ -1,3 +1,7 @@
+export {
+  isTabBarPage
+} from '../bridge'
+
 export function callApiSync (api, args, name, alias) {
   const ret = api(args)
   if (ret && ret.errMsg) {
@@ -19,31 +23,6 @@ export function getLastWebview () {
   }
 }
 
-export function isTabBarPage (path = '') {
-  if (!(__uniConfig.tabBar && Array.isArray(__uniConfig.tabBar.list))) {
-    return false
-  }
-  try {
-    if (!path) {
-      const pages = getCurrentPages()
-      if (!pages.length) {
-        return false
-      }
-      const page = pages[pages.length - 1]
-      if (!page) {
-        return false
-      }
-      return page.$page.meta.isTabBar
-    }
-    return __uniRoutes.find(route => route.path === path).meta.isTabBar
-  } catch (e) {
-    if (process.env.NODE_ENV !== 'production') {
-      console.log('getCurrentPages is not ready')
-    }
-  }
-  return false
-}
-
 const getRealRoute = (e, t) => {
   if (t.indexOf('./') === 0) return getRealRoute(e, t.substr(2), !1)
   let n
diff --git a/src/platforms/app-plus/service/bridge.js b/src/platforms/app-plus/service/bridge.js
index ae41b4850..917bc07fb 100644
--- a/src/platforms/app-plus/service/bridge.js
+++ b/src/platforms/app-plus/service/bridge.js
@@ -37,3 +37,28 @@ export function setStatusBarStyle (statusBarStyle) {
 
   plus.navigator.setStatusBarStyle(statusBarStyle)
 }
+
+export function isTabBarPage (path = '') {
+  if (!(__uniConfig.tabBar && Array.isArray(__uniConfig.tabBar.list))) {
+    return false
+  }
+  try {
+    if (!path) {
+      const pages = getCurrentPages()
+      if (!pages.length) {
+        return false
+      }
+      const page = pages[pages.length - 1]
+      if (!page) {
+        return false
+      }
+      return page.$page.meta.isTabBar
+    }
+    return __uniRoutes.find(route => route.path === path).meta.isTabBar
+  } catch (e) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.log('getCurrentPages is not ready')
+    }
+  }
+  return false
+}
-- 
GitLab