解决冲突

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