coderzii
diff --git a/‎src/components/index.js
Lines changed: 0 additions & 3 deletions b/‎src/components/index.js
Lines changed: 0 additions & 3 deletions
diff --git a/‎src/layout/Layout.vue
Lines changed: 0 additions & 72 deletions b/‎src/layout/Layout.vue
Lines changed: 0 additions & 72 deletions
diff --git a/‎src/layout/header/Index.vue
Lines changed: 3 additions & 0 deletions b/‎src/layout/header/Index.vue
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/layout/index.js
Lines changed: 0 additions & 2 deletions b/‎src/layout/index.js
Lines changed: 0 additions & 2 deletions
diff --git a/‎src/layout/sidebar/Index.vue
Lines changed: 6 additions & 1 deletion b/‎src/layout/sidebar/Index.vue
Lines changed: 6 additions & 1 deletion
diff --git a/‎src/components/menus/MenuItem.vue renamed to ‎src/layout/sidebar/menus/MenuItem.vue b/‎src/components/menus/MenuItem.vue renamed to ‎src/layout/sidebar/menus/MenuItem.vue
diff --git a/‎src/components/menus/Menus.vue renamed to ‎src/layout/sidebar/menus/Menus.vue
Lines changed: 0 additions & 7 deletions b/‎src/components/menus/Menus.vue renamed to ‎src/layout/sidebar/menus/Menus.vue
Lines changed: 0 additions & 7 deletions
diff --git a/‎src/components/menus/index.js renamed to ‎src/layout/sidebar/menus/index.js b/‎src/components/menus/index.js renamed to ‎src/layout/sidebar/menus/index.js
diff --git a/‎src/router/router.js
Lines changed: 8 additions & 9 deletions b/‎src/router/router.js
Lines changed: 8 additions & 9 deletions
diff --git a/‎src/utils/storage.js
Lines changed: 2 additions & 1 deletion b/‎src/utils/storage.js
Lines changed: 2 additions & 1 deletion
@@ -1,7 +1,4 @@
-import Menus from './menus';
-
 const components = {
-  Menus,
 };
 
 const install = (Vue) => {
 
@@ -76,6 +76,7 @@ export default {
   },
   methods: {
     logout () {
+      console.log('退出登录');
       storage.removeItem(authToken);
       storage.removeItem(currentUser);
       this.$router.push({ name: 'login' });
@@ -141,11 +142,13 @@ export default {
       width: 240px;
       height: 40px;
       background: rgba(255, 255, 255, 0.2);
+      transition: all 0.3s ease-in-out;
     }
     .log2 {
       width: 65px;
       height: 40px;
       background: rgba(255, 255, 255, 0.2);
+      transition: all 0.3s ease-in-out;
     }
   }
   .menus {
 
@@ -6,7 +6,12 @@
 </template>
 
 <script>
-export default {}
+import Menus from './menus/Menus.vue';
+export default {
+  components: {
+    Menus,
+  }
+}
 </script>
 
 <style lang="scss" scoped>
 
@@ -55,13 +55,6 @@ export default {
 
 <style scoped lang="scss">
 .sidebar {
-  /* display: block;
-  position: absolute;
-  left: 0;
-  top: 70px;
-  bottom: 0;
-  overflow-y: scroll; */
-  /* float: left; */
   display: block;
   position: absolute;
   left: 0;
 
@@ -9,18 +9,16 @@ import { authToken } from '@/config';
 Vue.use(VueRouter)
 
 const routes = [
+
   {
-    name: '',
+    name: '/',
     path: '/',
     meta: { title: 'Home' },
-    component: () => import('@/layout'),
-    redirect: '/home',
-    children: [
-      ...home,
-      ...constantRoutes,
-    ],
+    redirect: '/home'
   },
+  ...home,
   ...login,
+  ...constantRoutes,
 ]
 
 const router = new VueRouter({
@@ -44,7 +42,7 @@ const auth = (to, from, next) => {
       title: '退出提示',
       message: '登录超时',
     });
-    next({ name: 'login', query: { backUrl: to.fullPath } });
+    next({ name: 'login', query: { backUrl: to.fullPath }, replace: true });
   }
 }
 
@@ -56,10 +54,11 @@ const auth = (to, from, next) => {
  * @param {type} 
  * @return: 
  */
+const whiteList = ['login'];
 const authRoutes = async (to, from, next) => {
   const routes = await store.dispatch('getMenuListApi');
   const routesUrlList = routes.map(item => item.index);
-  if (routesUrlList.includes(to.name)) {
+  if (routesUrlList.includes(to.name) || whiteList.includes(to.name)) {
     next({ ...to, replace: true });
   } else {
     next({ name: 'home', replace: true });
 
@@ -63,8 +63,9 @@ class LocalStorage {
    * @Date: 2019-08-16 13:31:11
    */
   removeItem (key) {
-    key = this.getKey(key);
+    // key = this.getKey(key);
     const value = this.getItem(key);
+    console.log('===', key, value)
     if (value) {
       window.localStorage.removeItem(key);
     }