Quellcode durchsuchen

代码格式化

yuwenjun1997 vor 2 Jahren
Ursprung
Commit
9f9cc21139
2 geänderte Dateien mit 7 neuen und 5 gelöschten Zeilen
  1. 4 4
      src/layout/components/AppMain.vue
  2. 3 1
      src/permission.js

+ 4 - 4
src/layout/components/AppMain.vue

@@ -36,10 +36,10 @@ export default {
 }
 
 .hasTagsView {
-  .app-main {
-    /* 84 = navbar + tags-view = 50 + 34 */
-    // min-height: calc(100vh - 84px);
-  }
+  // .app-main {
+  //   /* 84 = navbar + tags-view = 50 + 34 */
+  //   // min-height: calc(100vh - 84px);
+  // }
 
   .fixed-header + .app-main {
     padding-top: 84px;

+ 3 - 1
src/permission.js

@@ -17,12 +17,14 @@ router.beforeEach(async(to, from, next) => {
   // set page title
   document.title = getPageTitle(to.meta.title)
 
-  // determine whether the user has logged in
+  // if the query has token, need resave this token and replace the route
   if (to.query.token) {
     store.commit('user/SET_TOKEN', to.query.token)
     delete to.query.token
     next({ ...to })
   }
+
+  // determine whether the user has logged in
   const hasToken = getToken()
 
   if (hasToken) {