diff --git a/src/app/core/startup/startup.service.ts b/src/app/core/startup/startup.service.ts index 78763f48..392f5e31 100644 --- a/src/app/core/startup/startup.service.ts +++ b/src/app/core/startup/startup.service.ts @@ -45,9 +45,9 @@ export class StartupService { let data; if (this.coreSrv.loginStatus) { // 本地菜单 - data = this.loadMockData(); + // data = this.loadMockData(); // 远程菜单 - // data = this.loadRemoteData(); + data = this.loadRemoteData(); } else { data = this.loadMockData(); } @@ -103,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.get('assets/mocks/user-data.json').pipe(map((res: any) => res.user)); // 菜单数据 const menuData = this.httpClient.get('assets/mocks/menu-data.json').pipe(map((res: any) => res.data.menu)); @@ -122,16 +122,15 @@ export class StartupService { const appData = this.httpClient.get(`assets/mocks/app-data.json`).pipe(map((res: any) => res.app)); // 用户数据 - const userData = this.coreSrv.loginStatus - ? this.httpClient.post(this.coreSrv.$api_get_current_user_info, {}).pipe(map((res: any) => res.data)) - : this.httpClient.get('assets/mocks/user-data.json').pipe(map((res: any) => res.user)); + 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 + // .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)); return zip(appData, userData, menuData); } diff --git a/src/app/routes/passport/components/order-agreement/order-agreement.component.spec.ts b/src/app/routes/passport/components/order-agreement/order-agreement.component.spec.ts deleted file mode 100644 index 9ad146da..00000000 --- a/src/app/routes/passport/components/order-agreement/order-agreement.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { OrderAgreementComponent } from './order-agreement.component'; - -describe('OrderAgreementComponent', () => { - let component: OrderAgreementComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [OrderAgreementComponent], - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(OrderAgreementComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/pipes/trushtml.pipe.ts b/src/app/shared/pipes/trushtml.pipe.ts index d93e6459..73b48359 100644 --- a/src/app/shared/pipes/trushtml.pipe.ts +++ b/src/app/shared/pipes/trushtml.pipe.ts @@ -22,7 +22,6 @@ export class TrushtmlPipe implements PipeTransform { } return this.sanitizer.bypassSecurityTrustHtml(value); } catch (e) { - console.warn(e); return ''; } }