diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
index 16738ce9..6b7b86f4 100644
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
@@ -1,5 +1,5 @@
import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions, STData } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
@@ -27,7 +27,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
refundStatus: any = '';
msg = '';
- constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) { }
+ constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, public ar: ActivatedRoute) { }
ngOnInit(): void { }
@@ -325,7 +325,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
},
{
text: '详情',
- click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/' + item.id])
+ click: item => this.router.navigate(['./detail/' + item.id], { relativeTo: this.ar })
}
]
}
diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts
index b22dabab..a9bf5669 100644
--- a/src/app/routes/partner/partner-routing.module.ts
+++ b/src/app/routes/partner/partner-routing.module.ts
@@ -29,7 +29,7 @@ import { ParterRebateManageMentRecordComponent } from './rebate-management/compo
import { PartnerAccountManagementAccountDetailComponent } from './account-management/components/account-detail/account-detail.component';
import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
-import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
+import { PartnerAccountManagementWithdralDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
const routes: Routes = [
{
@@ -70,13 +70,26 @@ const routes: Routes = [
{
path: 'account-management',
children: [
- { path: 'list', component: PartnerAccountManagementListComponent },
- { path: 'account-detail', component: PartnerAccountManagementAccountDetailComponent },
- { path: 'recorded-detail/:id', component: PartnerAccountManagementRecordedDetailComponent },
- { path: 'withdraw-record', component: PartnerAccountManagementWithdrawalsRecordComponent },
- { path: 'withdraw-record/:id', component: PartnerAccountManagementWithdrawalsDetailComponent },
+ {
+ path: 'am',
+ children: [
+ { path: '', redirectTo: 'list' },
+ { path: '', component: PartnerAccountManagementListComponent },
+ { path: 'detail/:id', component: PartnerAccountManagementAccountDetailComponent },
+ { path: 'recorded/detail/:id', component: PartnerAccountManagementRecordedDetailComponent },
+ ]
+ },
+
+ {
+ path: 'withdraw-record',
+ children: [
+ { path: '', component: PartnerAccountManagementWithdrawalsRecordComponent },
+ { path: 'detail/:id', component: PartnerAccountManagementWithdralDetailComponent }
+ ]
+ },
]
},
+
{
path: 'claim-audit',
children: [
diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts
index 0d94b9ef..cbe18425 100644
--- a/src/app/routes/partner/partner.module.ts
+++ b/src/app/routes/partner/partner.module.ts
@@ -38,7 +38,7 @@ import { PartnerAccountManagementVirtualAccountDetailComponent } from './account
import { PartnerAccountManagementAccountDetailComponent } from './account-management/components/account-detail/account-detail.component';
import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
-import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
+import { PartnerAccountManagementWithdralDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
const COMPONENTS: any[] = [
@@ -69,7 +69,7 @@ const COMPONENTS: any[] = [
PartnerAccountManagementAccountDetailComponent,
PartnerAccountManagementRecordedDetailComponent,
PartnerAccountManagementWithdrawalsRecordComponent,
- PartnerAccountManagementWithdrawalsDetailComponent
+ PartnerAccountManagementWithdralDetailComponent
];
@NgModule({
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 473d4c2f..3f8a56dc 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -542,11 +542,11 @@
"group": true,
"children": [{
"text": "账户管理",
- "link": "/partner/account-management/list"
+ "link": "/partner/account-management/am"
},
{
"text": "账户明细",
- "link": "/partner/account-management/account-detail",
+ "link": "/partner/account-management/am/detail/:id",
"hide": true
},
{
@@ -555,7 +555,12 @@
},
{
"text": "提现详情",
- "link": "/partner/account-management/withdraw-record/:id",
+ "link": "/partner/account-management/withdraw-record/detail/:id",
+ "hide": true
+ },
+ {
+ "text": "待入账明细",
+ "link": "/partner/account-management/am/recorded/detail/:id",
"hide": true
}
]
@@ -564,16 +569,16 @@
"text": "客户认领审核",
"link": "/partner/claim-audit/list",
"children": [{
- "text": "合伙人客户认领详情",
- "link": "/partner/claim-audit/partner-detail",
- "hide": true
- },
- {
- "text": "渠道销售客户认领详情",
- "link": "/partner/claim-audit/channel-detail",
- "hide": true
- }
- ]
+ "text": "合伙人客户认领详情",
+ "link": "/partner/claim-audit/partner-detail",
+ "hide": true
+ },
+ {
+ "text": "渠道销售客户认领详情",
+ "link": "/partner/claim-audit/channel-detail",
+ "hide": true
+ }
+ ]
}
]
}