update

src/components/layout/shms/header.vue

@@ -13,10 +13,13 @@
         </li>
       </ul>
       <div class="user-content">
-        <div class="photo">
-          <img :src="user.head_img" class="photo" />
-        </div>
-        <div class="name">{{ user.english_name || user.chinese_name }}</div>
+        <template v-if="user">
+          <div class="photo">
+            <img :src="user.head_img" class="photo" />
+          </div>
+          <div class="name">{{ user.english_name || user.chinese_name }}</div>
+        </template>
+        <div v-else class="name" @click="goLogin">立即登录</div>
       </div>
     </div>
   </div>
@@ -41,6 +44,11 @@ export default {
     user() {
       return this.$store.state.user.data
     }
+  },
+  methods: {
+    goLogin() {
+      window.location.href = webConf.others.loginUrl
+    }
   }
 }
 </script>
@@ -105,6 +113,7 @@ export default {
       font-size: 14px;
       color: #5f5f5f;
       margin-left: 10px;
+      cursor: pointer;
     }
   }
 }

src/router/routes.js

@@ -12,15 +12,18 @@ export default [
       },
       {
         path: '/shms/status',
-        component: () => import('@/pages/shms/status/index.vue')
+        component: () => import('@/pages/shms/status/index.vue'),
+        meta: { requiredLogin: true }
       },
       {
         path: '/shms/score',
-        component: () => import('@/pages/shms/score/index.vue')
+        component: () => import('@/pages/shms/score/index.vue'),
+        meta: { requiredLogin: true }
       },
       {
         path: '/shms/certs',
-        component: () => import('@/pages/shms/certs/index.vue')
+        component: () => import('@/pages/shms/certs/index.vue'),
+        meta: { requiredLogin: true }
       }
     ]
   },

src/utils/axios.js

@@ -40,9 +40,9 @@ httpRequest.interceptors.response.use(
       const { status, message, code } = error.response.data
       // 未登录
       if (status === 403) {
-        window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`
+        // window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`
       } else if (status === 400 && code === 401) {
-        router.push('/role')
+        router.push('/')
       } else {
         Message.error(message || error.response.data)
       }

src/utils/beforeEnter.js

@@ -7,9 +7,11 @@ export default class BeforeEnter {
 
   async update(to, from, next) {
     const isLogin = store.state.isLogin || (await store.dispatch('checkLogin'))
-    if (!isLogin) {
-      window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`
-      return
+    if (to.meta.requiredLogin) {
+      if (!isLogin) {
+        window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.origin)}`
+        next()
+      }
     }
     next()
   }