From 50d09574099f39b71ac37739ff7c07ec568f2160 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Thu, 18 Apr 2019 18:16:13 +0800
Subject: [PATCH] perf: optimize some small details

---
 src/api/user.js                  |  1 -
 src/layout/components/Navbar.vue |  4 +++-
 src/store/getters.js             |  1 -
 src/store/modules/permission.js  |  2 +-
 src/utils/validate.js            |  1 +
 src/views/error-page/404.vue     | 23 +++++++----------------
 vue.config.js                    |  2 +-
 7 files changed, 13 insertions(+), 21 deletions(-)

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 d544f079..51972166 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -36,6 +36,9 @@
               {{ $t('navbar.github') }}
             </el-dropdown-item>
           </a>
+          <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
+            <el-dropdown-item>Docs</el-dropdown-item>
+          </a>
           <el-dropdown-item divided>
             <span style="display:block;" @click="logout">{{ $t('navbar.logOut') }}</span>
           </el-dropdown-item>
@@ -68,7 +71,6 @@ export default {
   computed: {
     ...mapGetters([
       'sidebar',
-      'name',
       'avatar',
       'device'
     ])
diff --git a/src/store/getters.js b/src/store/getters.js
index 3fb5b068..313210a0 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -11,7 +11,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 @@
         <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
       </div>
       <div class="bullshit">
-        <div class="bullshit__oops">
-          OOPS!
+        <div class="bullshit__oops">OOPS!</div>
+        <div class="bullshit__info">All rights reserved
+          <a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
         </div>
-        <div class="bullshit__info">
-          版权所有
-          <a class="link-type" href="https://wallstreetcn.com" target="_blank">华尔街见闻</a>
-        </div>
-        <div class="bullshit__headline">
-          {{ message }}
-        </div>
-        <div class="bullshit__info">
-          请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告
-        </div>
-        <router-link to="/" class="bullshit__return-home">
-          返回首页
-        </router-link>
+        <div class="bullshit__headline">{{ message }}</div>
+        <div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to return to the homepage.</div>
+        <a href="" class="bullshit__return-home">Back to home</a>
       </div>
     </div>
   </div>
@@ -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/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')
       )