edit
This commit is contained in:
@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
|
||||
import { Inject, Injectable } from '@angular/core';
|
||||
import { ACLService } from '@delon/acl';
|
||||
import { MenuService, SettingsService, TitleService, _HttpClient } from '@delon/theme';
|
||||
import { EAUserService } from '@shared';
|
||||
import { AmapService, EAUserService } from '@shared';
|
||||
import { NzSafeAny } from 'ng-zorro-antd/core/types';
|
||||
import { NzIconService } from 'ng-zorro-antd/icon';
|
||||
import { Observable, zip } from 'rxjs';
|
||||
@ -26,6 +26,7 @@ export class StartupService {
|
||||
private titleService: TitleService,
|
||||
private httpClient: _HttpClient,
|
||||
private userSrv: EAUserService,
|
||||
private amapService: AmapService,
|
||||
private coreSrv: CoreService
|
||||
) {
|
||||
iconSrv.addIcon(...ICONS_AUTO, ...ICONS);
|
||||
@ -35,6 +36,12 @@ export class StartupService {
|
||||
|
||||
load(): Promise<void> {
|
||||
return new Promise(resolve => {
|
||||
this.amapService.getCurrentPosition().subscribe(res => {
|
||||
if (res.position) {
|
||||
this.coreSrv.position = { lat: res.position.lat, lng: res.position.lng };
|
||||
}
|
||||
});
|
||||
|
||||
let data;
|
||||
if (this.coreSrv.loginStatus) {
|
||||
// 本地菜单
|
||||
@ -96,7 +103,7 @@ export class StartupService {
|
||||
const appData = this.httpClient.get(`assets/mocks/app-data.json`).pipe(map((res: any) => res.app));
|
||||
|
||||
// 用户数据
|
||||
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.get('assets/mocks/menu-data.json').pipe(map((res: any) => res.data.menu));
|
||||
|
||||
Reference in New Issue
Block a user