tab1

src/app/app-routing.module.ts

@@ -10,6 +10,15 @@ const routes: Routes = [
     path: 'user',
     loadChildren: () => import('../modules/user/user.module').then(m => m.UserModule)
   },
+  {
+    path: 'topic',
+    loadChildren: () => import('../modules/topic/topic.module').then(m => m.TopicModule)
+  },
+  {
+    path: 'home',
+    loadChildren: () => import('../modules/home/home.module').then(m => m.HomeModule)
+  },
+  
 ];
 @NgModule({
   imports: [

src/app/tab1/tab1.page.html

@@ -5,19 +5,23 @@
   <ion-header>
     <ion-toolbar>
       <ion-segment value="all">
-        <ion-segment-button value="attention">
-          <ion-label>关注</ion-label>
-        </ion-segment-button>
-        <ion-segment-button value="recommend">
+        <ion-segment-button routerLink="/tabs/tab1" value="attention">
           <ion-label>推荐</ion-label>
         </ion-segment-button>
-        <ion-segment-button value="special">
+        <ion-segment-button routerLink="/home/special" value="recommend">
           <ion-label>专题</ion-label>
         </ion-segment-button>
+        <ion-segment-button routerLink="/home/attention" value="special">
+          <ion-label>关注</ion-label>
+        </ion-segment-button>
       </ion-segment>
     </ion-toolbar>
   </ion-header>
 
+
+
+
+
   <ion-card>
     <img alt="Silhouette of mountains" src="https://ionicframework.com/docs/img/demos/card-media.png" />
     

src/app/tab1/tab1.page.scss

@@ -19,4 +19,6 @@
     text-overflow: ellipsis;
     -webkit-line-clamp: 2; /* 设置最多显示两行文字 */
     max-height: 2.6em; /* 控制最大高度，相当于两行文字的高度 */
-  }
+  }
+
+

src/app/tab2/tab2.page.html

@@ -5,17 +5,17 @@
   <ion-searchbar show-cancel-button="focus" animated="true" placeholder="Animated"></ion-searchbar>
 
   <ion-list lines="none">
-    <ion-list-header>
-      <ion-label>Default</ion-label>
-    </ion-list-header>
     <ion-item>
-      <ion-label>No Lines</ion-label>
+      <ion-label>文案收藏馆</ion-label>
+      <ion-button fill="clear" routerLink="/topic/theme">>></ion-button>
     </ion-item>
     <ion-item>
-      <ion-label>No Lines</ion-label>
+      <ion-label>夏日晚霞</ion-label>
+      <ion-button fill="clear" routerLink="/topic/theme">>></ion-button>
     </ion-item>
     <ion-item>
-      <ion-label>No Lines</ion-label>
+      <ion-label>时空对话</ion-label>
+      <ion-button fill="clear" routerLink="/topic/theme">>></ion-button>
     </ion-item>
   </ion-list>
 

src/app/tab2/tab2.page.scss

@@ -1,4 +1,6 @@
 ion-list-header {
     --border-style: none;
   }
- 
+  ion-button {
+    color: black;
+  } 

src/app/tab3/tab3.page.html

@@ -1,17 +1,7 @@
-<ion-header [translucent]="true">
-  <ion-toolbar>
-    <ion-title>
-      我的
-    </ion-title>
-  </ion-toolbar>
-</ion-header>
+
 
 <ion-content [fullscreen]="true">
-  <ion-header collapse="condense">
-    <ion-toolbar>
-      <ion-title size="large">Tab 3</ion-title>
-    </ion-toolbar>
-  </ion-header>
+
 
 
   

src/app/tabs/tabs-routing.module.ts

@@ -19,6 +19,10 @@ const routes: Routes = [
         path: 'tab3',
         loadChildren: () =>import('../../modules/user/mine/mine.module').then(mod => mod.MinePageModule)
       },
+      {
+        path: 'tab3',
+        loadChildren: () => import('../../modules/user/mine/mine.module').then(mod => mod.MinePageModule)
+    },
       {
         path: '',
         redirectTo: '/tabs/tab1',

src/modules/home/attention/attention-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { AttentionPage } from './attention.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AttentionPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class AttentionPageRoutingModule {}

src/modules/home/attention/attention.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { AttentionPageRoutingModule } from './attention-routing.module';
+
+import { AttentionPage } from './attention.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    AttentionPageRoutingModule
+  ],
+  declarations: [AttentionPage]
+})
+export class AttentionPageModule {}

src/modules/home/attention/attention.page.html

@@ -0,0 +1,15 @@
+<ion-header [translucent]="true">
+  <ion-button fill="clear" routerLink="/tabs/tab1">〈</ion-button>
+
+  <ion-toolbar>
+    <ion-title>attention</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true">
+  <ion-header collapse="condense">
+    <ion-toolbar>
+      <ion-title size="large">attention</ion-title>
+    </ion-toolbar>
+  </ion-header>
+</ion-content>

src/modules/home/attention/attention.page.spec.ts

@@ -0,0 +1,17 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AttentionPage } from './attention.page';
+
+describe('AttentionPage', () => {
+  let component: AttentionPage;
+  let fixture: ComponentFixture<AttentionPage>;
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AttentionPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/modules/home/attention/attention.page.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-attention',
+  templateUrl: './attention.page.html',
+  styleUrls: ['./attention.page.scss'],
+})
+export class AttentionPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/modules/home/home-routing.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+const routes: Routes = [
+  {
+    path: 'attention',
+    loadChildren: () => import('./attention/attention.module').then( m => m.AttentionPageModule)
+  },
+  {
+    path: 'special',
+    loadChildren: () => import('./special/special.module').then( m => m.SpecialPageModule)
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class HomeRoutingModule { }

src/modules/home/home.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { HomeRoutingModule } from './home-routing.module';
+
+
+@NgModule({
+  declarations: [],
+  imports: [
+    CommonModule,
+    HomeRoutingModule
+  ]
+})
+export class HomeModule { }

src/modules/home/special/special-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { SpecialPage } from './special.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: SpecialPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class SpecialPageRoutingModule {}

src/modules/home/special/special.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { SpecialPageRoutingModule } from './special-routing.module';
+
+import { SpecialPage } from './special.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    SpecialPageRoutingModule
+  ],
+  declarations: [SpecialPage]
+})
+export class SpecialPageModule {}

src/modules/home/special/special.page.html

@@ -0,0 +1,15 @@
+<ion-header [translucent]="true">
+  <ion-button fill="clear" routerLink="/tabs/tab1">〈</ion-button>
+
+  <ion-toolbar>
+    <ion-title>专题</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true">
+  <ion-header collapse="condense">
+    <ion-toolbar>
+      <ion-title size="large">专题</ion-title>
+    </ion-toolbar>
+  </ion-header>
+</ion-content>

src/modules/home/special/special.page.spec.ts

@@ -0,0 +1,17 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { SpecialPage } from './special.page';
+
+describe('SpecialPage', () => {
+  let component: SpecialPage;
+  let fixture: ComponentFixture<SpecialPage>;
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SpecialPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/modules/home/special/special.page.ts

@@ -0,0 +1,16 @@
+import { Component, OnInit } from '@angular/core';
+import { Route, Router } from '@angular/router';
+
+@Component({
+  selector: 'app-special',
+  templateUrl: './special.page.html',
+  styleUrls: ['./special.page.scss'],
+})
+export class SpecialPage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/modules/topic/theme/theme-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ThemePage } from './theme.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ThemePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ThemePageRoutingModule {}

src/modules/topic/theme/theme.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ThemePageRoutingModule } from './theme-routing.module';
+
+import { ThemePage } from './theme.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    ThemePageRoutingModule
+  ],
+  declarations: [ThemePage]
+})
+export class ThemePageModule {}

src/modules/topic/theme/theme.page.html

@@ -0,0 +1,49 @@
+
+<ion-content [fullscreen]="true">
+  <ion-button fill="clear" routerLink="/tabs/tab2">〈</ion-button>
+
+  <ion-card>
+    <ion-card-header>
+      <ion-item>
+        <ion-thumbnail slot="start">
+          <img alt="Silhouette of mountains" src="https://p.qqan.com/up/2021-6/16239805423883054.jpg" />
+        </ion-thumbnail>
+        <ion-label>你是年少的欢喜</ion-label>
+      </ion-item>
+      <ion-card-subtitle>少年</ion-card-subtitle>
+    </ion-card-header>
+    <ion-card-content>
+      青春是窗外的梧桐树，是骄阳，是满怀希望和梦想 希望少年不负众望.
+    </ion-card-content>
+  </ion-card>
+  <ion-card>
+    <ion-card-header>
+      <ion-item>
+        <ion-thumbnail slot="start">
+          <img alt="Silhouette of mountains" src="https://img.keaitupian.cn/uploads/2020/10/16/3678d47b937840248dea3a84caf34f88.jpg" />
+        </ion-thumbnail>
+        <ion-label>仰灿</ion-label>
+      </ion-item>
+      <ion-card-subtitle>青春</ion-card-subtitle>
+    </ion-card-header>
+    <ion-card-content>
+      白云是蓝天正在放的风筝，青春是操场奔跑的我们
+    </ion-card-content>
+  </ion-card>
+
+  <ion-card>
+    <ion-card-header>
+      <ion-item>
+        <ion-thumbnail slot="start">
+          <img alt="Silhouette of mountains" src="https://pic3.zhimg.com/v2-cd49bd975243e58bfab5d75cc9f1b9f1_r.jpg?source=1940ef5c" />
+        </ion-thumbnail>
+        <ion-label>仲夏夜之梦</ion-label>
+      </ion-item>
+      <ion-card-subtitle>星河</ion-card-subtitle>
+    </ion-card-header>
+    <ion-card-content>
+      仲夏夜里蝉声四起，越发显得四下安宁，唯有夜空上一把星河如练，掬一捧光华万点，皎皎万岁春岁春
+    </ion-card-content>
+  </ion-card>
+
+</ion-content>

src/modules/topic/theme/theme.page.spec.ts

@@ -0,0 +1,17 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ThemePage } from './theme.page';
+
+describe('ThemePage', () => {
+  let component: ThemePage;
+  let fixture: ComponentFixture<ThemePage>;
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ThemePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/modules/topic/theme/theme.page.ts

@@ -0,0 +1,16 @@
+import { Component, OnInit } from '@angular/core';
+import { Route, Router } from '@angular/router';
+
+@Component({
+  selector: 'app-theme',
+  templateUrl: './theme.page.html',
+  styleUrls: ['./theme.page.scss'],
+})
+export class ThemePage implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/modules/topic/topic-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+const routes: Routes = [
+  {
+    path: 'theme',
+    loadChildren: () => import('./theme/theme.module').then( m => m.ThemePageModule)
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class TopicRoutingModule { }

src/modules/topic/topic.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { TopicRoutingModule } from './topic-routing.module';
+
+
+@NgModule({
+  declarations: [],
+  imports: [
+    CommonModule,
+    TopicRoutingModule
+  ]
+})
+export class TopicModule { }

src/modules/user/edit-info/edit-info.page.html

@@ -1,13 +1,50 @@
 <ion-header [translucent]="true">
   <ion-toolbar>
-    <ion-title>edit-info</ion-title>
+    <ion-title>资料编辑</ion-title>
   </ion-toolbar>
 </ion-header>
 
 <ion-content [fullscreen]="true">
   <ion-header collapse="condense">
     <ion-toolbar>
-      <ion-title size="large">edit-info</ion-title>
+      <ion-title size="large">资料编辑</ion-title>
     </ion-toolbar>
   </ion-header>
+
+
+  <ion-card>
+    <ion-card-header>
+      <ion-card-title>{{currentUser?.get('username')}} - {{currentUser?.id}}</ion-card-title>
+    </ion-card-header>
+    <ion-card-content>
+      <ion-list>
+        <ion-item>
+          <ion-input label="姓名" type="text" [(ngModel)]="userInfo.name"></ion-input>
+        </ion-item>
+        <ion-item>
+          <ion-input label="手机" type="tel" [(ngModel)]="userInfo.mobile"></ion-input>
+        </ion-item>
+        <ion-item>
+          <ion-select label="性别" [(ngModel)]="userInfo.gender">
+            <ion-select-option value="男">男</ion-select-option>
+            <ion-select-option value="女">女</ion-select-option>
+          </ion-select>
+        </ion-item>
+        <ion-item>
+          <ion-label>生日</ion-label>
+          <ion-datetime-button datetime="birthday"></ion-datetime-button>
+          <ion-modal [keepContentsMounted]="true">
+            <ng-template>
+              <ion-datetime id="birthday" displayFormat="MM/DD/YYYY" [(ngModel)]="userInfo.birthday"></ion-datetime>
+            </ng-template>
+          </ion-modal>
+        </ion-item>
+      </ion-list>
+    </ion-card-content>
+  </ion-card>
+
+  <ion-button expand="block" (click)="save()">保存</ion-button>
+  <ion-button expand="block" (click)="cancel()">取消</ion-button>
+
+
 </ion-content>

src/modules/user/edit-info/edit-info.page.ts

@@ -1,4 +1,7 @@
+
 import { Component, OnInit } from '@angular/core';
+import { NavController } from '@ionic/angular';
+import * as Parse from 'parse';
 
 @Component({
   selector: 'app-edit-info',
@@ -7,9 +10,51 @@ import { Component, OnInit } from '@angular/core';
 })
 export class EditInfoPage implements OnInit {
 
-  constructor() { }
+
+  userInfo: any = {
+    name: '',
+    mobile: '',
+    gender: '',
+    birthday: ''
+  };
+
+ 
+  currentUser:Parse.User|undefined
+  constructor(private navController: NavController) {}
 
   ngOnInit() {
+    this.currentUser = Parse.User.current();
+    if (this.currentUser) {
+      // 修改uesrInfo赋值逻辑，仅加载被编辑的字段属性值
+      let json = this.currentUser.toJSON();
+      for (const key in json) {
+        if (this.userInfo.hasOwnProperty(key)) {
+          this.userInfo[key] = json[key]
+        }
+      }
+    }
+    console.log(this.userInfo)
+  }
+
+  save() {
+    this.currentUser = Parse.User.current();
+    if (this.currentUser) {
+      console.log(this.userInfo)
+      for (const key in this.userInfo) {
+        if (this.userInfo.hasOwnProperty(key)) {
+          this.currentUser.set(key, this.userInfo[key]);
+        }
+      }
+      this.currentUser.save().then(() => {
+        this.navController.back();
+      }).catch((error) => {
+        console.error('Error saving user data: ', error);
+      });
+    }
+  }
+
+  cancel() {
+    this.navController.back();
   }
 
-}
+}

src/modules/user/login/login.page.html

@@ -31,6 +31,6 @@
   <ion-button (click)="register()" fill="clear">注册</ion-button>
 </ion-card>  
 
-<ion-button  expand="block" routerLink="/tabs/tab3">返回</ion-button>
+<ion-button  expand="block" (click)="back()">返回</ion-button>
 
 </ion-content>

src/modules/user/login/login.page.ts

@@ -85,4 +85,10 @@ export class LoginPage implements OnInit {
     await alert.present();
   }
 
+  back(){
+    let path = "/tabs/tab3"
+    path = localStorage.getItem("LOGIN_REDIRECT_URL") || path;
+    this.router.navigateByUrl(path)
+  }
+
 }

src/modules/user/mine/mine.page.html

@@ -1,24 +1,19 @@
-<ion-header [translucent]="true">
-  <ion-toolbar>
-    <ion-title>我的</ion-title>
-  </ion-toolbar>
-</ion-header>
 
 <ion-content [fullscreen]="true">
-  <ion-header collapse="condense">
-    <ion-toolbar>
-      <ion-title size="large">我的</ion-title>
-    </ion-toolbar>
-  </ion-header>
 
   <ion-card>
-    <img alt="Silhouette of mountains" src="https://ionicframework.com/docs/img/demos/card-media.png" />
+    <img alt="Silhouette of mountains" src="https://cdn.pixabay.com/photo/2017/07/10/23/45/cubes-2492010_1280.jpg" />
     <ion-card-header>
       <ion-card-title>{{user?.get("username") || '未登录'}}</ion-card-title>
       <ion-card-subtitle *ngIf="!user?.id">请登录后使用</ion-card-subtitle>
     </ion-card-header>
+
+    <ion-card-content>
+      {{user?.get("name")}}-{{user?.get("gender")}}
+    </ion-card-content>
   
     <ion-button *ngIf="!user?.id" fill="clear" routerLink="/user/login">去登录</ion-button>
+    <ion-button *ngIf="user?.id" fill="clear" routerLink="/user/edit/info">编辑</ion-button>
     <ion-button *ngIf="user?.id" fill="clear" (click)="logout()">登出</ion-button>
     
   </ion-card>

src/modules/user/user-routing.module.ts

@@ -5,6 +5,8 @@ const routes: Routes = [
   {path:"login",loadChildren: () =>import('./login/login.module').then(mod => mod.LoginPageModule)},
   {path:"miner",loadChildren: () =>import('./mine/mine.module').then(mod => mod.MinePageModule)},
   {path:"edit/info",loadChildren: () =>import('./edit-info/edit-info.module').then(mod => mod.EditInfoPageModule)},
+  
+
 ];
 
 @NgModule({