diff --git a/src/components/login-by-account.vue b/src/components/login-by-account.vue index e672f92b85c02846a7f0b62f0cd6c65547fb87af..0a4f14b223c36f8a8fb238092cfe1f6661379d67 100644 --- a/src/components/login-by-account.vue +++ b/src/components/login-by-account.vue @@ -138,11 +138,11 @@ export default { getUserInfo() { return this.$axios.get(`/apaas/system/v5/user/getUserInfo`); }, - getMenu() { - return this.$axios.get(`/apaas/system/v5/menu/user/tree`); + getMenu(search) { + return this.$axios.get(`/apaas/system/v5/menu/user/tree?search=${search}`); }, getUser() { - Promise.all([this.getUserInfo(), this.getMenu()]).then((res) => { + 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 || []; this.$store.commit("setUserInfo", res[0].data.data); diff --git a/src/main.js b/src/main.js index 39240c240754b7d1385f1f3b7fce62533e4d0119..c743872aa4fb7dd57a4cfbf236e160d30a4b9e8c 100644 --- a/src/main.js +++ b/src/main.js @@ -44,8 +44,8 @@ function getUser() { } //获取用户菜单信息 -function getMenu() { - return axios.get(`/apaas/system/v5/menu/user/tree`) +function getMenu(search) { + return axios.get(`/apaas/system/v5/menu/user/tree?search=${search}`) } //处理菜单成为对象 @@ -60,7 +60,7 @@ function getMenuObj(menu,parentRowPath,menuObj){ } -Promise.all([getUser(),getMenu()]).then(res => { +Promise.all([getUser(),getMenu('apaas')]).then(res => { console.log(res); if (res[0].data.code == 200&&res[1].data.code == 200) { //已登录则记录菜单和用户信息