From 4f6d271c28881709f917e81e63219abed4efd7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Sat, 11 May 2024 09:41:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8=20tabbar=20layout=20?=
 =?UTF-8?q?+=20wot=20icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.config.ts           | 5 +++--
 src/layouts/tabbar.vue    | 4 ++++
 src/pages/index/index.vue | 2 +-
 src/pages/my/index.vue    | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 src/layouts/tabbar.vue

diff --git a/pages.config.ts b/pages.config.ts
index f2d86cb..43f3ec5 100644
--- a/pages.config.ts
+++ b/pages.config.ts
@@ -33,8 +33,9 @@ export default defineUniPages({
       },
       {
         pagePath: 'pages/my/index',
-        icon: 'i-carbon-user-avatar',
-        isUnocssIcon: true,
+        icon: 'user',
+        // 经过验证发现unocss这样跨文件动态图标，无法显示，所以先用wot icon 吧
+        // isUnocssIcon: true,
         text: '我的',
       },
     ],
diff --git a/src/layouts/tabbar.vue b/src/layouts/tabbar.vue
new file mode 100644
index 0000000..a63127d
--- /dev/null
+++ b/src/layouts/tabbar.vue
@@ -0,0 +1,4 @@
+<template>
+  <slot />
+  <fg-tabbar />
+</template>
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index c94ae1d..c2c1547 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,6 +1,7 @@
 <!-- 使用 type="home" 属性设置首页，其他页面不需要设置，默认为page；推荐使用json5，更强大，且允许注释 -->
 <route lang="json5" type="home">
 {
+  layout: 'tabbar',
   style: {
     navigationStyle: 'custom',
     navigationBarTitleText: '首页',
@@ -28,7 +29,6 @@
       <text class="text-green-500">tabbar</text>
     </view>
   </view>
-  <fg-tabbar />
 </template>
 
 <script lang="ts" setup>
diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue
index ddc1334..524f1ae 100644
--- a/src/pages/my/index.vue
+++ b/src/pages/my/index.vue
@@ -1,6 +1,6 @@
 <route lang="json5" type="page">
 {
-  layout: 'default',
+  layout: 'tabbar',
   style: {
     navigationBarTitleText: '我的',
   },