scout666/liveh5-nuxt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xingyy'

Browse Source 
# Conflicts:
#	app/layouts/default.vue
#	app/pages/home/index.vue
#	app/pages/profile/index.vue
This commit is contained in:
xingyy 2025-01-10 16:57:28 +08:00
commit 32594d035c
4 changed files with 64 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/components/AppHeader.vue
View File

@ -28,5 +28,12 @@ const showLeftArrow = computed(() => route.name && routeWhiteList.includes(route
:left-arrow="!showLeftArrow" :left-arrow="!showLeftArrow"
placeholder clickable fixed placeholder clickable fixed
@click-left="onBack" @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> </template>

15
app/layouts/default.vue
View File

@ -1,18 +1,13 @@
<template> <template>
<main class="flex flex-col min-h-svh"> <main class="flex flex-col min-h-svh">
<van-nav-bar fixed> <AppHeader class="h-[var(--van-nav-bar-height)]" />
<template #title>
<div class="flex flex-col items-center justify-center"> <div class="flex-1 pb-[var(--van-nav-bar-height)]">
<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">
<slot /> <slot />
</div> </div>
<AppFooter /> <AppFooter />
</main> </main>
</template> </template>
<script setup> <script setup lang="ts">
</script> </script>

14
app/pages/profile/index.vue
View File

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