e
This commit is contained in:
@ -49,9 +49,9 @@ export class StartupService {
|
|||||||
let data;
|
let data;
|
||||||
if (this.coreSrv.loginStatus) {
|
if (this.coreSrv.loginStatus) {
|
||||||
// 本地菜单
|
// 本地菜单
|
||||||
data = this.loadMockData();
|
// data = this.loadMockData();
|
||||||
// 远程菜单
|
// 远程菜单
|
||||||
// data = this.loadRemoteData();
|
data = this.loadRemoteData();
|
||||||
} else {
|
} else {
|
||||||
data = this.loadMockData();
|
data = this.loadMockData();
|
||||||
}
|
}
|
||||||
@ -134,12 +134,12 @@ export class StartupService {
|
|||||||
const userData = this.httpClient.post(this.userSrv.$api_get_user_by_token, {}).pipe(map((res: any) => res.data));
|
const userData = this.httpClient.post(this.userSrv.$api_get_user_by_token, {}).pipe(map((res: any) => res.data));
|
||||||
|
|
||||||
// 菜单数据
|
// 菜单数据
|
||||||
const menuData = this.httpClient
|
// const menuData = this.httpClient
|
||||||
.post(this.coreSrv.$api_get_current_user_menus, {
|
// .post(this.coreSrv.$api_get_current_user_menus, {
|
||||||
appId: this.coreSrv.envSrv.getEnvironment().appId
|
// appId: this.coreSrv.envSrv.getEnvironment().appId
|
||||||
})
|
// })
|
||||||
.pipe(map((res: any) => res.data));
|
// .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.get('assets/mocks/menu-data.json').pipe(map((res: any) => res.data.menu));
|
||||||
|
|
||||||
return zip(appData, userData, menuData);
|
return zip(appData, userData, menuData);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user