diff --git a/src/api/user.js b/src/api/user.js
index a8052005..de69f707 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -22,4 +22,3 @@ export function logout() {
method: 'post'
})
}
-
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index d21648f7..122a5db7 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -30,6 +30,9 @@
Github
+
+ Docs
+
Log Out
@@ -60,7 +63,6 @@ export default {
computed: {
...mapGetters([
'sidebar',
- 'name',
'avatar',
'device'
])
diff --git a/src/store/getters.js b/src/store/getters.js
index 71f9da26..8fcf5a59 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -10,7 +10,6 @@ const getters = {
introduction: state => state.user.introduction,
roles: state => state.user.roles,
permission_routes: state => state.permission.routes,
- addRoutes: state => state.permission.addRoutes,
errorLogs: state => state.errorLog.logs
}
export default getters
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index bd35252c..aeb5ee53 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -51,7 +51,7 @@ const actions = {
return new Promise(resolve => {
let accessedRoutes
if (roles.includes('admin')) {
- accessedRoutes = asyncRoutes
+ accessedRoutes = asyncRoutes || []
} else {
accessedRoutes = filterAsyncRoutes(asyncRoutes, roles)
}
diff --git a/src/utils/validate.js b/src/utils/validate.js
index e04f292e..e81672bb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -1,6 +1,7 @@
/**
* Created by jiachenpan on 16/11/18.
*/
+
/**
* @param {string} path
* @returns {Boolean}
diff --git a/src/views/error-page/404.vue b/src/views/error-page/404.vue
index 66cb3eae..1791f55a 100644
--- a/src/views/error-page/404.vue
+++ b/src/views/error-page/404.vue
@@ -8,22 +8,13 @@
-
- OOPS!
+
OOPS!
+
-
-
- {{ message }}
-
-
- 请检查您输入的网址是否正确,请点击以下按钮返回主页或者发送错误报告
-
-
- 返回首页
-
+
{{ message }}
+
Please check that the URL you entered is correct, or click the button below to return to the homepage.
+
Back to home
@@ -35,7 +26,7 @@ export default {
name: 'Page404',
computed: {
message() {
- return '网管说这个页面你不能进......'
+ return 'The webmaster said that you can not enter this page...'
}
}
}
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 0512d225..2a1ab741 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -30,7 +30,7 @@
ref="password"
v-model="loginForm.password"
:type="passwordType"
- :placeholder="Password"
+ placeholder="Password"
name="password"
auto-complete="on"
@keyup.native="checkCapslock"
diff --git a/vue.config.js b/vue.config.js
index bae56d78..7fa00992 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -86,7 +86,7 @@ module.exports = {
.end()
config
- // https://webpack.js.org/configuration/devtool/#development
+ // https://webpack.js.org/configuration/devtool/#development
.when(process.env.NODE_ENV === 'development',
config => config.devtool('cheap-source-map')
)