Merge branch 'dev' into xingyy

# Conflicts:
#	app/components/AppFooter.vue
This commit is contained in:
xingyy 2025-01-08 15:30:34 +08:00
commit 861ba5118d

View File

@ -23,7 +23,7 @@ const show = computed(() => {
<van-tabbar-item replace to="/profile"> <van-tabbar-item replace to="/profile">
<span>{{ $t('tabbar.profile') }}</span> <span>{{ $t('tabbar.profile') }}</span>
<template #icon> <template #icon>
<div class="i-carbon:user" />12asdfadas <div class="i-carbon:user" />12asdfasdfasdf
</template> </template>
</van-tabbar-item> </van-tabbar-item>
</van-tabbar> </van-tabbar>