diff --git a/README.md b/README.md index d4f11fb9..c8428dc0 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ **本项目并不是一个脚手架,更倾向于是一个集成解决方案** - **该项目不支持低版本游览器(如ie),有需求请自行添加polyfill [详情](https://github.com/PanJiaChen/vue-element-admin/wiki#babel-polyfill)** + **该项目不支持低版本浏览器(如ie),有需求请自行添加polyfill [详情](https://github.com/PanJiaChen/vue-element-admin/wiki#babel-polyfill)**

diff --git a/src/lang/en.js b/src/lang/en.js index 3d81875c..358a6e61 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -66,8 +66,8 @@ export default { github: 'Github Repository' }, permission: { - permissions: 'Your permissions', - switchPermissions: 'Switch permissions' + roles: 'Your roles', + switchRoles: 'Switch roles' }, components: { documentation: 'Documentation', diff --git a/src/lang/zh.js b/src/lang/zh.js index cff6c72d..54b6141b 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -66,8 +66,8 @@ export default { github: 'Github 地址' }, permission: { - permissions: '你的权限', - switchPermissions: '切换权限' + roles: '你的权限', + switchRoles: '切换权限' }, components: { documentation: '文档', diff --git a/src/router/index.js b/src/router/index.js index 26c47f4a..221ec7eb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,6 +9,10 @@ Vue.use(Router) /* Layout */ import Layout from '../views/layout/Layout' +/** note: submenu only apppear when children.length>=1 +* detail see https://panjiachen.github.io/vue-element-admin-site/#/router-and-nav?id=sidebar +**/ + /** * hidden: true if `hidden:true` will not show in the sidebar(default is false) * redirect: noredirect if `redirect:noredirect` will no redirct in the breadcrumb diff --git a/src/utils/i18n.js b/src/utils/i18n.js index 6e4ca145..faa52062 100644 --- a/src/utils/i18n.js +++ b/src/utils/i18n.js @@ -1,4 +1,4 @@ -// translate router.meta.title , be used in breadcrumb sidebar tagsview +// translate router.meta.title, be used in breadcrumb sidebar tagsview export function generateTitle(title) { - return this.$t('route.' + title) // $t :this method from vue-i18n ,inject in @/lang/index.js + return this.$t('route.' + title) // $t :this method from vue-i18n, inject in @/lang/index.js } diff --git a/src/views/documentation/index.vue b/src/views/documentation/index.vue index c4f4b52d..d8381592 100644 --- a/src/views/documentation/index.vue +++ b/src/views/documentation/index.vue @@ -1,7 +1,7 @@ @@ -22,11 +22,6 @@ export default { { title: '优雅的使用 icon', href: 'https://segmentfault.com/a/https://segmentfault.com/a/1190000012213278' } ] } - }, - methods: { - translateKey(key) { - return this.$t('documentation.' + key) - } } } diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 5776fd8c..d848c6f6 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -7,13 +7,13 @@

- + - + @@ -25,16 +25,16 @@ - {{translateKey('dashboard')}} + {{$t('navbar.dashboard')}} - {{translateKey('github')}} + {{$t('navbar.github')}} - {{translateKey('logOut')}} + {{$t('navbar.logOut')}} @@ -75,9 +75,6 @@ export default { this.$store.dispatch('LogOut').then(() => { location.reload()// 为了重新实例化vue-router对象 避免bug }) - }, - translateKey(key) { - return this.$t('navbar.' + key) } } } diff --git a/src/views/login/authredirect.vue b/src/views/login/authredirect.vue index f466fff3..7cf37e81 100644 --- a/src/views/login/authredirect.vue +++ b/src/views/login/authredirect.vue @@ -1,10 +1,10 @@ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 72237f31..484c96c0 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -2,7 +2,7 @@