解决冲突

src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-15 13:17:42
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 10:45:43
+ * @LastEditTime : 2022-02-24 10:47:39
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -19,7 +19,8 @@
     （运输费：{{ data?.totalFreight | currency }}，附加费：{{ data?.totalSurcharge | currency }}，附加费率：{{ (data?.totalRate * 100).toFixed(2) + '%' }}）
   </p>
   <p>
-    <label nz-checkbox [(ngModel)]="aggreechecked">确认已阅读并知晓<a>《变更协议》</a></label>
+    <label nz-checkbox [(ngModel)]="aggreechecked"></label>
+    <span>&nbsp;确认已阅读并知晓 <a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 11 }">《变更协议》</a></span>
   </p>
 </div>
 

src/app/routes/passport/components/order-agreement/order-agreement.component.html

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2021-12-27 21:08:36
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-24 10:50:46
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <div class="page-box">
   <div style="width: 90%; margin: 5rem auto">
     <h1 class="mb-md mt-md">

src/app/routes/routes-routing.module.ts

@@ -19,6 +19,7 @@ import { AuthGuard } from '../core/guards/auth.guard';
 
 // dashboard pages
 import { DashboardComponent } from './dashboard/dashboard.component';
+import { OrderAgreementComponent } from './passport/components/order-agreement/order-agreement.component';
 
 const routes: Routes = [
   {
@@ -74,6 +75,11 @@ const routes: Routes = [
     ]
   },
   // passport
+  {
+    path: 'agreement',
+    component: OrderAgreementComponent,
+    data: { title: '协议', titleI18n: 'app.login.agreement' }
+  },
   { path: '', loadChildren: () => import('./passport/passport.module').then(m => m.PassportModule) },
   { path: 'exception', loadChildren: () => import('./exception/exception.module').then(m => m.ExceptionModule) },
   // 单页不包裹Layout