fix: optimize individual pages

TFPower-app/deploy.ps1

@@ -0,0 +1,22 @@
+# 打包项目，携带应用前缀（index.html中相对路径将自动修复为/dev/jxnu/<学号>前缀）
+# /dev/ 项目测试版上传路径
+# /dev/jxnu/<学号> nova-crm项目预留路径
+set NODE_OPTIONS=–max_old_space_size=16000
+node ./node_modules/@angular/cli/bin/ng build --base-href="/dev/jxnu/202226701041/"
+
+# 清空旧文件目录
+obsutil rm obs://nova-cloud/dev/jxnu/202226701041 -r -f -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com"
+
+# 同步文件目录
+obsutil sync ./www obs://nova-cloud/dev/jxnu/202226701041  -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com" -acl=public-read
+
+
+# 授权公开可读
+obsutil chattri obs://nova-cloud/dev/jxnu/202226701041 -r -f -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com" -acl=public-read
+
+# 列举对象
+obsutil ls obs://nova-cloud/dev/jxnu/202226701041  -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com"
+
+
+# 打开链接: app.fmode.cn/dev/jxnu/202226701041/
+# 图片链接: app.fmode.cn/dev/jxnu/storage/20241228/1796-coach.png

TFPower-app/src/app/app.routes.ts

@@ -1,67 +1,71 @@
-import { Routes, RouterModule } from '@angular/router';
-import { PostPageComponent } from './post-page/post-page.component'; // 导入 PostPage 组件
-import { CommunityPage } from './community/community.page';
-import { SharePageComponent } from './share-page/share-page.component';
-import { NgModule } from '@angular/core';
-export const routes: Routes = [
-  {
-    path: '',
-    loadChildren: () => import('./tabs/tabs.routes').then((m) => m.routes),
+import { Routes, RouterModule } from '@angular/router';
+import { PostPageComponent } from './post-page/post-page.component'; // 导入 PostPage 组件
+import { CommunityPage } from './community/community.page';
+import { SharePageComponent } from './share-page/share-page.component';
+import { NgModule } from '@angular/core';
+export const routes: Routes = [
+  {
+    path: '',
+    loadChildren: () => import('./tabs/tabs.routes').then((m) => m.routes),
+  },
+  {
+    path: 'community',
+    loadComponent: () =>
+      import('./community/community.page').then((m) => m.CommunityPage),
+  },
+  { path: '', redirectTo: 'community', pathMatch: 'full' },
+  { path: 'community', component: CommunityPage },
+  { path: 'post-page/:id', component: PostPageComponent }, // 动态详情页面的路由
+  { path: 'share', component: SharePageComponent },
+
+  {
+    path: 'login-page',
+    loadComponent: () =>
+      import('./page/login-page/login-page.page').then((m) => m.LoginPagePage),
+  },
+  {
+    path: 'register-page',
+    loadComponent: () =>
+      import('./page/register-page/register-page.page').then(
+        (m) => m.RegisterPagePage
+      ),
+  },
+  {
+    path: 'modal-edit-page',
+    loadComponent: () =>
+      import('./page/modal/modal-edit-page/modal-edit-page.page').then(
+        (m) => m.ModalEditPagePage
+      ),
+  },
+  {
+    path: 'modal-browse-page',
+    loadComponent: () =>
+      import('./page/modal/modal-browse-page/modal-browse-page.page').then(
+        (m) => m.ModalBrowsePagePage
+      ),
+  },
+  {
+    path: 'modal-newsedit',
+    loadComponent: () =>
+      import('./page/modal/modal-newsedit/modal-newsedit.page').then(
+        (m) => m.ModalNewseditPage
+      ),
+  },
+  {
+    path: 'search-page',
+    loadComponent: () =>
+      import('./page/search-page/search-page.page').then(
+        (m) => m.SearchPagePage
+      ),
+  },
  {
+    path: 'health-page',
+    loadComponent: () => import('./page/homepage/health-page/health-page.page').then( m => m.HealthPagePage)
   },
-  {
-    path: 'community',
-    loadComponent: () =>
-      import('./community/community.page').then((m) => m.CommunityPage),
-  },
-  { path: '', redirectTo: 'community', pathMatch: 'full' },
-  { path: 'community', component: CommunityPage },
-  { path: 'post-page/:id', component: PostPageComponent }, // 动态详情页面的路由
-  { path: 'share', component: SharePageComponent },
-
-  {
-    path: 'login-page',
-    loadComponent: () =>
-      import('./page/login-page/login-page.page').then((m) => m.LoginPagePage),
-  },
-  {
-    path: 'register-page',
-    loadComponent: () =>
-      import('./page/register-page/register-page.page').then(
-        (m) => m.RegisterPagePage
-      ),
-  },
-  {
-    path: 'modal-edit-page',
-    loadComponent: () =>
-      import('./page/modal/modal-edit-page/modal-edit-page.page').then(
-        (m) => m.ModalEditPagePage
-      ),
-  },
-  {
-    path: 'modal-browse-page',
-    loadComponent: () =>
-      import('./page/modal/modal-browse-page/modal-browse-page.page').then(
-        (m) => m.ModalBrowsePagePage
-      ),
-  },
-  {
-    path: 'modal-newsedit',
-    loadComponent: () =>
-      import('./page/modal/modal-newsedit/modal-newsedit.page').then(
-        (m) => m.ModalNewseditPage
-      ),
-  },
-  {
-    path: 'search-page',
-    loadComponent: () =>
-      import('./page/search-page/search-page.page').then(
-        (m) => m.SearchPagePage
-      ),
-  },
-];
 
-@NgModule({
-  imports: [RouterModule.forRoot(routes)],
-  exports: [RouterModule],
-})
-export class AppRoutingModule {}
+];
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes)],
+  exports: [RouterModule],
+})
+export class AppRoutingModule {}

TFPower-app/src/app/component/comp-uploader-hwobs/comp-uploader-hwobs.component.html

@@ -0,0 +1,3 @@
+<!-- 文件选择器 Input -->
+<input type="file" multiple (change)="onFileChange($event)" />
+<button (click)="upload()">上传</button>

TFPower-app/src/app/component/comp-uploader-hwobs/comp-uploader-hwobs.component.scss

@@ -0,0 +1,3 @@
+button {
+  float: right;
+}

TFPower-app/src/app/component/comp-uploader-hwobs/comp-uploader-hwobs.component.spec.ts

@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+
+import { CompUploaderHwobsComponent } from './comp-uploader-hwobs.component';
+
+describe('CompUploaderHwobsComponent', () => {
+  let component: CompUploaderHwobsComponent;
+  let fixture: ComponentFixture<CompUploaderHwobsComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [CompUploaderHwobsComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(CompUploaderHwobsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

TFPower-app/src/app/component/comp-uploader-hwobs/comp-uploader-hwobs.component.ts

@@ -0,0 +1,68 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { HwobsProvider } from '../hwobs.service';
+
+@Component({
+  selector: 'app-comp-uploader-hwobs',
+  templateUrl: './comp-uploader-hwobs.component.html',
+  styleUrls: ['./comp-uploader-hwobs.component.scss'],
+  standalone: true,
+})
+export class CompUploaderHwobsComponent implements OnInit {
+  @Input() url: string = '';
+  @Output() UrlChange: EventEmitter<string> = new EventEmitter<string>();
+
+  uploader: HwobsProvider | undefined;
+  constructor() {}
+
+  ngOnInit() {
+    this.uploader = new HwobsProvider({
+      bucketName: 'nova-cloud',
+      prefix: 'dev/jxnu/storage/',
+      host: 'https://app.fmode.cn/',
+      access_key_id: 'XSUWJSVMZNHLWFAINRZ1',
+      secret_access_key: 'P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6',
+    });
+  }
+
+  file: File | undefined;
+  fileData: any = '';
+  fileList: File[] = [];
+
+  async upload() {
+    let filename = this.file?.name;
+    let dateStr = `${new Date().getFullYear()}${
+      new Date().getMonth() + 1
+    }${new Date().getDate()}`;
+    let hourStr = `${new Date().getHours()}${
+      new Date().getMinutes() + 1
+    }${new Date().getSeconds()}`;
+    let key = `${dateStr}/${hourStr}-${filename}`;
+    if (this.file) {
+      let attachment = await this.uploader?.uploadFile(this.file, key);
+      console.log(attachment);
+      this.url = attachment?.get('url');
+      console.log(this.url);
+
+      this.UrlChange.emit(this.url);
+    }
+  }
+  /**
+   * 文件选择器 选择文件触发事件
+   * @param event
+   */
+  async onFileChange(event: any) {
+    // 将选择的文件列表，赋值给fileList
+    this.fileList = event?.target?.files;
+    // 默认将第一个文件，显示在展示区域
+    this.setFile(event?.target?.files?.[0]);
+  }
+
+  /**
+   * 设置展示区域文件
+   * @param file
+   */
+  async setFile(file: any) {
+    // 将文件设置为展示区域文件
+    this.file = file;
+  }
+}

TFPower-app/src/app/component/draggable-button/draggable-button.component.ts

@@ -32,13 +32,5 @@ export class DraggableButtonComponent implements OnInit {
       component: ModalNewseditPage,
     });
     modal.present();
-    // const { data, role } = await modal.onWillDismiss();
-
-    // if (role === 'confirm') {
-    //   // console.log(data);
-    //   // let news = new CloudNews();
-    //   // let res = await news.add(data);
-    //   // console.log('res', res);
-    // }
   }
 }

TFPower-app/src/app/component/hwobs.service.ts

@@ -0,0 +1,180 @@
+import { Injectable } from '@angular/core';
+
+// @ts-ignore
+import ObsClient from 'esdk-obs-browserjs';
+
+import Parse from 'parse';
+
+/**
+ * HwobsDir 华为OBS目录接口
+ * @public
+ */
+export interface HwobsDir {
+  Prefix: string; // "storage/2023/"
+}
+
+/**
+ * HwobsDir 华为OBS文件接口
+ * @public
+ */
+export interface HwobsFile {
+  ETag: '"f0ec968fe51ab48348307e06476122eb"';
+  Key: string; //"storage/3mkf41033623275.png"
+  LastModified: string; //"2023-11-08T12:03:13.008Z"
+  Owner: object; // {ID: '09971a1979800fb60fbbc00ada51f7e0'}
+  Size: string; //"25839"
+  StorageClass: string; //"STANDARD"
+}
+
+/**
+ * HwobsProvider 华为OBS文件服务
+ * @public
+ */
+export class HwobsProvider {
+  obsClient: ObsClient;
+  bucketName: string;
+  host: string;
+  globalPrefix: string = '';
+  constructor(options: {
+    host: string;
+    bucketName: string;
+    access_key_id: string;
+    secret_access_key: string;
+    prefix?: string;
+    server?: string;
+  }) {
+    this.globalPrefix = options.prefix || '';
+    this.host = options?.host;
+    this.bucketName = options?.bucketName;
+    this.obsClient = new ObsClient({
+      access_key_id: options.access_key_id,
+      secret_access_key: options.secret_access_key,
+      // 这里以华南-广州为例，其他地区请按实际情况填写
+      server: options?.server || 'https://obs.cn-south-1.myhuaweicloud.com',
+    });
+  }
+
+  /**
+   * 目录及检索相关函数
+   */
+  listDir(prefix: any): Promise<{
+    dirs: Array<HwobsDir>;
+    files: Array<HwobsFile>;
+  }> {
+    return new Promise((resolve, reject) => {
+      this.obsClient.listObjects(
+        {
+          Bucket: this.bucketName,
+          Prefix: prefix,
+          Delimiter: '/',
+        },
+        (err: any, result: any) => {
+          if (err) {
+            console.error('Error-->' + err);
+            reject(err);
+          } else {
+            console.log('Status-->' + result.CommonMsg.Status);
+            console.log(result);
+            if (result.CommonMsg.Status < 300 && result.InterfaceResult) {
+              for (var j in result.InterfaceResult.Contents) {
+                console.log('Contents[' + j + ']:');
+                console.log(
+                  'Key-->' + result.InterfaceResult.Contents[j]['Key']
+                );
+                console.log(
+                  'Owner[ID]-->' +
+                    result.InterfaceResult.Contents[j]['Owner']['ID']
+                );
+              }
+            }
+            let dirs: HwobsDir[] = result.InterfaceResult.CommonPrefixes;
+            let files: HwobsFile[] = result.InterfaceResult.Contents;
+            resolve({ dirs: dirs, files: files });
+          }
+        }
+      );
+    });
+  }
+
+  /**
+   * 文件上传相关函数
+   * @param file
+   * @param key
+   * @returns
+   */
+  async uploadFile(file: File, key: string): Promise<Parse.Object> {
+    console.log(this.globalPrefix, key);
+    // key 文件上传后的全部路径
+    // /storage/<公司账套>/<应用名称>/年月日/<文件名>.<文件后缀>
+    // /storage/web2023/<学号>/年月日/<文件名>.<文件后缀>
+    let attach = await this.checkFileExists(file);
+    if (attach?.id) return attach;
+    return new Promise((resolve, reject) => {
+      this.obsClient.putObject(
+        {
+          Bucket: this.bucketName,
+          Key: this.globalPrefix + key,
+          SourceFile: file,
+        },
+        async (err: any, result: any) => {
+          if (err) {
+            console.error('Error-->' + err);
+            reject(err);
+          } else {
+            console.log('Status-->' + result.CommonMsg.Status);
+            let attach = await this.saveAttachment(
+              file,
+              this.globalPrefix + key
+            );
+            resolve(attach);
+          }
+        }
+      );
+    });
+  }
+  Attachment = Parse.Object.extend('Attachment');
+
+  async checkFileExists(file: any): Promise<Parse.Object> {
+    let hash = await this.getFileHash(file);
+    // 文件HASH查重,避免重复上传
+    let attach: Parse.Object;
+    let query = new Parse.Query('Attachment');
+    query.equalTo('hash', hash);
+    query.equalTo('size', file.size);
+    let exists: any = await query.first();
+    if (!exists?.id) exists = new this.Attachment();
+    attach = exists;
+    return attach;
+  }
+  async saveAttachment(file: File, key: string) {
+    console.log('saveAttachment', key);
+    let hash = await this.getFileHash(file);
+    let attach = await this.checkFileExists(file);
+    attach.set('name', file.name);
+    attach.set('size', file.size);
+    attach.set('mime', file.type);
+    attach.set('url', this.host + key);
+    attach.set('hash', hash);
+    attach = await attach.save();
+    return attach;
+  }
+
+  async getFileHash(file: File) {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.onload = async (event: any) => {
+        const buffer = event.target.result;
+        const hashBuffer = await crypto.subtle.digest('SHA-256', buffer);
+        const hashArray = Array.from(new Uint8Array(hashBuffer));
+        const hashHex = hashArray
+          .map((byte) => byte.toString(16).padStart(2, '0'))
+          .join('');
+        resolve(hashHex);
+      };
+      reader.onerror = (event: any) => {
+        reject(event.target.error);
+      };
+      reader.readAsArrayBuffer(file);
+    });
+  }
+}

TFPower-app/src/app/page/login-page/login-page.page.html

@@ -13,7 +13,9 @@
       </ion-input>
 
       <!-- 登录按钮 -->
-      <ion-button expand="full" (click)="login()" class="auth-button">登录</ion-button>
+      <ion-button expand="full" (click)="login()" class="auth-button" (click)="setOpen(false)">登录</ion-button>
+      <ion-alert [isOpen]="isAlertOpen" [header]="header" [message]="errormsg" [buttons]="alertButtons"
+        (didDismiss)="setOpen(false)"></ion-alert>
 
       <div class="reminder">还没有账号？前往 <a (click)="navigateTo('register-page')">注册</a></div>
 

TFPower-app/src/app/page/login-page/login-page.page.ts

@@ -3,6 +3,7 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { NavController } from '@ionic/angular';
 import {
+  IonAlert,
   IonButton,
   IonContent,
   IonHeader,
@@ -28,6 +29,7 @@ import { User } from 'src/app/tab4/tab4.page';
     FormsModule,
     IonButton,
     IonInput,
+    IonAlert,
   ],
 })
 export class LoginPagePage implements OnInit {
@@ -48,6 +50,15 @@ export class LoginPagePage implements OnInit {
     likes: 0,
   };
 
+  header: string = '';
+  errormsg: string = '';
+  alertButtons = ['确认'];
+  isAlertOpen = false;
+
+  setOpen(isOpen: boolean) {
+    this.isAlertOpen = isOpen;
+  }
+
   constructor(private navCtrl: NavController, private router: Router) {}
 
   navigateTo(path: string) {
@@ -66,7 +77,6 @@ export class LoginPagePage implements OnInit {
       this.is_login = true;
       let user = new CloudUser();
       this.currentUser = await user.login(this.username, this.password);
-
       if (this.currentUser) {
         this.user.avatar = this.currentUser.data.avatar;
         this.user.username = this.currentUser.data.username;
@@ -81,14 +91,17 @@ export class LoginPagePage implements OnInit {
         localStorage.setItem('userData', JSON.stringify(this.currentUser.data));
         localStorage.setItem('is_login', 'true');
         console.log('登录成功');
-
         this.router.navigate([`/tabs/tab4`]);
-        // this.refreshPage();
-        // let is_login = localStorage.getItem('is_login');
-        // if (is_login) {
-        //   this.router.navigate([`/tabs/tab4`]);
-        // }
       }
+      if (!this.currentUser) {
+        this.setOpen(true);
+        this.header = '错误信息';
+        this.errormsg = '用户名或密码错误';
+      }
+    } else {
+      this.setOpen(true);
+      this.header = '提示信息';
+      this.errormsg = '用户名或密码为空';
     }
   }
   refreshPage() {

TFPower-app/src/app/page/modal/modal-edit-page/modal-edit-page.page.html

@@ -10,6 +10,9 @@
   </ion-toolbar>
 </ion-header>
 <ion-content class="ion-padding">
+  <ion-item>
+    <app-comp-uploader-hwobs [url]="uploadUrl" (UrlChange)="UrlChange($event)"></app-comp-uploader-hwobs>
+  </ion-item>
   <ion-item>
     <ion-input label="邮箱" [value]="email" placeholder="example@qq.com" (ionInput)="userInputEmail($event)"></ion-input>
   </ion-item>

TFPower-app/src/app/page/modal/modal-edit-page/modal-edit-page.page.ts

@@ -10,6 +10,7 @@ import {
   IonToolbar,
   ModalController,
 } from '@ionic/angular/standalone';
+import { CompUploaderHwobsComponent } from 'src/app/component/comp-uploader-hwobs/comp-uploader-hwobs.component';
 
 @Component({
   selector: 'app-modal-edit-page',
@@ -25,9 +26,11 @@ import {
     IonButton,
     IonItem,
     IonInput,
+    CompUploaderHwobsComponent,
   ],
 })
 export class ModalEditPagePage implements OnInit {
+  avatar: string = '';
   name: string = '';
   email: string = '';
   phoneNumber: string = '';
@@ -58,6 +61,7 @@ export class ModalEditPagePage implements OnInit {
     let userCache = localStorage.getItem('userData');
     if (userCache) {
       let userData = JSON.parse(userCache);
+      this.avatar = userData.avatar;
       this.age = userData.age;
       this.sex = userData.sex;
       this.email = userData.email;
@@ -73,6 +77,7 @@ export class ModalEditPagePage implements OnInit {
 
   confirm() {
     let userData = {
+      avatar: this.avatar,
       email: this.email,
       phoneNumber: this.phoneNumber,
       sex: this.sex,
@@ -84,5 +89,11 @@ export class ModalEditPagePage implements OnInit {
     return this.modalCtrl.dismiss(userData, 'confirm');
   }
 
+  // 上传组件
+  uploadUrl: string = '';
+  UrlChange(ev: any) {
+    this.uploadUrl = ev;
+    this.avatar = this.uploadUrl.replace(/\s+/g, '');
+  }
   ngOnInit() {}
 }

TFPower-app/src/app/page/modal/modal-newsedit/modal-newsedit.page.html

@@ -19,6 +19,9 @@
   </ion-toolbar>
 </ion-header>
 <ion-content class="ion-padding">
+  <ion-item>
+    <app-comp-uploader-hwobs [url]="uploadUrl" (UrlChange)="UrlChange($event)"></app-comp-uploader-hwobs>
+  </ion-item>
   <ion-item>
     <ion-input label="主题" labelPlacement="stacked" placeholder="theme" (ionInput)="InputTheme($event)"></ion-input>
   </ion-item>
@@ -30,7 +33,7 @@
   </ion-item>
   <ion-item>
     <ion-textarea label="文章" labelPlacement="stacked" placeholder="article" [autoGrow]="true" [counter]="true"
-      maxlength="2500" (ionInput)="InputArticle($event)"></ion-textarea>
+      maxlength="10000" (ionInput)="InputArticle($event)"></ion-textarea>
   </ion-item>
 
 </ion-content>

TFPower-app/src/app/page/modal/modal-newsedit/modal-newsedit.page.ts

@@ -15,6 +15,7 @@ import {
   ModalController,
   IonToast,
 } from '@ionic/angular/standalone';
+import { CompUploaderHwobsComponent } from 'src/app/component/comp-uploader-hwobs/comp-uploader-hwobs.component';
 
 @Component({
   selector: 'app-modal-newsedit',
@@ -38,9 +39,11 @@ import {
     IonInput,
     IonTextarea,
     IonToast,
+    CompUploaderHwobsComponent,
   ],
 })
 export class ModalNewseditPage implements OnInit {
+  illustration: string = '';
   theme: string = '';
   title: string = '';
   column: string = '';
@@ -49,6 +52,12 @@ export class ModalNewseditPage implements OnInit {
   isToastOpenDanger = false;
   isToastOpenWaring = false;
 
+  uploadUrl: string = '';
+  UrlChange(ev: any) {
+    this.uploadUrl = ev;
+    this.illustration = this.uploadUrl.replace(/\s+/g, '');
+  }
+
   setOpenSuccess(isOpen: boolean) {
     this.isToastOpenSuccess = isOpen;
   }
@@ -82,6 +91,7 @@ export class ModalNewseditPage implements OnInit {
   async confirm() {
     let newsData = {
       author: new CloudUser().toPointer(),
+      illustration: this.illustration,
       theme: this.theme,
       title: this.title,
       column: this.column,

TFPower-app/src/app/page/search-page/search-page.page.html

@@ -4,7 +4,6 @@
     <ion-buttons slot="start">
       <ion-back-button defaultHref="/tabs/tab1"></ion-back-button>
     </ion-buttons>
-    <!-- <ion-title>搜索</ion-title> -->
     <ion-searchbar [(ngModel)]="userInput" placeholder="请输入" (keydown.enter)="confirm()"></ion-searchbar>
   </ion-toolbar>
 </ion-header>

TFPower-app/src/app/page/search-page/search-page.page.ts

@@ -22,6 +22,17 @@ import {
 } from '@ionic/angular/standalone';
 import { CloudQuery } from 'src/lib/cyxncloud';
 import { ModalBrowsePagePage } from '../modal/modal-browse-page/modal-browse-page.page';
+interface Article {
+  article: string;
+  author: { objectId: string; __type: string; className: string };
+  column: string;
+  createdAt: string;
+  illustration: string;
+  objectId: string;
+  theme: string;
+  title: string;
+  updatedAt: string;
+}
 
 @Component({
   selector: 'app-search-page',
@@ -73,8 +84,7 @@ export class SearchPagePage implements OnInit {
     modal.present();
   }
 
-  // 搜索新闻
-  newslists: any[] = [];
+  newslists: Article[] = [];
   is_loading: boolean = true;
 
   async getAllNews() {
@@ -95,22 +105,34 @@ export class SearchPagePage implements OnInit {
     this.is_loading = false;
   }
 
-  needlists: any[] = [];
-  getneeds(userinput: string) {
-    // 清空 needlists
+  needlists: Article[] = [];
+  getneeds(userinput: string): any {
+    // 清空 needlists，防止重复数据
     this.needlists = [];
 
-    // 遍历 newslists，检查 theme 是否在 userinput 中
+    if (!userinput.trim()) {
+      return;
+    }
+
     this.newslists.forEach((item) => {
-      // 使用 includes 来检查 userinput 中是否包含 item.theme
-      if (userinput.includes(item.theme)) {
+      // 使用 includes 进行模糊匹配，判断标题、文章内容、主题等字段
+      const titleMatch = item.title
+        .toLowerCase()
+        .includes(userinput.toLowerCase());
+      // const articleMatch = item.article
+      //   .toLowerCase()
+      //   .includes(userinput.toLowerCase());
+      const themeMatch = item.theme
+        .toLowerCase()
+        .includes(userinput.toLowerCase());
+
+      // if (titleMatch || articleMatch || themeMatch) {
+      if (titleMatch || themeMatch) {
         this.needlists.push(item);
       }
     });
 
-    console.log(this.needlists);
-
-    // 返回匹配的结果
+    console.log('匹配的文章：', this.needlists);
     return this.needlists;
   }
 }

TFPower-app/src/app/tab1/tab1.page.ts

@@ -128,13 +128,13 @@ export class Tab1Page implements OnInit {
   // 横向导航栏
   navItems = [
     { label: '首页', link: '/home' },
-    { label: '健康·生活', link: '/health' },
+    { label: '健康', link: '/health' },
+    { label: '生活', link: '/live' },
     { label: '社会', link: '/society' },
-    { label: '法制', link: '/legal' },
-    { label: '教育', link: '/education' },
     { label: '科普', link: '/science' },
     { label: '体育', link: '/physical' },
     { label: '文旅', link: '/cultural' },
+    { label: '教育', link: '/education' },
   ];
   ngAfterViewInit() {
     // 在视图初始化之后动态生成导航按钮

TFPower-app/src/app/tab4/tab4.page.ts

@@ -27,7 +27,7 @@ import { CommonModule } from '@angular/common';
 export interface User {
   avatar: string;
   username: string;
-  age: number | null;
+  age: number;
   sex: string;
   email: string;
   phoneNumber: string;
@@ -86,6 +86,7 @@ export class Tab4Page implements OnInit {
     let userCache = localStorage.getItem('userData');
     if (userCache) {
       let userData = JSON.parse(userCache);
+      console.log(userData);
       this.user.avatar = userData.avatar;
       this.user.username = userData.username;
       this.user.age = userData.age;
@@ -118,9 +119,8 @@ export class Tab4Page implements OnInit {
     modal.present();
     const { data, role } = await modal.onWillDismiss();
     if (role === 'confirm') {
-      console.log(data);
       this.userChangeInfo = data;
-      this.updateUser();
+      await this.updateUser();
     }
   }
   async logout() {
@@ -145,6 +145,8 @@ export class Tab4Page implements OnInit {
     let user = new CloudUser();
     let res = await user.update(this.userChangeInfo);
     console.log('成功更新用户信息');
+    this.logout();
+    this.navigateTo('login-page');
   }
 
   newslists: any[] = [];

TFPower-app/src/lib/cyxncloud.ts

@@ -199,6 +199,7 @@ export class CloudUser {
     this.objectId = result.objectId;
     this.sessionToken = result.sessionToken;
     this.data = result;
+
     return this;
   }
 
@@ -259,7 +260,6 @@ export class CloudUser {
       mode: 'cors',
       credentials: 'omit',
     });
-    console.log('update: ', this);
 
     return this;
   }