修改bug

ruoyi-ui-app/App.vue

@@ -1,14 +1,12 @@
 <script>
 import { syncUserOnLaunch } from '@/permission'
-import { installTabBarApiGuard } from '@/utils/tabBar'
 
 export default {
   onLaunch() {
-    installTabBarApiGuard()
     syncUserOnLaunch().catch(() => {})
   },
   onShow() {
-    installTabBarApiGuard()
+    console.log('App Show')
   },
   onHide() {
     console.log('App Hide')

ruoyi-ui-app/main.js

@@ -1,5 +1,5 @@
-import '@/utils/tabBar'
 import './uni.promisify.adaptor'
+import '@/utils/tabBar'
 import App from './App'
 
 // #ifndef VUE3

ruoyi-ui-app/mixins/tabPage.js

@@ -1,4 +1,4 @@
-import { ensureTabBarEntry, installTabBarApiGuard, isTabBarPage, syncTabBarText } from '@/utils/tabBar'
+import { isTabBarPage, syncTabBarText } from '@/utils/tabBar'
 
 /**
  * Tab 子页共用：根节点语言 class、导航标题、底部 tab 文案与 i18n 同步
@@ -19,30 +19,17 @@ export default {
     }
   },
   onShow() {
-    installTabBarApiGuard()
-    const applyTabPageUi = () => {
-      if (!isTabBarPage()) {
-        return
-      }
-      syncTabBarText((k) => this.$t(k))
-      const key = this.navTitleKey
-      if (key) {
-        const p = uni.setNavigationBarTitle({
-          title: this.$t(key)
-        })
-        if (p && typeof p.catch === 'function') {
-          p.catch(() => {})
-        }
-      }
-    }
     if (isTabBarPage()) {
-      applyTabPageUi()
-      return
+      syncTabBarText((k) => this.$t(k))
     }
-    ensureTabBarEntry().then((ok) => {
-      if (ok) {
-        applyTabPageUi()
+    const key = this.navTitleKey
+    if (key) {
+      const p = uni.setNavigationBarTitle({
+        title: this.$t(key)
+      })
+      if (p && typeof p.catch === 'function') {
+        p.catch(() => {})
       }
-    })
+    }
   }
 }

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

@@ -69,7 +69,7 @@ import UIcon from 'uview-plus/components/u-icon/u-icon.vue'
 import UButton from 'uview-plus/components/u-button/u-button.vue'
 import tabPage from '@/mixins/tabPage'
 import { setStoredLocale } from '@/utils/locale'
-import { ensureTabBarEntry, isTabBarPage, syncTabBarText } from '@/utils/tabBar'
+import { isTabBarPage, syncTabBarText } from '@/utils/tabBar'
 import { useUserStore } from '@/store/user'
 
 export default {
@@ -168,27 +168,16 @@ export default {
       this.$i18n.locale = next
       this.layoutKey += 1
       this.$nextTick(() => {
-        const applyLangUi = () => {
-          if (!isTabBarPage()) {
-            return
-          }
-          syncTabBarText((k) => this.$t(k))
-          const p = uni.setNavigationBarTitle({
-            title: this.$t(this.navTitleKey)
-          })
-          if (p && typeof p.catch === 'function') {
-            p.catch(() => {})
-          }
-        }
-        if (isTabBarPage()) {
-          applyLangUi()
+        if (!isTabBarPage()) {
           return
         }
-        ensureTabBarEntry().then((ok) => {
-          if (ok) {
-            applyLangUi()
-          }
+        syncTabBarText((k) => this.$t(k))
+        const p = uni.setNavigationBarTitle({
+          title: this.$t(this.navTitleKey)
         })
+        if (p && typeof p.catch === 'function') {
+          p.catch(() => {})
+        }
       })
     }
   }

ruoyi-ui-app/utils/tabBar.js

@@ -8,7 +8,6 @@ const TAB_PAGE_PATHS = new Set([
   'pages/mine/index'
 ])
 
-/** 运行时会改 TabBar 的 uni API（非 Tab 页调用会报 not TabBar page） */
 const TABBAR_API_NAMES = [
   'setTabBarStyle',
   'setTabBarItem',
@@ -21,11 +20,6 @@ const TABBAR_API_NAMES = [
   'setTabBarMidButton'
 ]
 
-/** 首次安装时缓存的原始 API（避免重复 bind 已包装函数） */
-const TABBAR_RAW_APIS = {}
-
-let tabBarEntryTask = null
-
 function readUniTabPagePaths() {
   try {
     const list =
@@ -78,173 +72,20 @@ function normalizePageRoute(route) {
   return r
 }
 
-function getCurrentPageRoute() {
-  const stack = getCurrentPages()
-  if (stack.length) {
-    const cur = stack[stack.length - 1]
-    return cur.route || cur.$page?.route || cur.$page?.fullPath || ''
-  }
-  if (typeof window !== 'undefined' && window.location && window.location.pathname) {
-    return window.location.pathname
-  }
-  return ''
-}
-
-function getCurrentPageMeta() {
-  const stack = getCurrentPages()
-  if (!stack.length) {
-    return null
-  }
-  const cur = stack[stack.length - 1]
-  return cur.$page?.meta || cur.$vm?.$page?.meta || null
-}
-
-/**
- * 路由是否对应 tabBar.list 中的页面（不等于当前栈顶一定是 Tab 上下文）
- */
-export function isTabBarRoute(route) {
-  const normalized = normalizePageRoute(route || getCurrentPageRoute())
-  return !!normalized && TAB_PAGE_PATHS.has(normalized)
-}
-
 /**
- * 当前栈顶是否为原生 TabBar 页
- * 须同时满足：meta.isTabBar === true 且 route 在 tabBar.list 内
- * （仅 meta 或仅 route 在 H5 生产环境都可能误判，导致 setTabBarStyle:fail）
+ * 当前栈顶是否为 TabBar 页（与 ruoyi-jiaoyi 一致：按 route 判断，非 Tab 页拦截全部 TabBar API）
  */
 export function isTabBarPage() {
-  if (!isTabBarRoute()) {
+  const stack = getCurrentPages()
+  if (!stack.length) {
     return false
   }
-  const meta = getCurrentPageMeta()
-  return !!(meta && meta.isTabBar === true)
-}
-
-/**
- * H5 生产环境直开/刷新 Tab URL 时，用 switchTab 切回真正的 Tab 上下文
- * @returns {Promise<boolean>} 切换后是否为 TabBar 页
- */
-export function ensureTabBarEntry() {
-  if (isTabBarPage()) {
-    return Promise.resolve(true)
-  }
-  if (!isTabBarRoute()) {
-    return Promise.resolve(false)
-  }
-  if (tabBarEntryTask) {
-    return tabBarEntryTask
-  }
-  const route = normalizePageRoute(getCurrentPageRoute())
-  tabBarEntryTask = new Promise((resolve) => {
-    uni.switchTab({
-      url: `/${route}`,
-      complete: () => {
-        tabBarEntryTask = null
-        resolve(isTabBarPage())
-      }
-    })
-  })
-  return tabBarEntryTask
-}
-
-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)
-}
-
-function isTabBarFailMsg(msg) {
-  return String(msg || '').includes('TabBar') && String(msg || '').includes('fail')
-}
-
-function rememberRawTabBarApi(target, name) {
-  if (TABBAR_RAW_APIS[name]) {
-    return TABBAR_RAW_APIS[name]
-  }
-  const fn = target[name]
-  if (typeof fn !== 'function') {
-    return null
-  }
-  if (fn._tabBarGuardRaw) {
-    TABBAR_RAW_APIS[name] = fn._tabBarGuardRaw
-    return TABBAR_RAW_APIS[name]
-  }
-  TABBAR_RAW_APIS[name] = fn.bind(target)
-  return TABBAR_RAW_APIS[name]
-}
-
-/**
- * H5 生产包中框架 / uview 可能在我们安装守卫后又写回 uni API，故每次启动 / 切页都重装
- */
-function wrapTabBarApi(target, name) {
-  if (!target || typeof target[name] !== 'function') {
-    return
-  }
-  const raw = rememberRawTabBarApi(target, name)
-  if (!raw) {
-    return
-  }
-  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) => {
-          if (isTabBarFailMsg(err && err.errMsg)) {
-            return finishNoopTabBarCall(name, opts)
-          }
-          throw err
-        })
-      }
-      if (ret && typeof ret.then === 'function') {
-        return ret.then(
-          (res) => {
-            if (res && isTabBarFailMsg(res.errMsg)) {
-              return noopTabBarResult(name)
-            }
-            return res
-          },
-          (err) => {
-            if (isTabBarFailMsg(err && err.errMsg)) {
-              return noopTabBarResult(name)
-            }
-            throw err
-          }
-        )
-      }
-      return ret
-    } catch (err) {
-      if (isTabBarFailMsg(err && err.errMsg)) {
-        return finishNoopTabBarCall(name, opts)
-      }
-      throw err
-    }
-  }
-  patchedTabBarApi._tabBarGuardPatched = true
-  patchedTabBarApi._tabBarGuardRaw = raw
-  target[name] = patchedTabBarApi
-}
-
-function patchTabBarApis(target) {
-  if (!target) {
-    return
-  }
-  TABBAR_API_NAMES.forEach((name) => wrapTabBarApi(target, name))
+  const cur = stack[stack.length - 1]
+  const route = normalizePageRoute(cur.route || cur.$page?.route || '')
+  return TAB_PAGE_PATHS.has(route)
 }
 
-function installTabBarInterceptors() {
+function installTabBarApiGuard() {
   if (typeof uni === 'undefined' || !uni.addInterceptor) {
     return
   }
@@ -262,17 +103,7 @@ function installTabBarInterceptors() {
   })
 }
 
-export function installTabBarApiGuard() {
-  readUniTabPagePaths()
-  if (typeof uni !== 'undefined') {
-    patchTabBarApis(uni)
-    installTabBarInterceptors()
-  }
-  if (typeof wx !== 'undefined') {
-    patchTabBarApis(wx)
-  }
-}
-
+readUniTabPagePaths()
 installTabBarApiGuard()
 
 /**