Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 085ff2f

Browse files
committed
refactor: always display the navbar on the page
1 parent 90bec31 commit 085ff2f

File tree

12 files changed

+38
-20
lines changed

12 files changed

+38
-20
lines changed

‎src/components/NavBar.vue‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,22 @@ const title = computed(() => {
1717
1818
return route.meta.i18n ? t(route.meta.i18n) : (route.meta.title || '')
1919
})
20+
21+
const showLeftArrow = computed(() => {
22+
if (!route.meta)
23+
return false
24+
25+
return route.meta.level === 2
26+
})
2027
</script>
2128

2229
<template>
2330
<VanNavBar
24-
v-if="title"
2531
:title="title"
2632
:fixed="true"
27-
clickable left-arrow placeholder
33+
clickable
34+
placeholder
35+
:left-arrow="showLeftArrow"
2836
@click-left="onBack"
2937
/>
3038
</template>

‎src/components/TabBar.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ const { t } = useI18n()
33
const active = ref(0)
44
const route = useRoute()
55
6-
const display = computed(() => {
6+
const show = computed(() => {
77
if (route.meta.level && route.meta.level !== 2)
88
return true
99
return false
1010
})
1111
</script>
1212

1313
<template>
14-
<van-tabbar v-if="display" v-model="active" routeplaceholder>
14+
<van-tabbar v-if="show" v-model="active" placeholderroute>
1515
<van-tabbar-item replace to="/">
1616
{{ t('layouts.home') }}
1717
<template #icon>

‎src/locales/en-US.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
2-
"home": {
2+
"menus": {
3+
"home": "Home",
4+
"profile": "My Center",
35
"darkMode": "🌗 Dark Mode",
46
"mockGuide": "💿 Mock Guide",
57
"language": "📚 Language",

‎src/locales/zh-CN.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
2-
"home": {
2+
"menus": {
3+
"home": "主页",
4+
"profile": "个人中心",
35
"darkMode": "🌗 暗黑模式",
46
"mockGuide": "💿 Mock 指南",
57
"language": "📚 语言",

‎src/pages/[...all].vue‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
definePage({
33
name: '404',
44
meta: {
5+
title: '404',
6+
i18n: 'menus.404Demo',
57
level: 2,
68
},
79
})

‎src/pages/charts/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ definePage({
44
meta: {
55
level: 2,
66
title: '📊 Echarts 演示',
7-
i18n: 'home.echartsDemo',
7+
i18n: 'menus.echartsDemo',
88
},
99
})
1010

‎src/pages/counter/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ definePage({
77
meta: {
88
level: 2,
99
title: '🍍 持久化 Pinia 状态',
10-
i18n: 'home.persistPiniaState',
10+
i18n: 'menus.persistPiniaState',
1111
},
1212
})
1313

‎src/pages/index.vue‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import { languageColumns, locale } from '@/utils/i18n'
66
definePage({
77
name: 'home',
88
meta: {
9+
title: '主页',
10+
i18n: 'menus.home',
911
level: 1,
1012
},
1113
})
@@ -38,27 +40,27 @@ function onLanguageConfirm(event: { selectedOptions: PickerColumn }) {
3840
}
3941
4042
const menuItems = computed(() => ([
41-
{ title: t('home.mockGuide'), route: 'mock' },
42-
{ title: t('home.echartsDemo'), route: 'charts' },
43-
{ title: t('home.unocssExample'), route: 'unocss' },
44-
{ title: t('home.persistPiniaState'), route: 'counter' },
45-
{ title: t('home.404Demo'), route: 'unknown' },
46-
{ title: t('home.keepAlive'), route: 'keepalive' },
43+
{ title: t('menus.mockGuide'), route: 'mock' },
44+
{ title: t('menus.echartsDemo'), route: 'charts' },
45+
{ title: t('menus.unocssExample'), route: 'unocss' },
46+
{ title: t('menus.persistPiniaState'), route: 'counter' },
47+
{ title: t('menus.404Demo'), route: 'unknown' },
48+
{ title: t('menus.keepAlive'), route: 'keepalive' },
4749
]))
4850
</script>
4951

5052
<template>
51-
<div class="pt-46">
53+
<div class="pt-16">
5254
<VanCellGroup inset>
53-
<VanCell center :title="t('home.darkMode')">
55+
<VanCell center :title="t('menus.darkMode')">
5456
<template #right-icon>
5557
<VanSwitch v-model="checked" size="20px" aria-label="on/off Dark Mode" @click="toggle()" />
5658
</template>
5759
</VanCell>
5860

5961
<VanCell
6062
is-link
61-
:title="t('home.language')"
63+
:title="t('menus.language')"
6264
:value="language"
6365
@click="showLanguagePicker = true"
6466
/>

‎src/pages/keepalive/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ definePage({
88
meta: {
99
level: 2,
1010
title: '🧡 KeepAlive',
11-
i18n: 'home.keepAlive',
11+
i18n: 'menus.keepAlive',
1212
keepAlive: true,
1313
},
1414
})

‎src/pages/mock/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ definePage({
66
meta: {
77
level: 2,
88
title: '💿 Mock 指南',
9-
i18n: 'home.mockGuide',
9+
i18n: 'menus.mockGuide',
1010
},
1111
})
1212

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /