Yinux/unibest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into base-sard-ui

Browse Source
This commit is contained in:
feige996 2025-06-21 19:42:18 +08:00
commit 749ff30f80
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/layouts/fg-tabbar/fg-tabbar.vue
View File

@ -3,7 +3,7 @@ import { tabbarStore } from './tabbar'
// 'i-carbon-code', // 'i-carbon-code',
import { tabbarList as _tabBarList, cacheTabbarEnable, selectedTabbarStrategy } from './tabbarList' import { tabbarList as _tabBarList, cacheTabbarEnable, selectedTabbarStrategy } from './tabbarList'
// @ts-expect-error 预料中的判断 // @ts-expect-error 预知的判断
const customTabbarEnable = selectedTabbarStrategy === 1 || selectedTabbarStrategy === 2 const customTabbarEnable = selectedTabbarStrategy === 1 || selectedTabbarStrategy === 2
/** tabbarList 里面的 path 从 pages.config.ts 得到 */ /** tabbarList 里面的 path 从 pages.config.ts 得到 */
const tabbarList = _tabBarList.map(item => ({ ...item, path: `/${item.pagePath}` })) const tabbarList = _tabBarList.map(item => ({ ...item, path: `/${item.pagePath}` }))
@ -19,7 +19,7 @@ function selectTabBar(name: number) {
} }
onLoad(() => { onLoad(() => {
// 解决原生 tabBar 未隐藏导致有2个 tabBar 的问题 // 解决原生 tabBar 未隐藏导致有2个 tabBar 的问题
// @ts-expect-error 预料中的判断 // @ts-expect-error 预知的判断
const hideRedundantTabbarEnable = selectedTabbarStrategy === 1 const hideRedundantTabbarEnable = selectedTabbarStrategy === 1
hideRedundantTabbarEnable hideRedundantTabbarEnable
&& uni.hideTabBar({ && uni.hideTabBar({