Merge branch '2.0'

iview · Jan 24, 2019 · 3c5880a · 3c5880a
2 parents 2592e3b + bfb8f35
commit 3c5880a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/src/components/main/main.vue b/src/components/main/main.vue
@@ -167,8 +167,9 @@ export default {
      */
     this.setTagNavList()
     this.setHomeRoute(routers)
+    const { name, params, query, meta } = this.$route
     this.addTag({
-      route: this.$store.state.app.homeRoute
+      route: { name, params, query, meta }
     })
     this.setBreadCrumb(this.$route)
     // 设置初始语言

diff --git a/src/locale/lang/en-US.js b/src/locale/lang/en-US.js
@@ -1,5 +1,6 @@
 export default {
   home: 'Home',
+  login: 'Login',
   components: 'Components',
   count_to_page: 'Count-to',
   tables_page: 'Table',

diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js
@@ -1,5 +1,6 @@
 export default {
   home: '首页',
+  login: '登录',
   components: '组件',
   count_to_page: '数字渐变',
   tables_page: '多功能表格',

diff --git a/src/locale/lang/zh-TW.js b/src/locale/lang/zh-TW.js
@@ -1,5 +1,6 @@
 export default {
   home: '首頁',
+  login: '登錄',
   components: '组件',
   count_to_page: '数字渐变',
   tables_page: '多功能表格',