Skip to content

Commit 3c5880a

Browse files
committed
Merge branch '2.0'
2 parents 2592e3b + bfb8f35 commit 3c5880a

File tree

4 files changed

+5
-1
lines changed

4 files changed

+5
-1
lines changed

src/components/main/main.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,9 @@ export default {
167167
*/
168168
this.setTagNavList()
169169
this.setHomeRoute(routers)
170+
const { name, params, query, meta } = this.$route
170171
this.addTag({
171-
route: this.$store.state.app.homeRoute
172+
route: { name, params, query, meta }
172173
})
173174
this.setBreadCrumb(this.$route)
174175
// 设置初始语言

src/locale/lang/en-US.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export default {
22
home: 'Home',
3+
login: 'Login',
34
components: 'Components',
45
count_to_page: 'Count-to',
56
tables_page: 'Table',

src/locale/lang/zh-CN.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export default {
22
home: '首页',
3+
login: '登录',
34
components: '组件',
45
count_to_page: '数字渐变',
56
tables_page: '多功能表格',

src/locale/lang/zh-TW.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export default {
22
home: '首頁',
3+
login: '登錄',
34
components: '组件',
45
count_to_page: '数字渐变',
56
tables_page: '多功能表格',

0 commit comments

Comments
 (0)