0225268 4 months ago
parent
commit
9a3c87f405

+ 30 - 29
src/app/app-routing.module.ts

@@ -1,33 +1,34 @@
-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)
-  },
-  {
-    path: 'feedback',
-    loadChildren: () => import('./feedback/feedback.module').then( m => m.FeedbackPageModule)
-  },
  {
+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)
+  },
+  {
+    path: 'feedback',
+    loadChildren: () => import('./feedback/feedback.module').then( m => m.FeedbackPageModule)
+  },
+  {
     path: 'settings',
     path: 'settings',
     loadChildren: () => import('./settings/settings.module').then( m => m.SettingsPageModule)
     loadChildren: () => import('./settings/settings.module').then( m => m.SettingsPageModule)
   }
   }
 
 
-
-];
-@NgModule({
-  imports: [
-    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
-  ],
-  exports: [RouterModule]
-})
-export class AppRoutingModule {}
+
+];
+@NgModule({
+  imports: [
+    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
+  ],
+  exports: [RouterModule]
+})
+export class AppRoutingModule {}

+ 1 - 1
src/app/settings/settings-routing.module.ts

@@ -14,4 +14,4 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule],
   exports: [RouterModule],
 })
 })
-export class SettingsPageRoutingModule {}
+export class SettingsPageRoutingModule {}

+ 2 - 1
src/app/settings/settings.page.ts

@@ -10,7 +10,7 @@ export class SettingsPage implements OnInit {
   constructor(private navCtrl: NavController) { }
   constructor(private navCtrl: NavController) { }
   ngOnInit() {
   ngOnInit() {
   }
   }
-  editProfile() {
+   editProfile() {
     // 编辑个人信息
     // 编辑个人信息
   }
   }
 
 
@@ -41,4 +41,5 @@ export class SettingsPage implements OnInit {
   viewAboutPage() {
   viewAboutPage() {
     // 查看关于页面
     // 查看关于页面
   }
   }
+
 }
 }

+ 2 - 2
src/app/tab3/tab3.page.spec.ts

@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { IonicModule } from '@ionic/angular';
 import { IonicModule } from '@ionic/angular';
 
 
-import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';
+//import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';
 
 
 import { Tab3Page } from './tab3.page';
 import { Tab3Page } from './tab3.page';
 
 
@@ -12,7 +12,7 @@ describe('Tab3Page', () => {
   beforeEach(async () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
     await TestBed.configureTestingModule({
       declarations: [Tab3Page],
       declarations: [Tab3Page],
-      imports: [IonicModule.forRoot(), ExploreContainerComponentModule]
+      //imports: [IonicModule.forRoot(), ExploreContainerComponentModule]
     }).compileComponents();
     }).compileComponents();
 
 
     fixture = TestBed.createComponent(Tab3Page);
     fixture = TestBed.createComponent(Tab3Page);

+ 0 - 0
src/app/tab4/assets/avatar.jpg