|
@@ -1,29 +1,3 @@
|
|
|
-<<<<<<< HEAD
|
|
|
-import { NgModule } from '@angular/core';
|
|
|
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
|
|
|
-
|
|
|
-const routes: Routes = [
|
|
|
- {
|
|
|
- path: '',
|
|
|
- loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
|
|
|
- },
|
|
|
- {
|
|
|
- path: 'tab4',
|
|
|
- loadChildren: () => import('./tab4/tab4.module').then( m => m.Tab4PageModule)
|
|
|
- },
{
|
|
|
- path: 'login',
|
|
|
- loadChildren: () => import('./login/login.module').then( m => m.LoginPageModule)
|
|
|
- }
|
|
|
-
|
|
|
-];
|
|
|
-@NgModule({
|
|
|
- imports: [
|
|
|
- RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
|
|
|
- ],
|
|
|
- exports: [RouterModule]
|
|
|
-})
|
|
|
-export class AppRoutingModule {}
|
|
|
-=======
|
|
|
import { NgModule } from '@angular/core';
|
|
|
import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
|
|
|
|
|
@@ -36,10 +10,11 @@ const routes: Routes = [
|
|
|
path: 'tab4',
|
|
|
loadChildren: () => import('./tab4/tab4.module').then( m => m.Tab4PageModule)
|
|
|
},
|
|
|
- { path: 'comment-reply', loadChildren: () => import('./comment-reply/comment-reply.module').then(m => m.CommentReplyPageModule) },
|
|
|
- { path: 'like-favorite', loadChildren: () => import('./like-favorite/like-favorite.module').then(m => m.LikeFavoritePageModule) },
|
|
|
- { path: 'follow', loadChildren: () => import('./follow/follow.module').then(m => m.FollowPageModule) },
|
|
|
- { path: 'system-message', loadChildren: () => import('./system-message/system-message.module').then(m => m.SystemMessagePageModule) },
|
|
|
+ {
|
|
|
+ path: 'login',
|
|
|
+ loadChildren: () => import('./login/login.module').then( m => m.LoginPageModule)
|
|
|
+ }
|
|
|
+
|
|
|
];
|
|
|
@NgModule({
|
|
|
imports: [
|
|
@@ -48,4 +23,3 @@ const routes: Routes = [
|
|
|
exports: [RouterModule]
|
|
|
})
|
|
|
export class AppRoutingModule {}
|
|
|
->>>>>>> 9ac83b6fb2162c25fca57e0a38988562b679b49d
|