123

ruoyi-ui-app/App.vue

@@ -1,40 +1,42 @@
-<script>
-import { syncUserOnLaunch } from '@/permission'
-
-export default {
-  onLaunch() {
-    syncUserOnLaunch().catch(() => {})
-  },
-  onShow() {
-    console.log('App Show')
-  },
-  onHide() {
-    console.log('App Hide')
-  }
-}
-</script>
-
-<style lang="scss">
-/* 须写在首行：与 uni.scss 中的 theme 配合，否则 index 内 $u-* 未定义 */
-@import 'uview-plus/index.scss';
-@import '@/styles/app-lang.scss';
-
-/* 全屏高度链：H5 若写死 page height:100%，易与原生 tabBar 抢高度导致底栏「看不见」 */
-/* #ifdef H5 */
-page {
-  min-height: 100%;
-  height: auto;
-  box-sizing: border-box;
-  background-color: #f0ebe5;
-}
-/* #endif */
-
-/* #ifndef H5 */
-page {
-  height: 100%;
-  min-height: 100%;
-  background-color: #f0ebe5;
-}
-/* #endif */
-</style>
+<script>
+import { syncUserOnLaunch } from '@/permission'
+import { installTabBarApiGuard } from '@/utils/tabBar'
+
+export default {
+  onLaunch() {
+    installTabBarApiGuard()
+    syncUserOnLaunch().catch(() => {})
+  },
+  onShow() {
+    console.log('App Show')
+  },
+  onHide() {
+    console.log('App Hide')
+  }
+}
+</script>
+
+<style lang="scss">
+/* 须写在首行：与 uni.scss 中的 theme 配合，否则 index 内 $u-* 未定义 */
+@import 'uview-plus/index.scss';
+@import '@/styles/app-lang.scss';
+
+/* 全屏高度链：H5 若写死 page height:100%，易与原生 tabBar 抢高度导致底栏「看不见」 */
+/* #ifdef H5 */
+page {
+  min-height: 100%;
+  height: auto;
+  box-sizing: border-box;
+  background-color: #f0ebe5;
+}
+/* #endif */
+
+/* #ifndef H5 */
+page {
+  height: 100%;
+  min-height: 100%;
+  background-color: #f0ebe5;
+}
+/* #endif */
+</style>
 

ruoyi-ui-app/config/index.js

@@ -7,43 +7,25 @@
  * 打包 H5：uni build -p h5
  */
 
-import { isExternal } from '@/utils/validate'
-
+/** 开发兜底 / 小程序未配域名时的默认值（生产 H5 不应依赖此项） */
 const apiHost = String(import.meta.env.VITE_APP_API_HOST || 'http://192.168.1.6:8010').replace(/\/$/, '')
 
+/** .env 显式配置的后端域名（小程序/App 生产环境必填 https） */
+const hostFromEnv = String(import.meta.env.VITE_APP_API_HOST || '').trim().replace(/\/$/, '')
+
 /** 与 ruoyi-ui 的 VUE_APP_BASE_API 同源配置（dev/prod 由 .env 注入） */
 const envBaseApi = String(import.meta.env.VITE_APP_BASE_API || '').trim()
 
-/** H5 打包后取浏览器当前 host（IP/域名），与 ruoyi-ui 生产 /prod-api 同域反代一致 */
-function getBrowserOrigin() {
-  if (typeof window === 'undefined' || !window.location) {
-    return ''
-  }
-  return String(window.location.origin || '').replace(/\/$/, '')
-}
-
 /**
- * H5 开发是否走 /dev-api 代理（需 vite.config.js rewrite）
- * 默认 false：直连 VITE_APP_API_HOST
+ * H5 开发是否走 /dev-api 代理（需 vite.config.js server.proxy）
+ * true：请求发到当前页同源 /dev-api，由 Vite 转发到 VITE_APP_API_HOST（推荐，避免跨域）
+ * false：直连 VITE_APP_API_HOST（仅调试代理问题时使用）
  */
-export const H5_USE_PROXY = false
+export const H5_USE_PROXY = true
 
 function resolveBaseApi() {
   if (import.meta.env.PROD) {
-    const apiPath = envBaseApi || '/prod-api'
-    // #ifdef H5
-    const origin = getBrowserOrigin()
-    if (origin) {
-      const normalized = apiPath.startsWith('/') ? apiPath : `/${apiPath}`
-      return `${origin}${normalized}`.replace(/\/$/, '')
-    }
-    // #endif
-    // #ifndef H5
-    if (/^https?:\/\//i.test(apiHost)) {
-      return apiHost
-    }
-    // #endif
-    return apiPath
+    return envBaseApi || '/prodapi'
   }
   const devBase = envBaseApi || '/dev-api'
   // #ifdef H5
@@ -56,6 +38,31 @@ function resolveBaseApi() {
 
 export const BASE_API = resolveBaseApi()
 
+/**
+ * 后端完整地址（开发 / 小程序打包用 .env 的 VITE_APP_API_HOST）
+ * H5 生产图片在运行时由 getFileBase() 自动取 window.location.origin
+ */
+export const API_HOST = hostFromEnv || apiHost
+
+/** 图片根地址（构建时）；H5 生产以运行时 getFileBase() 为准 */
+export const FILE_BASE = API_HOST
+
+/**
+ * 拼接图片、上传文件等静态资源地址（profile/upload 等）
+ * @param {string} path
+ */
+export function joinFileUrl(path) {
+  if (!path) {
+    return FILE_BASE
+  }
+  if (/^https?:\/\//i.test(path)) {
+    return path
+  }
+  const p = path.startsWith('/') ? path : '/' + path
+  const base = String(FILE_BASE).replace(/\/$/, '')
+  return base + p
+}
+
 /**
  * 拼接接口或静态资源地址（/login、/profile/...）
  * @param {string} path
@@ -64,7 +71,7 @@ export function joinApiUrl(path) {
   if (!path) {
     return BASE_API
   }
-  if (isExternal(path)) {
+  if (/^https?:\/\//i.test(path)) {
     return path
   }
   const p = path.startsWith('/') ? path : '/' + path

ruoyi-ui-app/main.js

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

ruoyi-ui-app/mixins/tabPage.js

@@ -1,4 +1,4 @@
-import { syncTabBarText } from '@/utils/tabBar'
+import { ensureTabBarEntry, isTabBarPage, syncTabBarText } from '@/utils/tabBar'
 
 /**
  * Tab 子页共用：根节点语言 class、导航标题、底部 tab 文案与 i18n 同步
@@ -19,15 +19,29 @@ export default {
     }
   },
   onShow() {
-    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(() => {})
+    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
     }
+    ensureTabBarEntry().then((ok) => {
+      if (ok) {
+        applyTabPageUi()
+      }
+    })
   }
 }

ruoyi-ui-app/package-a/agri-classroom/index.vue

@@ -70,7 +70,6 @@
                     img-mode="aspectFill"
                     :threshold="200"
                     :index="item.left.id"
-                    @click.stop="() => onPreviewCover(item.left)"
                   />
                   <text class="ac-card__title">{{ item.left.title }}</text>
                     <view v-if="item.left.type === 'video'" class="ac-card__foot ac-card__foot--video">
@@ -96,7 +95,6 @@
                     img-mode="aspectFill"
                     :threshold="200"
                     :index="item.right.id"
-                    @click.stop="() => onPreviewCover(item.right)"
                   />
                   <text class="ac-card__title">{{ item.right.title }}</text>
                   <view v-if="item.right.type === 'video'" class="ac-card__foot ac-card__foot--video">
@@ -454,11 +452,6 @@ export default {
       }
       return this.coverSrc
     },
-    onPreviewCover(card) {
-      const url = this.articleCover(card)
-      if (!url) return
-      uni.previewImage({ urls: [url], current: 0 })
-    },
     openCourseDetail(card) {
       if (!card) return
       if (card.type === 'training') {

ruoyi-ui-app/package-a/consult-detail/index.vue

@@ -301,15 +301,9 @@ export default {
     this.stopPoll()
   },
   mounted() {
-    if (typeof uni.getRecorderManager === 'function') {
-      const rm = uni.getRecorderManager()
-      rm.onStop((res) => this.onRecordStop(res))
-      rm.onError(() => {
-        this.isRecording = false
-        uni.showToast({ title: this.$t('consultDetailPage.recordFail'), icon: 'none' })
-      })
-      this.recorder = rm
-    }
+    // #ifndef H5
+    this.initRecorderManager()
+    // #endif
   },
   onUnload() {
     this.stopPoll()
@@ -346,6 +340,26 @@ export default {
         return String(raw)
       }
     },
+    initRecorderManager() {
+      // #ifdef H5
+      return
+      // #endif
+      if (typeof uni.getRecorderManager !== 'function') {
+        return
+      }
+      const rm = uni.getRecorderManager()
+      if (!rm || typeof rm.onStop !== 'function') {
+        return
+      }
+      rm.onStop((res) => this.onRecordStop(res))
+      if (typeof rm.onError === 'function') {
+        rm.onError(() => {
+          this.isRecording = false
+          uni.showToast({ title: this.$t('consultDetailPage.recordFail'), icon: 'none' })
+        })
+      }
+      this.recorder = rm
+    },
     openSession() {
       uni.showLoading({ title: this.$t('consultDetailPage.loading'), mask: true })
       const vetId = Number(this.vetResourceId) || this.vetResourceId
@@ -710,7 +724,6 @@ export default {
     },
     async send() {
       if (this.sendDisabled) return
-      console.log(111)
       const text = (this.draft || '').trim()
       const pending = this.pendingMedia
       this.sending = true

ruoyi-ui-app/package-a/my-enrollment/index.vue

@@ -49,7 +49,6 @@
                       img-mode="aspectFill"
                       :threshold="200"
                       :index="item.left.id"
-                      @click.stop="() => onPreviewCover(item.left)"
                     />
                     <text class="me-card__title">{{ item.left.title }}</text>
                     <view class="me-card__foot">
@@ -71,7 +70,6 @@
                       img-mode="aspectFill"
                       :threshold="200"
                       :index="item.right.id"
-                      @click.stop="() => onPreviewCover(item.right)"
                     />
                     <text class="me-card__title">{{ item.right.title }}</text>
                     <view class="me-card__foot">
@@ -366,11 +364,6 @@ export default {
       }
       return this.coverSrc
     },
-    onPreviewCover(card) {
-      const url = this.cardCover(card)
-      if (!url) return
-      uni.previewImage({ urls: [url], current: 0 })
-    },
     openTrainingDetail(card) {
       if (!card) return
       const q = [

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 { syncTabBarText } from '@/utils/tabBar'
+import { ensureTabBarEntry, isTabBarPage, syncTabBarText } from '@/utils/tabBar'
 import { useUserStore } from '@/store/user'
 
 export default {
@@ -168,13 +168,27 @@ export default {
       this.$i18n.locale = next
       this.layoutKey += 1
       this.$nextTick(() => {
-        syncTabBarText((k) => this.$t(k))
-        const p = uni.setNavigationBarTitle({
-          title: this.$t(this.navTitleKey)
-        })
-        if (p && typeof p.catch === 'function') {
-          p.catch(() => {})
+        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()
+          return
+        }
+        ensureTabBarEntry().then((ok) => {
+          if (ok) {
+            applyLangUi()
+          }
+        })
       })
     }
   }

ruoyi-ui-app/utils/tabBar.js

@@ -21,6 +21,8 @@ const TABBAR_API_NAMES = [
   'setTabBarMidButton'
 ]
 
+let tabBarEntryTask = null
+
 function readUniTabPagePaths() {
   try {
     const list =
@@ -39,6 +41,24 @@ function readUniTabPagePaths() {
   }
 }
 
+function getPublicPathPrefixes() {
+  const prefixes = ['bqH5/', 'bqjy/']
+  try {
+    const envPath = String(import.meta.env.VITE_APP_PUBLIC_PATH || '')
+      .trim()
+      .replace(/^\/|\/$/g, '')
+    if (envPath) {
+      const withSlash = `${envPath}/`
+      if (!prefixes.includes(withSlash)) {
+        prefixes.unshift(withSlash)
+      }
+    }
+  } catch (e) {
+    // ignore
+  }
+  return prefixes
+}
+
 function normalizePageRoute(route) {
   if (!route) {
     return ''
@@ -47,8 +67,7 @@ function normalizePageRoute(route) {
   if (r.endsWith('.html')) {
     r = r.slice(0, -5)
   }
-  const prefixes = ['bqH5/', 'bqjy/']
-  for (const prefix of prefixes) {
+  for (const prefix of getPublicPathPrefixes()) {
     if (r.startsWith(prefix)) {
       r = r.slice(prefix.length)
     }
@@ -57,20 +76,71 @@ function normalizePageRoute(route) {
 }
 
 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 ''
+    return null
   }
   const cur = stack[stack.length - 1]
-  return cur.route || cur.$page?.route || cur.$page?.fullPath || ''
+  return cur.$page?.meta || cur.$vm?.$page?.meta || null
 }
 
 /**
- * 当前栈顶是否为原生 TabBar 页
+ * 路由是否对应 tabBar.list 中的页面（不等于当前栈顶一定是 Tab 上下文）
+ */
+export function isTabBarRoute(route) {
+  const normalized = normalizePageRoute(route || getCurrentPageRoute())
+  return !!normalized && TAB_PAGE_PATHS.has(normalized)
+}
+
+/**
+ * 当前栈顶是否为原生 TabBar 页（须 meta.isTabBar，不能只看 route）
+ * H5 history 直开 /bqH5/pages/home/index 时 route 会匹配 Tab，但 meta.isTabBar 为 false
  */
 export function isTabBarPage() {
+  const meta = getCurrentPageMeta()
+  if (meta && typeof meta.isTabBar === 'boolean') {
+    return meta.isTabBar
+  }
+  return false
+}
+
+/**
+ * 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())
-  return !!route && TAB_PAGE_PATHS.has(route)
+  tabBarEntryTask = new Promise((resolve) => {
+    uni.switchTab({
+      url: `/${route}`,
+      complete: () => {
+        tabBarEntryTask = null
+        resolve(isTabBarPage())
+      }
+    })
+  })
+  return tabBarEntryTask
 }
 
 function noopTabBarResult(name) {
@@ -88,15 +158,23 @@ function finishNoopTabBarCall(name, options) {
   return Promise.resolve(result)
 }
 
+function isTabBarFailMsg(msg) {
+  return String(msg || '').includes('TabBar') && String(msg || '').includes('fail')
+}
+
 /**
- * H5 生产包中 addInterceptor 偶发拦不住框架内部调用，直接包装 uni API 更稳
+ * H5 生产包中 addInterceptor 偶发拦不住框架内部调用，直接包装 uni/wx API 更稳
  */
-function wrapTabBarApi(name) {
-  if (typeof uni === 'undefined' || typeof uni[name] !== 'function') {
+function wrapTabBarApi(target, name) {
+  if (!target || typeof target[name] !== 'function') {
     return
   }
-  const raw = uni[name].bind(uni)
-  uni[name] = function patchedTabBarApi(options) {
+  const current = target[name]
+  if (current._tabBarGuardPatched) {
+    return
+  }
+  const raw = current.bind(target)
+  function patchedTabBarApi(options) {
     const opts = options || {}
     if (!isTabBarPage()) {
       return finishNoopTabBarCall(name, opts)
@@ -105,28 +183,33 @@ function wrapTabBarApi(name) {
       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
+          if (isTabBarFailMsg(err && err.errMsg)) {
+            return finishNoopTabBarCall(name, opts)
           }
           throw err
         })
       }
       return ret
     } catch (err) {
-      const msg = err && err.errMsg ? String(err.errMsg) : ''
-      if (msg.includes('TabBar') && msg.includes('fail')) {
+      if (isTabBarFailMsg(err && err.errMsg)) {
         return finishNoopTabBarCall(name, opts)
       }
       throw err
     }
   }
+  patchedTabBarApi._tabBarGuardPatched = true
+  target[name] = patchedTabBarApi
 }
 
-function installTabBarApiGuard() {
-  readUniTabPagePaths()
-  TABBAR_API_NAMES.forEach(wrapTabBarApi)
-  if (!uni.addInterceptor) {
+function patchTabBarApis(target) {
+  if (!target) {
+    return
+  }
+  TABBAR_API_NAMES.forEach((name) => wrapTabBarApi(target, name))
+}
+
+function installTabBarInterceptors() {
+  if (typeof uni === 'undefined' || !uni.addInterceptor) {
     return
   }
   TABBAR_API_NAMES.forEach((name) => {
@@ -143,6 +226,17 @@ function installTabBarApiGuard() {
   })
 }
 
+export function installTabBarApiGuard() {
+  readUniTabPagePaths()
+  if (typeof uni !== 'undefined') {
+    patchTabBarApis(uni)
+    installTabBarInterceptors()
+  }
+  if (typeof wx !== 'undefined') {
+    patchTabBarApis(wx)
+  }
+}
+
 installTabBarApiGuard()
 
 /**

ruoyi-ui-app/vite.config.js

@@ -1,38 +1,25 @@
 import { defineConfig, loadEnv } from 'vite'
 import uni from '@dcloudio/vite-plugin-uni'
-import { LLM_PROXY_TARGET } from './config/llm.js'
-
-const llmTarget = String(LLM_PROXY_TARGET || '').replace(/\/$/, '')
-
-/** 与 manifest.json h5.router.base 一致：生产 /bqH5/，开发 / */
-function resolvePublicPath(mode, env) {
-  if (mode !== 'production') {
-    return '/'
-  }
-  const raw = String(env.VITE_APP_PUBLIC_PATH || 'bqH5').trim()
-  if (!raw || raw === '/') {
-    return '/'
-  }
-  return `/${raw.replace(/^\/+|\/+$/g, '')}/`
-}
 
 /**
  * uni-app Vue3 H5 开发代理
  * - /dev-api → 若依后端（.env.development 的 VITE_APP_API_HOST）
- * - /llm-dev-proxy → 大模型网关
  */
 export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, process.cwd(), '')
-  const base = resolvePublicPath(mode, env)
   const devApiTarget = String(env.VITE_APP_API_HOST || 'http://192.168.1.6:8010').replace(/\/$/, '')
   const devApiPrefix = String(env.VITE_APP_BASE_API || '/dev-api')
 
   return {
-    base,
     plugins: [uni()],
-    build: {
-      // iOS Safari 对 modulepreload 更敏感，预加载未使用的 chunk 易拖慢首屏
-      modulePreload: false
+    css: {
+      preprocessorOptions: {
+        scss: {
+          // 让每个 .vue 的 scss（含 uview-plus 组件）都能用到 $u-primary、@include flex 等
+          additionalData: '@import "uview-plus/theme.scss";',
+          silenceDeprecations: ['legacy-js-api', 'import']
+        }
+      }
     },
     server: {
       proxy: {
@@ -40,11 +27,6 @@ export default defineConfig(({ mode }) => {
           target: devApiTarget,
           changeOrigin: true,
           rewrite: (path) => path.replace(new RegExp(`^${devApiPrefix}`), '')
-        },
-        '/llm-dev-proxy': {
-          target: llmTarget,
-          changeOrigin: true,
-          rewrite: (path) => path.replace(/^\/llm-dev-proxy/, '')
         }
       }
     }