Merge branch 'master' of http://git.fmode.cn:3000/yuebuzu/s202226701018

wisdom-app/src/app/page/page-authority-experts/page-authority-experts.component.html

@@ -0,0 +1,7 @@
+<ion-header [translucent]="true">
+  <ion-toolbar class="searchbar">
+    <div>
+      <ion-button (click)="backhome()" color="primary" slot="start">{{back}}</ion-button>
+    </div>
+  </ion-toolbar>
+</ion-header>

wisdom-app/src/app/page/page-authority-experts/page-authority-experts.component.spec.ts

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

wisdom-app/src/app/page/page-authority-experts/page-authority-experts.component.ts

@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { IonButton, IonHeader, IonToolbar } from '@ionic/angular/standalone';
+
+@Component({
+  selector: 'page-authority-experts',
+  templateUrl: './page-authority-experts.component.html',
+  styleUrls: ['./page-authority-experts.component.scss'],
+  standalone: true,
+  imports:[
+    IonHeader,IonToolbar,IonButton,
+  ]
+})
+export class PageAuthorityExpertsComponent  implements OnInit {
+
+  constructor(
+    private router: Router
+  ) { }
+
+  ngOnInit() {}
+  back:string = "<";
+  backhome(){
+    this.router.navigate(['/tabs/tab1']);
+  }
+
+}

wisdom-app/src/app/page/page-drug-purchase/page-drug-purchase.component.html

@@ -0,0 +1,7 @@
+<ion-header [translucent]="true">
+  <ion-toolbar class="searchbar">
+    <div>
+      <ion-button (click)="backhome()" color="primary" slot="start">{{back}}</ion-button>
+    </div>
+  </ion-toolbar>
+</ion-header>

wisdom-app/src/app/page/page-drug-purchase/page-drug-purchase.component.spec.ts

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

wisdom-app/src/app/page/page-drug-purchase/page-drug-purchase.component.ts

@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { IonButton, IonHeader, IonToolbar } from '@ionic/angular/standalone';
+
+@Component({
+  selector: 'page-drug-purchase',
+  templateUrl: './page-drug-purchase.component.html',
+  styleUrls: ['./page-drug-purchase.component.scss'],
+  standalone: true,
+  imports:[
+    IonHeader,IonToolbar,IonButton,
+  ]
+})
+export class PageDrugPurchaseComponent  implements OnInit {
+
+  constructor(
+    private router: Router
+  ) { }
+
+  ngOnInit() {}
+  back:string = "<";
+  backhome(){
+    this.router.navigate(['/tabs/tab1']);
+  }
+
+}

wisdom-app/src/app/page/page-health-information/page-health-information.component.html

@@ -0,0 +1,7 @@
+<ion-header [translucent]="true">
+  <ion-toolbar class="searchbar">
+    <div>
+      <ion-button (click)="backhome()" color="primary" slot="start">{{back}}</ion-button>
+    </div>
+  </ion-toolbar>
+</ion-header>

wisdom-app/src/app/page/page-health-information/page-health-information.component.spec.ts

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

wisdom-app/src/app/page/page-health-information/page-health-information.component.ts

@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { IonButton, IonHeader, IonToolbar } from '@ionic/angular/standalone';
+
+@Component({
+  selector: 'page-health-information',
+  templateUrl: './page-health-information.component.html',
+  styleUrls: ['./page-health-information.component.scss'],
+  standalone: true,
+  imports:[
+    IonHeader,IonToolbar,IonButton,
+  ]
+})
+export class PageHealthInformationComponent  implements OnInit {
+
+  constructor(
+    private router: Router
+  ) { }
+
+  ngOnInit() {}
+  back:string = "<";
+  backhome(){
+    this.router.navigate(['/tabs/tab1']);
+  }
+
+}

wisdom-app/src/app/page/page-phone-inquiry/page-phone-inquiry.component.html

@@ -0,0 +1,7 @@
+<ion-header [translucent]="true">
+  <ion-toolbar class="searchbar">
+    <div>
+      <ion-button (click)="backhome()" color="primary" slot="start">{{back}}</ion-button>
+    </div>
+  </ion-toolbar>
+</ion-header>

wisdom-app/src/app/page/page-phone-inquiry/page-phone-inquiry.component.spec.ts

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

wisdom-app/src/app/page/page-phone-inquiry/page-phone-inquiry.component.ts

@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { IonButton, IonHeader, IonToolbar } from '@ionic/angular/standalone';
+
+@Component({
+  selector: 'page-phone-inquiry',
+  templateUrl: './page-phone-inquiry.component.html',
+  styleUrls: ['./page-phone-inquiry.component.scss'],
+  standalone: true,
+  imports:[
+    IonHeader,IonToolbar,IonButton,
+  ]
+})
+export class PagePhoneInquiryComponent  implements OnInit {
+
+  constructor(
+    private router: Router
+  ) { }
+
+  ngOnInit() {}
+  back:string = "<";
+  backhome(){
+    this.router.navigate(['/tabs/tab1']);
+  }
+
+}

wisdom-app/src/app/tab1/tab1.page.html

@@ -104,7 +104,7 @@
       <ion-list>
         <ion-item (click)="openInquiry(doctor)" *ngFor="let doctor of doctorList" lines="none">
           <ion-thumbnail slot="start">
-            <img [src]="doctor.get('avatar') || '../../assets/image/doctor5.png'" [alt]="doctor.get('name')" />
+            <img [src]="doctor.get('avatar') || '../../assets/image/doctor7.png'" [alt]="doctor.get('name')" />
           </ion-thumbnail>
           <div class="doctor-info">
             <h3>{{ doctor.get('name') }}({{ doctor.get('age') }}岁)</h3>

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

@@ -75,14 +75,14 @@ export class Tab1Page {
   functionItems1 = [
     { label: '我的健康', icon: 'document-text', route: '/tabs/my-health' },
     { label: '健康档案', icon: 'person', route: '/tabs/health-records' },
-    { label: '电话问诊', icon: 'calendar', route: '/tabs/tab1' },
-    { label: '购买药品', icon: 'medkit', route: '/tabs/tab1' },
+    { label: '电话问诊', icon: 'calendar', route: '/tabs/phone-inquiry' },
+    { label: '购买药品', icon: 'medkit', route: '/tabs/drug-purchase' },
   ];
 
   functionItems2 = [
     { label: '专业男科', icon: 'clipboard', route: '/tabs/tab1' },
-    { label: '权威专家', icon: 'podium', route: '/tabs/tab1' },
-    { label: '健康资讯', icon: 'newspaper', route: '/tabs/tab1' },
+    { label: '权威专家', icon: 'podium', route: '/tabs/authority-experts' },
+    { label: '健康资讯', icon: 'newspaper', route: '/tabs/health-information' },
     { label: '智慧社区', icon: 'people', route: '/tabs/smart-community' }
   ];
 

wisdom-app/src/app/tabs/tabs.routes.ts

@@ -47,17 +47,37 @@ export const routes: Routes = [
           import('../page-test/page-test.component').then((m) => m.PageTestComponent),
       },
       {
-        path: 'my-health',
+        path: 'my-health', // 我的健康
         loadComponent: () =>
           import('../page/page-my-health/page-my-health.component').then((m) => m.PageMyHealthComponent),
       },
       {
-        path: 'health-records',
+        path: 'health-records', // 健康档案
         loadComponent: () =>
           import('../page/page-health-records/page-health-records.component').then((m) => m.PageHealthRecordsComponent),
       },
       {
-        path: 'smart-community',
+        path: 'drug-purchase', // 药品购买
+        loadComponent: () =>
+          import('../page/page-drug-purchase/page-drug-purchase.component').then((m) => m.PageDrugPurchaseComponent),
+      },
+      {
+        path: 'authority-experts', // 权威专家
+        loadComponent: () =>
+          import('../page/page-authority-experts/page-authority-experts.component').then((m) => m.PageAuthorityExpertsComponent),
+      },
+      {
+        path: 'health-information', // 健康资讯
+        loadComponent: () =>
+          import('../page/page-health-information/page-health-information.component').then((m) => m.PageHealthInformationComponent),
+      },
+      {
+        path: 'phone-inquiry', // 电话咨询
+        loadComponent: () =>
+          import('../page/page-phone-inquiry/page-phone-inquiry.component').then((m) => m.PagePhoneInquiryComponent),
+      },
+      {
+        path: 'smart-community', // 智慧社区
         loadComponent: () =>
           import('../page/page-smart-community/page-smart-community.component').then((m) => m.PageSmartCommunityComponent),
       },