Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
Taric Xin
2021-12-27 18:35:24 +08:00
parent 786c2e1bad
commit 8ead989ec1
3 changed files with 10 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/core/startup/startup.service.ts
View File

@ -45,9 +45,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();
} }
@ -103,7 +103,7 @@ export class StartupService {
const appData = this.httpClient.get(`assets/mocks/app-data.json`).pipe(map((res: any) => res.app)); 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)); 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 appData = this.httpClient.get(`assets/mocks/app-data.json`).pipe(map((res: any) => res.app));
// 用户数据 // 用户数据
const userData = this.coreSrv.loginStatus const userData = this.httpClient.post(this.userSrv.$api_get_user_by_token, {}).pipe(map((res: any) => res.data));
? 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 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));
return zip(appData, userData, menuData); return zip(appData, userData, menuData);
} }

23
src/app/routes/passport/components/order-agreement/order-agreement.component.spec.ts
View File

@ -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<OrderAgreementComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [OrderAgreementComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(OrderAgreementComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

1
src/app/shared/pipes/trushtml.pipe.ts
View File

@ -22,7 +22,6 @@ export class TrushtmlPipe implements PipeTransform {
} }
return this.sanitizer.bypassSecurityTrustHtml(value); return this.sanitizer.bypassSecurityTrustHtml(value);
} catch (e) { } catch (e) {
console.warn(e);
return ''; return '';
} }
} }