-

src/app/routes/partner/account-management/components/account-detail/account-detail.component.html

@@ -1,3 +1,4 @@
+<page-header-wrapper [title]="'账户详情'"></page-header-wrapper>
 <nz-card>
   <sv-container layout="vertical" [noColon]="true" col="4">
     <sv [label]="labelTpl">

src/app/routes/partner/account-management/components/list/list.component.html

@@ -1,3 +1,4 @@
+<page-header-wrapper [title]="''"></page-header-wrapper>
 <nz-card>
   <!-- <div nz-row>
     <div [nzSpan]="" nz-col>
@@ -20,14 +21,14 @@
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     [loading]="service.http.loading">
     <ng-template st-row="approvalStatus" let-item>
-      <a [routerLink]="'/partner/account-management/recorded-detail/'+item?.id">{{item.yskmoney}}</a>
+      <a [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.yskmoney}}</a>
     </ng-template>
     <ng-template st-row="approvalStatus1" let-item>
       <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
     </ng-template>
     <ng-template st-row="approvalStatus2" let-item>
       <a class="text-right text-blue-dark"
-        [routerLink]="'/partner/account-management/recorded-detail/'+item?.id">{{item.yskmoney | currency:'
+        [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.yskmoney | currency:'
         '}}</a>
     </ng-template>
 

src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html

@@ -1,3 +1,4 @@
+<page-header-wrapper [title]="'待入账明细'"></page-header-wrapper>
 <nz-card>
   <sv-container layout="vertical" [noColon]="true" col="4">
     <sv [label]="labelTpl">

src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts

@@ -164,7 +164,7 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
    * @param _record 当前行信息
    */
   viewDetail(_record: any) {
-    window.open(location.origin + '/#/partner/account-management/account-detail');
+    window.open(location.origin + `/#/partner/account-management/am/detail/${_record?.id}`);
   }
 
   close() {

src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html

@@ -9,55 +9,56 @@
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <page-header-wrapper [title]="'提现详情'" [logo]="logo">
-    <ng-template #logo>
+  <ng-template #logo>
-        <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
-            <i nz-icon nzType="left" nzTheme="outline"></i>
+      <i nz-icon nzType="left" nzTheme="outline"></i>
-        </button>
+    </button>
-    </ng-template>
+  </ng-template>
 </page-header-wrapper>
 
-<nz-card [nzLoading]="service.http.loading">
-    <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
-    <div se-container [labelWidth]="130">
-        <se label="网络货运人">
-            {{formData?.ltdName}}
-        </se>
-        <se label="银行类型">
-            {{formData?.bankType==='1'?'平安银行':'浦发银行'}}
-        </se>
-        <se label="提现单号">
-            {{formData?.refundApplyCode}}
-        </se>
-        <se label="账户名称">
-            {{formData?.bankAccountName}}
-        </se>
-        <se label="提现时间">
-            {{formData?.createTime}}
-        </se>
-        <se label="虚拟账户">
-            {{formData?.virtualAccount}}
-        </se>
-        <se label="提现状态">
-            {{formData?.refundStatusLabel}}
-        </se>
-        <se label="提现金额">
-            {{formData?.amount | currency}}
-        </se>
-        <se label="银行流水号">
-            {{formData?.bankSerialNumber}}
-        </se>
-        <se label="提现至银行卡">
-            {{formData?.bankCardNumber}}
-        </se>
-        <se label="银行回单" col="1">
-            <a (click)="downBack()">{{formData?.refundStatus==='3'?'下载回单':'暂无回单'}}</a>
-        </se>
-    </div>
 
-    <nz-alert nzType="info" nzMessage="提现进度" class="mb-md mt-md"></nz-alert>
+<nz-card [nzLoading]="service.http.loading">
-    <div nz-row class="mt-xl">
+  <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
-        <div nz-col nzSpan="12" nzOffset="1">
+  <div se-container [labelWidth]="130">
-            <app-logistics-time-line [data]="timeLineData"></app-logistics-time-line>
+    <se label="网络货运人">
-        </div>
+      {{formData?.ltdName}}
+    </se>
+    <se label="银行类型">
+      {{formData?.bankType==='1'?'平安银行':'浦发银行'}}
+    </se>
+    <se label="提现单号">
+      {{formData?.refundApplyCode}}
+    </se>
+    <se label="账户名称">
+      {{formData?.bankAccountName}}
+    </se>
+    <se label="提现时间">
+      {{formData?.createTime}}
+    </se>
+    <se label="虚拟账户">
+      {{formData?.virtualAccount}}
+    </se>
+    <se label="提现状态">
+      {{formData?.refundStatusLabel}}
+    </se>
+    <se label="提现金额">
+      {{formData?.amount | currency}}
+    </se>
+    <se label="银行流水号">
+      {{formData?.bankSerialNumber}}
+    </se>
+    <se label="提现至银行卡">
+      {{formData?.bankCardNumber}}
+    </se>
+    <se label="银行回单" col="1">
+      <a (click)="downBack()">{{formData?.refundStatus==='3'?'下载回单':'暂无回单'}}</a>
+    </se>
+  </div>
+
+  <nz-alert nzType="info" nzMessage="提现进度" class="mb-md mt-md"></nz-alert>
+  <div nz-row class="mt-xl">
+    <div nz-col nzSpan="12" nzOffset="1">
+      <app-logistics-time-line [data]="timeLineData"></app-logistics-time-line>
     </div>
+  </div>
 </nz-card>

src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts

@@ -8,7 +8,7 @@ import { FreightAccountService } from 'src/app/routes/financial-management/servi
   templateUrl: './withdrawals-detail.component.html',
   styleUrls: ['./withdrawals-detail.component.less']
 })
-export class PartnerAccountManagementWithdrawalsDetailComponent implements OnInit {
+export class PartnerAccountManagementWithdralDetailComponent implements OnInit {
   formData: any = {};
 
   timeLineData: any = [];

src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html

@@ -1,3 +1,4 @@
+<page-header-wrapper [title]="''"></page-header-wrapper>
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">

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 })
           }
         ]
       }

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: 'am',
-      { path: 'recorded-detail/:id', component: PartnerAccountManagementRecordedDetailComponent },
+        children: [
-      { path: 'withdraw-record', component: PartnerAccountManagementWithdrawalsRecordComponent },
+          { path: '', redirectTo: 'list' },
-      { path: 'withdraw-record/:id', component: PartnerAccountManagementWithdrawalsDetailComponent },
+          { 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: [

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({

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": "合伙人客户认领详情",
+                  "text": "合伙人客户认领详情",
-                "link": "/partner/claim-audit/partner-detail",
+                  "link": "/partner/claim-audit/partner-detail",
-                "hide": true
+                  "hide": true
-              },
+                },
-              {
+                {
-                "text": "渠道销售客户认领详情",
+                  "text": "渠道销售客户认领详情",
-                "link": "/partner/claim-audit/channel-detail",
+                  "link": "/partner/claim-audit/channel-detail",
-                "hide": true
+                  "hide": true
-              }
+                }
-            ]
+              ]
             }
           ]
         }