diff --git a/src/components/login-by-account.vue b/src/components/login-by-account.vue index 0a4f14b223c36f8a8fb238092cfe1f6661379d67..91b2f564181b3a591f1a48952ba9882281b60ebb 100644 --- a/src/components/login-by-account.vue +++ b/src/components/login-by-account.vue @@ -144,7 +144,7 @@ export default { getUser() { Promise.all([this.getUserInfo(), this.getMenu('apaas')]).then((res) => { if (res[0].data.code == 200 && res[1].data.code == 200) { - let data = res[1].data.data[0].children || []; + let data = res[1].data.data&&res[1].data.data[0].children || []; this.$store.commit("setUserInfo", res[0].data.data); // if (res.data.data.userType == 1) { //超管 diff --git a/src/main.js b/src/main.js index c743872aa4fb7dd57a4cfbf236e160d30a4b9e8c..cd14cab776e307cce20c081aced5b8c83dcb82f3 100644 --- a/src/main.js +++ b/src/main.js @@ -64,7 +64,7 @@ Promise.all([getUser(),getMenu('apaas')]).then(res => { console.log(res); if (res[0].data.code == 200&&res[1].data.code == 200) { //已登录则记录菜单和用户信息 - let data = res[1].data.data[0].children||[] + let data = res[1].data.data&&res[1].data.data[0].children||[] store.commit('setUserInfo', res[0].data.data) // if (res[0].data.data.userType == 1) {//超管 diff --git a/src/page/main/index/index.vue b/src/page/main/index/index.vue index 149c47dfb8233a31486ec4ce44e3e059b7acab98..b7f6d96b1445c2b75ad0403f49375c42f4ef3e67 100644 --- a/src/page/main/index/index.vue +++ b/src/page/main/index/index.vue @@ -1,6 +1,6 @@ diff --git a/src/router/function.js b/src/router/function.js index 8a68dc00474cd9f31d7508ad539cb8ed6389b5d0..687611d1b7ede18d31cc264454bdb168fba8fa3f 100644 --- a/src/router/function.js +++ b/src/router/function.js @@ -285,11 +285,7 @@ var menuToRouter = (menu) => { console.log(`@/page/main${e.path}/index.vue`); //叶子层级需要加载到对应文件 //对首页做兼容 - if (e.path == "/") { - e.component = () => import("../page/main/index/index.vue"); - } else { - e.component = getViews(e.path); - } + e.component = getViews(e.path); menuToRouter(e.children); } else { console.log(`@/page/main${e.path}/index.vue`);