diff --git a/src/app/core/core.service.ts b/src/app/core/core.service.ts index 3324f528..53cd814a 100644 --- a/src/app/core/core.service.ts +++ b/src/app/core/core.service.ts @@ -22,7 +22,7 @@ export class CoreService { public $api_get_current_user_info = `/scm/cuc/cuc/user/getUserDetail`; // 获取当前用户所拥有的菜单 - public $api_get_current_user_menus = `/scm/cuc/cuc/functionInfo/getUserHaveFunctionsList`; + public $api_get_current_user_menus = `/api/mdc/cuc/functionInfo/getUserHaveFunctionsList`; position = { lat: '', lng: '' }; diff --git a/src/app/core/startup/startup.service.ts b/src/app/core/startup/startup.service.ts index 4e68b7e9..6c323a7a 100644 --- a/src/app/core/startup/startup.service.ts +++ b/src/app/core/startup/startup.service.ts @@ -133,12 +133,18 @@ export class StartupService { const userData = this.httpClient.post(this.userSrv.$api_get_user_by_token, {}).pipe(map((res: any) => res.data)); // 菜单数据 - // const menuData = this.httpClient - // .post(this.coreSrv.$api_get_current_user_menus, { - // appId: this.coreSrv.envSrv.getEnvironment().appId - // }) - // .pipe(map((res: any) => res.data)); - const menuData = this.httpClient.get('assets/mocks/menu-data.json').pipe(map((res: any) => res.data.menu)); + const menuData = this.httpClient + .post(this.coreSrv.$api_get_current_user_menus, { + appId: this.coreSrv.envSrv.getEnvironment().appId + }) + .pipe( + map((res: any) => { + console.log(res); + + return res.data; + }) + ); + // const menuData = this.httpClient.get('assets/mocks/menu-data.json').pipe(map((res: any) => res.data.menu)); return zip(appData, userData, menuData); } diff --git a/src/app/layout/pro/components/menu/menu.component.html b/src/app/layout/pro/components/menu/menu.component.html index 272c43b3..c2194d17 100644 --- a/src/app/layout/pro/components/menu/menu.component.html +++ b/src/app/layout/pro/components/menu/menu.component.html @@ -8,14 +8,14 @@ - {{ i.text }} + {{ i.title }}
{{ i.badge }}
- {{ i.text }} - {{ i.text }} + {{ i.title }} + {{ i.title }}