Merge branch 'main' into base-sard-ui

This commit is contained in:
feige996 2025-06-21 19:42:18 +08:00
commit 749ff30f80

View File

@ -3,7 +3,7 @@ import { tabbarStore } from './tabbar'
// 'i-carbon-code',
import { tabbarList as _tabBarList, cacheTabbarEnable, selectedTabbarStrategy } from './tabbarList'
// @ts-expect-error
// @ts-expect-error
const customTabbarEnable = selectedTabbarStrategy === 1 || selectedTabbarStrategy === 2
/** tabbarList 里面的 path 从 pages.config.ts 得到 */
const tabbarList = _tabBarList.map(item => ({ ...item, path: `/${item.pagePath}` }))
@ -19,7 +19,7 @@ function selectTabBar(name: number) {
}
onLoad(() => {
// tabBar 2 tabBar
// @ts-expect-error
// @ts-expect-error
const hideRedundantTabbarEnable = selectedTabbarStrategy === 1
hideRedundantTabbarEnable
&& uni.hideTabBar({