Merge branch 'master' of gitea.intra.yunpaper.com:zhangqi/kuailelunwen_new_houtai into zq-0828-newMenu

src/App.vue

@@ -36,6 +36,7 @@ import Breadcrumb from './components/Breadcrumb.vue';
 // import loadingAnimation from '@/assets/loadingAni.json' // 导入JSON文件
 import GlobalLoading from '@/components/GlobalLoading1.vue'
 import SliderScondThree from '@/components/SliderScondThree.vue'
+// import store from "@/store";
 // import ContentWithLoading from '@/components/ContentWithLoading'
 export default {
   data() {
@@ -57,6 +58,8 @@ export default {
   },
   mounted() {
     window.addEventListener('beforeunload', this.clearStorage);
+    // const menu_list = JSON.parse(localStorage.getItem('menu_list'))
+    // store.commit('SET_SLIDER_MENU', menu_list);
     console.log(this.secondMenu,'secondMenu====');
   },
   beforeUnmount() {

src/router/index.js

@@ -560,7 +560,7 @@ router.beforeEach((to, from, next) => {
     // 一级页面 侧边栏显示 统一化
     if (first_child_router.length > 0) {
       first_child_router.forEach(item => {
-        if (item.path == to.path) {
+        if (item.path === to.path) {
           store.commit('SET_CUSTOMIZE', false);
           store.commit('SET_SLIDER_MENU', 'menuData');
         }

src/utils/login.js

@@ -31,6 +31,7 @@ export async function autoLoginByToken(timeout = 10000) {
     // 存入 localStorage
     if(res.data.data.access_token) localStorage.setItem('token', res.data.data.access_token)
     if(res.data.data.nick) localStorage.setItem('nick', res.data.data.nick)
+    if(res.data.data.menu_list) localStorage.setItem('menu_list', JSON.stringify(res.data.data.menu_list))
   }
 
   const res = await axiosWithTimeout(