Auto merge main into i18n

src/layouts/fg-tabbar/fg-tabbar.vue

@@ -3,6 +3,7 @@ import { tabbarStore } from './tabbar'
 // 'i-carbon-code',
 import { tabbarList as _tabBarList, cacheTabbarEnable, selectedTabbarStrategy } from './tabbarList'
 
+// @ts-expect-error 预知的判断
 const customTabbarEnable = selectedTabbarStrategy === 1 || selectedTabbarStrategy === 2
 /** tabbarList 里面的 path 从 pages.config.ts 得到 */
 const tabbarList = _tabBarList.map(item => ({ ...item, path: `/${item.pagePath}` }))
@@ -18,6 +19,7 @@ function selectTabBar({ value: index }: { value: number }) {
 }
 onLoad(() => {
   // 解决原生 tabBar 未隐藏导致有2个 tabBar 的问题
+  // @ts-expect-error 预知的判断
   const hideRedundantTabbarEnable = selectedTabbarStrategy === 1
   hideRedundantTabbarEnable
   && uni.hideTabBar({
@@ -34,18 +36,15 @@ onLoad(() => {
 <template>
   <wd-tabbar
     v-if="customTabbarEnable"
-
     v-model="tabbarStore.curIdx"
-
-    bordered safeareainsetbottom placeholder fixed
+    bordered
+    safeareainsetbottom
+    placeholder
+    fixed
     @change="selectTabBar"
   >
     <block v-for="(item, idx) in tabbarList" :key="item.path">
-      <wd-tabbar-item
-        v-if="item.iconType === 'wot'"
-        :title="item.text"
-        :icon="item.icon"
-      />
+      <wd-tabbar-item v-if="item.iconType === 'uiLib'" :title="item.text" :icon="item.icon" />
       <wd-tabbar-item
         v-else-if="item.iconType === 'unocss' || item.iconType === 'iconfont'"
         :title="item.text"

src/layouts/fg-tabbar/tabbarList.ts

@@ -24,7 +24,7 @@ export const tabbarList = [
     pagePath: 'pages/index/index',
     text: '%tabbar.home%',
     icon: 'home',
-    iconType: 'wot',
+    iconType: 'uiLib',
   },
   {
     iconPath: 'static/tabbar/example.png',