no message

src/main.js

@@ -22,14 +22,16 @@ Vue.prototype.postRequest = postRequest;
 Vue.prototype.putRequest = putRequest;
 Vue.prototype.deleteRequest = deleteRequest;
 
-router.beforeEach((to, from, next) => {
+router.beforeEach(async (to, from, next) => {
   // document.title = "嘉讯茂移动办公平台"
   if(window.sessionStorage.getItem("tokenStr")) {
-    initMenu(router, store);
-    initSite(store);
+    await initMenu(router, store);
+    await initSite(store);
+    console.log(store.state)
     if(!window.sessionStorage.getItem('user')) {
       //判断用户信息是否存在
-      return getRequest('/user/info').then((resp) => {
+       getRequest('/user/info').then((resp) => {
+        console.log(resp)
         if(resp) {
           //存入用户信息
           window.sessionStorage.setItem('user', JSON.stringify(resp.data));
@@ -38,6 +40,7 @@ router.beforeEach((to, from, next) => {
         next();
       })
     }
+  console.log(to, from, next, router)
     next();
   } else {
     if(to.path != '/') {

src/store/index.js

@@ -19,4 +19,4 @@ export default new Vuex.Store({
     actions: {
 
     }
-})
+})

src/utils/menus.js

@@ -1,20 +1,26 @@
 import {getRequest} from "@/utils/api";
 
 export const initMenu = (router, store) => {
-    if(store.state.routes && store.state.routes.length > 0) {
-        return;
-    }
-
-    getRequest('/system/cfg/menu').then(data => {
-        if(data) {
-            //格式化Router
-            let fmtRoutes = formatRoutes(data);
-            //添加到router
-            router.addRoutes(fmtRoutes);
-            //将数据存入Vuex
-            store.commit('initRoutes', fmtRoutes)
+    return new Promise((a)=>{
+        if(store.state.routes && store.state.routes.length > 0) {
+            a(true)
+            return;
         }
+
+        getRequest('/system/cfg/menu').then(data => {
+            if(data) {
+                //格式化Router
+                let fmtRoutes = formatRoutes(data);
+                //添加到router
+                console.log(fmtRoutes)
+                router.addRoutes(fmtRoutes);
+                //将数据存入Vuex
+                store.commit('initRoutes', fmtRoutes)
+                a(true)
+            }
+        })
     })
+
 }
 
 export const formatRoutes = (routes) => {
@@ -51,4 +57,4 @@ export const formatRoutes = (routes) => {
         fmtRoutes.push(fmRouter)
     });
     return fmtRoutes;
-}
+}

src/utils/sites.js

@@ -1,11 +1,17 @@
 import {getRequest} from "@/utils/api";
 
 export const initSite = (store) => {
-
-    getRequest('/common-query/mobile/site').then(data => {
-        if(data) {
-            //将数据存入Vuex
-            store.commit('initSites', data)
+    return new Promise((a)=> {
+        if(store.state.sites && store.state.sites.length > 0) {
+            a(true)
+            return;
         }
+        getRequest('/common-query/mobile/site').then(data => {
+            if (data) {
+                //将数据存入Vuex
+                store.commit('initSites', data)
+                a(true)
+            }
+        })
     })
-}
+}