From ac29c0363d569b3462578e88df933f69d30cb270 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 9 Feb 2022 17:55:31 +0800 Subject: [PATCH 1/6] edit --- .../usercenter/components/freight/list/list.component.ts | 2 +- .../usercenter/components/freight/user/user.component.ts | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 3b7c97c7..cee0ec3c 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -179,7 +179,7 @@ export class FreightComponentsListComponent implements OnInit { { title: '网络货运人', className: 'text-center', index: 'netTranName' }, { title: '常用服务', className: 'text-center', index: 'oftenUsedServices', type: 'enum', enum: { 10: '整车发货', 20: '大宗发货' } }, { title: '推广业务员', className: 'text-center', render: 'promotersTelephone' }, - { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' } }, + { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '货主注册', 2: '平台添加' } }, { title: '企业状态', className: 'text-center', diff --git a/src/app/routes/usercenter/components/freight/user/user.component.ts b/src/app/routes/usercenter/components/freight/user/user.component.ts index 81088edc..e63378df 100644 --- a/src/app/routes/usercenter/components/freight/user/user.component.ts +++ b/src/app/routes/usercenter/components/freight/user/user.component.ts @@ -152,14 +152,13 @@ export class FreightComponentsUserComponent implements OnInit { placeholder: '请输入' } }, - certificationStatus: { + stateLocked: { type: 'string', title: '状态', enum: [ { label: '全部', value: '' }, - { label: '待审核', value: 0 }, - { label: '正常', value: 1 }, - { label: '冻结', value: 2 } + { label: '正常', value: 0 }, + { label: '冻结', value: 1 } ], default: '', ui: { From e5fd7489cfd65c5c187de8547ff20d67dd3e0b7c Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 10 Feb 2022 09:13:25 +0800 Subject: [PATCH 2/6] edit --- src/app/core/guards/auth.guard.ts | 2 +- src/assets/mocks/menu-data.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts index 346a0310..a57d6b27 100644 --- a/src/app/core/guards/auth.guard.ts +++ b/src/app/core/guards/auth.guard.ts @@ -71,7 +71,7 @@ export class AuthGuard extends ACLGuard { // this.srv1.setAbility(res.abilities || []); // } this.srv1.setAbility(res.abilities || []); - this.menuService.resume(); + // this.menuService.resume(); } if (type === 1) { return super.canActivate(route, state); diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 3af27c83..902d08bf 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -61,6 +61,7 @@ }, { "text": "货主员工详情", + "hide": true, "icon": "anticon anticon-dashboard", "link": "/usercenter/freight/user/view/:id" } From b27cb5895995b39dcb41caddd7028473790e21f7 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 10 Feb 2022 09:21:23 +0800 Subject: [PATCH 3/6] edit --- src/app/core/guards/auth.guard.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts index a57d6b27..136c975a 100644 --- a/src/app/core/guards/auth.guard.ts +++ b/src/app/core/guards/auth.guard.ts @@ -42,14 +42,18 @@ export class AuthGuard extends ACLGuard { canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot): Observable { if (Object.keys(route.params)?.length > 0 || !route.routeConfig?.path) { - return this.handle(route, _state, 1); + return super.canActivate(route, _state); } else { - return this.handle(route, _state, 1, _state?.url); + return super.canActivate(route, _state); } } canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.handle(childRoute, state, 2, this.settingRoute(childRoute.params, state.url)); + if (childRoute.routeConfig?.loadChildren) { + return super.canActivateChild(childRoute, state); + } else { + return this.handle(childRoute, state, 2, this.settingRoute(childRoute.params, state.url)); + } } private handle(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, type: 1 | 2, router?: string): Observable { From 306952a85028ae185a99adfc865196a52c8574c4 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 10 Feb 2022 09:24:09 +0800 Subject: [PATCH 4/6] edit --- src/app/core/guards/auth.guard.ts | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts index 136c975a..8beda134 100644 --- a/src/app/core/guards/auth.guard.ts +++ b/src/app/core/guards/auth.guard.ts @@ -41,11 +41,12 @@ export class AuthGuard extends ACLGuard { } canActivate(route: ActivatedRouteSnapshot, _state: RouterStateSnapshot): Observable { - if (Object.keys(route.params)?.length > 0 || !route.routeConfig?.path) { - return super.canActivate(route, _state); - } else { - return super.canActivate(route, _state); - } + // if (Object.keys(route.params)?.length > 0 || !route.routeConfig?.path) { + // return super.canActivate(route, _state); + // } else { + // return super.canActivate(route, _state); + // } + return super.canActivate(route, _state); } canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { @@ -69,11 +70,6 @@ export class AuthGuard extends ACLGuard { return this.baseService.request('/api/mdc/cuc/functionButton/getUserFunctionButton', { link: router }).pipe( switchMap(res => { if (res) { - // if (router === '/ticket/invoice-requested') { - // this.srv1.setAbility(['TICKET-INVOICE-REQUESTED-list']); - // } else { - // this.srv1.setAbility(res.abilities || []); - // } this.srv1.setAbility(res.abilities || []); // this.menuService.resume(); } @@ -86,6 +82,12 @@ export class AuthGuard extends ACLGuard { ); } + /** + * 根据参数拼接原始路由 + * @param params 参数 + * @param route 实际路由 + * @returns + */ private settingRoute(params: any, route: string) { let _route = route; if (_route.indexOf('?') > -1) { From e59ad0a4e0f52ffef8bdff5ef9f0670afb6a8dfd Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 10 Feb 2022 09:25:46 +0800 Subject: [PATCH 5/6] edit --- src/app/core/guards/auth.guard.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts index 8beda134..0d009572 100644 --- a/src/app/core/guards/auth.guard.ts +++ b/src/app/core/guards/auth.guard.ts @@ -71,7 +71,7 @@ export class AuthGuard extends ACLGuard { switchMap(res => { if (res) { this.srv1.setAbility(res.abilities || []); - // this.menuService.resume(); + this.menuService.resume(); } if (type === 1) { return super.canActivate(route, state); From 885e9eacb5f2253770750c9d6c5e3ae758269535 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 10 Feb 2022 09:48:10 +0800 Subject: [PATCH 6/6] edit --- src/app/layout/pro/components/user/user.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/layout/pro/components/user/user.component.html b/src/app/layout/pro/components/user/user.component.html index cc3e9a80..5d5ce1a1 100644 --- a/src/app/layout/pro/components/user/user.component.html +++ b/src/app/layout/pro/components/user/user.component.html @@ -1,6 +1,6 @@
- {{ settings.user.name }} + {{ settings.user.realName }}