Merge branch 'xingyy'

# Conflicts:
#	app/layouts/default.vue
#	app/pages/home/index.vue
#	app/pages/profile/index.vue

app/components/AppHeader.vue

@@ -28,5 +28,12 @@ const showLeftArrow = computed(() => route.name && routeWhiteList.includes(route
     :left-arrow="!showLeftArrow"
     placeholder clickable fixed
     @click-left="onBack"
-  />
+  >
+    <template #title>
+      <div class="flex flex-col items-center justify-center">
+        <div class="text-#000000 text-17px mb-5px font-600">京都拍卖会</div>
+        <div class="text-#939393 text-10px line-height-none font-100">2025.01.18 蒙娜丽莎的微笑</div>
+      </div>
+    </template>
+  </VanNavBar>
 </template>

app/layouts/default.vue

@@ -1,18 +1,13 @@
 <template>
   <main class="flex flex-col min-h-svh">
-    <van-nav-bar fixed>
-    <template #title>
-      <div class="flex flex-col items-center justify-center">
-        <div class="text-#000000 text-17px mb-5px font-600">京都拍卖会</div>
-        <div class="text-#939393 text-10px line-height-none font-100">2025.01.18 蒙娜丽莎的微笑</div>
-      </div>
-    </template>
-    </van-nav-bar>
-    <div class="flex-1 pt-46px">
+    <AppHeader class="h-[var(--van-nav-bar-height)]" />
+
+    <div class="flex-1 pb-[var(--van-nav-bar-height)]">
       <slot />
     </div>
+
     <AppFooter />
   </main>
 </template>
-<script setup>
+<script setup lang="ts">
 </script>

app/pages/profile/index.vue

@@ -1,13 +1,13 @@
 <script setup>
-
+definePageMeta({
+  layout: 'default',
+  title: '我的',
+  i18n: 'menu.profile',
+})
 </script>
 
 <template>
-  <div class="h-full w-[100vw] bg-[url('@/static/images/5532@2x.png')] bg-cover px-[31px]">
-123
+  <div>
+  12312
   </div>
 </template>
-
-<style scoped>
-
-</style>