[合并]合并代码

src/app/app-routing.module.ts

@@ -2,16 +2,17 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { LoginComponent } from './pages/login/login.component';
 import { NavigationComponent } from './navigation/navigation.component';
-import {HomeComponent} from './home/home.component'
+import { HomeComponent } from './home/home.component'
 
 //路由守卫
-import {AuthGuard} from './auth.guard'
-import {MTokenK1Component} from './m-token-k1/m-token-k1.component' //K1秘钥
+import { AuthGuard } from './auth.guard'
+import { MTokenK1Component } from './m-token-k1/m-token-k1.component' //K1秘钥
 import { AddSixFamiliarComponent } from './ui/add-six-familiar/add-six-familiar.component';
 
 
 
 
+
 const routes: Routes = [
   {path:'',redirectTo:'login',pathMatch:'full'},
   {
@@ -31,8 +32,11 @@ const routes: Routes = [
   component:LoginComponent},
 
   {path:'getNoMToken',
-  component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面
-];
+  component:MTokenK1Component, canActivate: [AuthGuard],},
+   //K1秘钥验证失败是跳转页面
+   {path:'home', component:HomeComponent,canActivate: [AuthGuard],}//守卫验证
+    ]
+
 
 @NgModule({
   imports: [RouterModule.forRoot(routes)],