From f43e17b6b976cbc2a4f505f02e232e9f7e53b121 Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Tue, 1 Nov 2022 17:05:52 +0800
Subject: [PATCH] =?UTF-8?q?apaas=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/login-by-account.vue | 6 +++---
 src/main.js                         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/login-by-account.vue b/src/components/login-by-account.vue
index e672f92..0a4f14b 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 39240c2..c743872 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) {
       //已登录则记录菜单和用户信息
-- 
2.26.0