fix: app routing

src/app/app-routing.module.ts

@@ -1,67 +1,8 @@
-import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
-// 引用路由守卫
-import { authGuard } from 'src/modules/user/auth.guard';
-
-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: 'feedback',
-    loadChildren: () => import('./feedback/feedback.module').then( m => m.FeedbackPageModule)
-  },
-  {
-    path: 'settings',
-    loadChildren: () => import('./settings/settings.module').then( m => m.SettingsPageModule)
-  },
-  // {
-  //   path: 'login',
-  //   loadChildren: () => import('./login/login.module').then( m => m.LoginPageModule)
-  // },
-  {
-    path: 'edit-profile',
-    loadChildren: () => import('./edit-profile/edit-profile.module').then( m => m.EditProfilePageModule)
-  },
-  {
-    path: 'notification-settings',
-    loadChildren: () => import('./notification-settings/notification-settings.module').then( m => m.NotificationSettingsPageModule)
-  },
-  {
-    path: 'privacy',
-    loadChildren: () => import('./privacy/privacy.module').then( m => m.PrivacyPageModule)
-  },
-    // 添加：
-    {
-      path: 'user',
-      loadChildren: () => import('../modules/user/user.module').then(m => m.UserModule)
-    },
  {
-    path: 'theme-settings',
-    loadChildren: () => import('./theme-settings/theme-settings.module').then( m => m.ThemeSettingsPageModule)
-  },
-  {
-    path: 'language-settings',
-    loadChildren: () => import('./language-settings/language-settings.module').then( m => m.LanguageSettingsPageModule)
-  }
+import { NgModule } from '@angular/core';
+import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
+// 引用路由守卫
+import { authGuard } from 'src/modules/user/auth.guard';
 
-<<<<<<< HEAD
-
-  
-
-];
-@NgModule({
-  imports: [
-    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
-  ],
-  exports: [RouterModule]
-})
-export class AppRoutingModule {}
-=======
 const routes: Routes = [
   {
     path: '',
@@ -79,6 +20,10 @@ const routes: Routes = [
     path: 'settings',
     loadChildren: () => import('./settings/settings.module').then( m => m.SettingsPageModule)
   },
+  // {
+  //   path: 'login',
+  //   loadChildren: () => import('./login/login.module').then( m => m.LoginPageModule)
+  // },
   {
     path: 'edit-profile',
     loadChildren: () => import('./edit-profile/edit-profile.module').then( m => m.EditProfilePageModule)
@@ -91,24 +36,28 @@ const routes: Routes = [
     path: 'privacy',
     loadChildren: () => import('./privacy/privacy.module').then( m => m.PrivacyPageModule)
   },
-<<<<<<< HEAD
-=======
-    // 添加：
-    {
-      path: 'user',
-      loadChildren: () => import('../modules/user/user.module').then(m => m.UserModule)
-    },
+
   {
-    path: 'following',
-    loadChildren: () => import('./following/following.module').then( m => m.FollowingPageModule)
+    path: 'theme-settings',
+    loadChildren: () => import('./theme-settings/theme-settings.module').then( m => m.ThemeSettingsPageModule)
   },
   {
-    path: 'follower',
-    loadChildren: () => import('./follower/follower.module').then( m => m.FollowerPageModule)
-  }
->>>>>>> 87918af0e1c30e994678bf04d041318da5e73e19
-
-  
+    path: 'language-settings',
+    loadChildren: () => import('./language-settings/language-settings.module').then( m => m.LanguageSettingsPageModule)
+  },
+    // 添加：
+      {
+        path: 'user',
+        loadChildren: () => import('../modules/user/user.module').then(m => m.UserModule)
+      },
+    {
+      path: 'following',
+      loadChildren: () => import('./following/following.module').then( m => m.FollowingPageModule)
+    },
+    {
+      path: 'follower',
+      loadChildren: () => import('./follower/follower.module').then( m => m.FollowerPageModule)
+    }
 
 ];
 @NgModule({
@@ -117,5 +66,4 @@ const routes: Routes = [
   ],
   exports: [RouterModule]
 })
-export class AppRoutingModule {}
->>>>>>> 5e5fa4b1cc44df8d6d24f2f95a16130573bb10b3
+export class AppRoutingModule {}