123

ruoyi-ui-app/pages/home/index.vue

@@ -176,14 +176,14 @@ export default {
           iconColor: GRID_ICON,
           url: '/package-a/yak-market/index'
         },
-        {
-          id: 'myStore',
-          titleKey: 'homeGrid.myStore',
-          icon: 'shopping-cart',
-          tone: 'wheat',
-          iconColor: GRID_ICON,
-          url: '/package-a/my-store/index'
-        },
+        // {
+        //   id: 'myStore',
+        //   titleKey: 'homeGrid.myStore',
+        //   icon: 'shopping-cart',
+        //   tone: 'wheat',
+        //   iconColor: GRID_ICON,
+        //   url: '/package-a/my-store/index'
+        // },
         {
           id: 'bookingService',
           titleKey: 'homeGrid.bookingService',

ruoyi-ui-app/utils/tabBar.js

@@ -21,11 +21,32 @@ const TABBAR_API_NAMES = [
   'setTabBarMidButton'
 ]
 
+function readUniTabPagePaths() {
+  try {
+    const list =
+      (typeof __uniConfig !== 'undefined' &&
+        __uniConfig.tabBar &&
+        __uniConfig.tabBar.list) ||
+      []
+    list.forEach((item) => {
+      const path = normalizePageRoute(item.pagePath || '')
+      if (path) {
+        TAB_PAGE_PATHS.add(path)
+      }
+    })
+  } catch (e) {
+    // ignore
+  }
+}
+
 function normalizePageRoute(route) {
   if (!route) {
     return ''
   }
-  let r = String(route).replace(/^\//, '')
+  let r = String(route).split('?')[0].replace(/^\//, '')
+  if (r.endsWith('.html')) {
+    r = r.slice(0, -5)
+  }
   const prefixes = ['bqH5/', 'bqjy/']
   for (const prefix of prefixes) {
     if (r.startsWith(prefix)) {
@@ -35,21 +56,77 @@ function normalizePageRoute(route) {
   return r
 }
 
+function getCurrentPageRoute() {
+  const stack = getCurrentPages()
+  if (!stack.length) {
+    return ''
+  }
+  const cur = stack[stack.length - 1]
+  return cur.route || cur.$page?.route || cur.$page?.fullPath || ''
+}
+
 /**
  * 当前栈顶是否为原生 TabBar 页
  */
 export function isTabBarPage() {
-  const stack = getCurrentPages()
-  if (!stack.length) {
-    return false
+  const route = normalizePageRoute(getCurrentPageRoute())
+  return !!route && TAB_PAGE_PATHS.has(route)
+}
+
+function noopTabBarResult(name) {
+  return { errMsg: `${name}:ok` }
+}
+
+function finishNoopTabBarCall(name, options) {
+  const result = noopTabBarResult(name)
+  if (options && typeof options.success === 'function') {
+    options.success(result)
+  }
+  if (options && typeof options.complete === 'function') {
+    options.complete(result)
+  }
+  return Promise.resolve(result)
+}
+
+/**
+ * H5 生产包中 addInterceptor 偶发拦不住框架内部调用，直接包装 uni API 更稳
+ */
+function wrapTabBarApi(name) {
+  if (typeof uni === 'undefined' || typeof uni[name] !== 'function') {
+    return
+  }
+  const raw = uni[name].bind(uni)
+  uni[name] = function patchedTabBarApi(options) {
+    const opts = options || {}
+    if (!isTabBarPage()) {
+      return finishNoopTabBarCall(name, opts)
+    }
+    try {
+      const ret = raw(opts)
+      if (ret && typeof ret.catch === 'function') {
+        ret.catch((err) => {
+          const msg = err && err.errMsg ? String(err.errMsg) : ''
+          if (msg.includes('TabBar') && msg.includes('fail')) {
+            return
+          }
+          throw err
+        })
+      }
+      return ret
+    } catch (err) {
+      const msg = err && err.errMsg ? String(err.errMsg) : ''
+      if (msg.includes('TabBar') && msg.includes('fail')) {
+        return finishNoopTabBarCall(name, opts)
+      }
+      throw err
+    }
   }
-  const cur = stack[stack.length - 1]
-  const route = normalizePageRoute(cur.route || '')
-  return TAB_PAGE_PATHS.has(route)
 }
 
 function installTabBarApiGuard() {
-  if (typeof uni === 'undefined' || !uni.addInterceptor) {
+  readUniTabPagePaths()
+  TABBAR_API_NAMES.forEach(wrapTabBarApi)
+  if (!uni.addInterceptor) {
     return
   }
   TABBAR_API_NAMES.forEach((name) => {
@@ -77,13 +154,9 @@ export function syncTabBarText(t) {
     return
   }
   TAB_KEYS.forEach((key, index) => {
-    const p = uni.setTabBarItem({
+    uni.setTabBarItem({
       index,
-      text: t(key),
-      fail() {}
+      text: t(key)
     })
-    if (p && typeof p.catch === 'function') {
-      p.catch(() => {})
-    }
   })
 }