0225263 4 months ago
parent
commit
167eac5e73
34 changed files with 1085 additions and 356 deletions
  1. 0 0
      Assets/avatar.jpg
  2. 27 0
      src/app/app-routing.module.ts
  3. 17 0
      src/app/comment-reply/comment-reply-routing.module.ts
  4. 20 0
      src/app/comment-reply/comment-reply.module.ts
  5. 13 0
      src/app/comment-reply/comment-reply.page.html
  6. 0 0
      src/app/comment-reply/comment-reply.page.scss
  7. 17 0
      src/app/comment-reply/comment-reply.page.spec.ts
  8. 15 0
      src/app/comment-reply/comment-reply.page.ts
  9. 17 0
      src/app/follow/follow-routing.module.ts
  10. 20 0
      src/app/follow/follow.module.ts
  11. 13 0
      src/app/follow/follow.page.html
  12. 0 0
      src/app/follow/follow.page.scss
  13. 17 0
      src/app/follow/follow.page.spec.ts
  14. 15 0
      src/app/follow/follow.page.ts
  15. 17 0
      src/app/like-favorite/like-favorite-routing.module.ts
  16. 20 0
      src/app/like-favorite/like-favorite.module.ts
  17. 13 0
      src/app/like-favorite/like-favorite.page.html
  18. 0 0
      src/app/like-favorite/like-favorite.page.scss
  19. 17 0
      src/app/like-favorite/like-favorite.page.spec.ts
  20. 15 0
      src/app/like-favorite/like-favorite.page.ts
  21. 17 0
      src/app/system-message/system-message-routing.module.ts
  22. 20 0
      src/app/system-message/system-message.module.ts
  23. 13 0
      src/app/system-message/system-message.page.html
  24. 0 0
      src/app/system-message/system-message.page.scss
  25. 17 0
      src/app/system-message/system-message.page.spec.ts
  26. 15 0
      src/app/system-message/system-message.page.ts
  27. 211 67
      src/app/tab1/tab1.page.html
  28. 13 0
      src/app/tab1/tab1.page.ts
  29. 160 183
      src/app/tab2/tab2.page.html
  30. 1 1
      src/app/tab2/tab2.page.scss
  31. 304 49
      src/app/tab2/tab2.page.ts
  32. 27 54
      src/app/tab3/tab3.page.html
  33. 2 1
      src/app/tab3/tab3.page.scss
  34. 12 1
      src/app/tab3/tab3.page.ts

+ 0 - 0
asset/img/大师.jpeg → Assets/avatar.jpg


+ 27 - 0
src/app/app-routing.module.ts

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import { NgModule } from '@angular/core';
 import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
 
@@ -22,3 +23,29 @@ const routes: Routes = [
   exports: [RouterModule]
 })
 export class AppRoutingModule {}
+=======
+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: 'comment-reply', loadChildren: () => import('./comment-reply/comment-reply.module').then(m => m.CommentReplyPageModule) },
+  { path: 'like-favorite', loadChildren: () => import('./like-favorite/like-favorite.module').then(m => m.LikeFavoritePageModule) },
+  { path: 'follow', loadChildren: () => import('./follow/follow.module').then(m => m.FollowPageModule) },
+  { path: 'system-message', loadChildren: () => import('./system-message/system-message.module').then(m => m.SystemMessagePageModule) },
+];
+@NgModule({
+  imports: [
+    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
+  ],
+  exports: [RouterModule]
+})
+export class AppRoutingModule {}
+>>>>>>> 9ac83b6fb2162c25fca57e0a38988562b679b49d

+ 17 - 0
src/app/comment-reply/comment-reply-routing.module.ts

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

+ 20 - 0
src/app/comment-reply/comment-reply.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 { CommentReplyPageRoutingModule } from './comment-reply-routing.module';
+
+import { CommentReplyPage } from './comment-reply.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    CommentReplyPageRoutingModule
+  ],
+  declarations: [CommentReplyPage]
+})
+export class CommentReplyPageModule {}

+ 13 - 0
src/app/comment-reply/comment-reply.page.html

@@ -0,0 +1,13 @@
+<ion-header [translucent]="true">
+  <ion-toolbar>
+    <ion-title>comment-reply</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true">
+  <ion-header collapse="condense">
+    <ion-toolbar>
+      <ion-title size="large">comment-reply</ion-title>
+    </ion-toolbar>
+  </ion-header>
+</ion-content>

+ 0 - 0
src/app/comment-reply/comment-reply.page.scss


+ 17 - 0
src/app/comment-reply/comment-reply.page.spec.ts

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

+ 15 - 0
src/app/comment-reply/comment-reply.page.ts

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

+ 17 - 0
src/app/follow/follow-routing.module.ts

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

+ 20 - 0
src/app/follow/follow.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 { FollowPageRoutingModule } from './follow-routing.module';
+
+import { FollowPage } from './follow.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    FollowPageRoutingModule
+  ],
+  declarations: [FollowPage]
+})
+export class FollowPageModule {}

+ 13 - 0
src/app/follow/follow.page.html

@@ -0,0 +1,13 @@
+<ion-header [translucent]="true">
+  <ion-toolbar>
+    <ion-title>follow</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true">
+  <ion-header collapse="condense">
+    <ion-toolbar>
+      <ion-title size="large">follow</ion-title>
+    </ion-toolbar>
+  </ion-header>
+</ion-content>

+ 0 - 0
src/app/follow/follow.page.scss


+ 17 - 0
src/app/follow/follow.page.spec.ts

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

+ 15 - 0
src/app/follow/follow.page.ts

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

+ 17 - 0
src/app/like-favorite/like-favorite-routing.module.ts

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

+ 20 - 0
src/app/like-favorite/like-favorite.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 { LikeFavoritePageRoutingModule } from './like-favorite-routing.module';
+
+import { LikeFavoritePage } from './like-favorite.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    LikeFavoritePageRoutingModule
+  ],
+  declarations: [LikeFavoritePage]
+})
+export class LikeFavoritePageModule {}

+ 13 - 0
src/app/like-favorite/like-favorite.page.html

@@ -0,0 +1,13 @@
+<ion-header [translucent]="true">
+  <ion-toolbar>
+    <ion-title>like-favorite</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true">
+  <ion-header collapse="condense">
+    <ion-toolbar>
+      <ion-title size="large">like-favorite</ion-title>
+    </ion-toolbar>
+  </ion-header>
+</ion-content>

+ 0 - 0
src/app/like-favorite/like-favorite.page.scss


+ 17 - 0
src/app/like-favorite/like-favorite.page.spec.ts

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

+ 15 - 0
src/app/like-favorite/like-favorite.page.ts

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

+ 17 - 0
src/app/system-message/system-message-routing.module.ts

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

+ 20 - 0
src/app/system-message/system-message.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 { SystemMessagePageRoutingModule } from './system-message-routing.module';
+
+import { SystemMessagePage } from './system-message.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    SystemMessagePageRoutingModule
+  ],
+  declarations: [SystemMessagePage]
+})
+export class SystemMessagePageModule {}

+ 13 - 0
src/app/system-message/system-message.page.html

@@ -0,0 +1,13 @@
+<ion-header [translucent]="true">
+  <ion-toolbar>
+    <ion-title>system-message</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true">
+  <ion-header collapse="condense">
+    <ion-toolbar>
+      <ion-title size="large">system-message</ion-title>
+    </ion-toolbar>
+  </ion-header>
+</ion-content>

+ 0 - 0
src/app/system-message/system-message.page.scss


+ 17 - 0
src/app/system-message/system-message.page.spec.ts

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

+ 15 - 0
src/app/system-message/system-message.page.ts

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

+ 211 - 67
src/app/tab1/tab1.page.html

@@ -1,6 +1,6 @@
 <!-- tab1.page.html -->
 <ion-header>
-  <ion-toolbar>
+  <ion-toolbar color="primary">
     <ion-title>
       首页
     </ion-title>
@@ -8,74 +8,218 @@
 </ion-header>
 
 <ion-content>
-  <ion-grid>
-
-    <ion-row>
-      <ion-col size="12">
-        <!-- 搜索框 -->
-        <ion-searchbar placeholder="输入关键字搜索"></ion-searchbar>
-      </ion-col>
-    </ion-row>
 
-    <!-- 导航栏 -->
-    <ion-toolbar>
-      <ion-segment value="explore">
-        <ion-segment-button value="explore">
-          发现
-        </ion-segment-button>
-        <ion-segment-button value="video">
-          视频
-        </ion-segment-button>
-        <ion-segment-button value="search">
-          搜索
-        </ion-segment-button>
-      </ion-segment>
-    </ion-toolbar>
+  <!-- 顶部搜索栏 -->
+  <ion-searchbar></ion-searchbar>
 
-    <!-- 功能栏 -->
-    <ion-row>
-      <ion-col size="4">
-        <!-- 轮播图 -->
-      </ion-col>
-      <ion-col size="4">
-        <!-- 案例设计 -->
-      </ion-col>
-      <ion-col size="4">
-        <!-- 一键寻宝 -->
-      </ion-col>
-    </ion-row>
+  <!-- 导航栏 -->
+  <ion-toolbar>
+    <ion-segment value="explore">
+      <ion-segment-button value="explore">
+        发现
+      </ion-segment-button>
+      <ion-segment-button value="video">
+        视频
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
 
-    <ion-row>
-      <ion-col size="4">
-        <!-- 装修百科 -->
-      </ion-col>
-      <ion-col size="4">
-        <!-- 买好货 -->
-      </ion-col>
-      <ion-col size="4">
-        <!-- 关注 -->
-      </ion-col>
-    </ion-row>
-  
-    <ion-row>
-      <ion-col size="4">
-        <!-- 推荐 -->
-      </ion-col>
-      <ion-col size="4">
-        <!-- 家居 -->
-      </ion-col>
-      <ion-col size="4">
-        <!-- 设计师 -->
-      </ion-col>
-    </ion-row>
-  
-    <ion-row>
-      <ion-col size="12">
-        <!-- 附近 -->
-      </ion-col>
-    </ion-row>
+  <!-- 功能模块 -->
+  <ion-segment scrollable>
+    <ion-segment-button value="example">
+      <ion-icon name="albums"></ion-icon>
+      案例设计
+    </ion-segment-button>
+    <ion-segment-button value="design">
+      <ion-icon name="brush"></ion-icon>
+      免费设计
+    </ion-segment-button>
+    <ion-segment-button value="designer">
+      <ion-icon name="construct"></ion-icon>
+      装修施工
+    </ion-segment-button>
+    <ion-segment-button value="designer">
+      <ion-icon name="bed"></ion-icon>
+      软装搭配
+    </ion-segment-button>
+    <ion-segment-button value="designer">
+      <ion-icon name="medkit"></ion-icon>
+      户型诊断
+    </ion-segment-button>
+    <ion-segment-button value="designer">
+      <ion-icon name="bonfire"></ion-icon>
+      全屋定制
+    </ion-segment-button>
+    <ion-segment-button value="designer">
+      <ion-icon name="library"></ion-icon>
+      干货百科
+    </ion-segment-button>
+    <ion-segment-button value="designer">
+      <ion-icon name="heart-circle"></ion-icon>
+      风格测试
+    </ion-segment-button>
+    <ion-segment-button value="designer">
+      <ion-icon name="home"></ion-icon>
+      设计我家
+    </ion-segment-button>
+    <ion-segment-button value="designer">
+      <ion-icon name="calculator"></ion-icon>
+      智能预算
+    </ion-segment-button>
+  </ion-segment>
 
-    
-  
-  </ion-grid>
+  <!-- 装修锦囊块 -->
+  <ion-card>
+    <ion-card-header>
+      装修锦囊
+    </ion-card-header>
+    <ion-card-content>
+      <!-- 装修锦囊卡片 -->
+      <ion-grid>
+        <ion-row>
+          <!-- 空间设计块 -->
+          <ion-col>
+            <ion-card>
+              <ion-card-header>
+                <ion-label>
+                  <ion-icon name="dice-outline"></ion-icon>
+                  空间设计
+                </ion-label>
+              </ion-card-header>
+              <ion-card-content>
+                <ion-grid>
+                  <ion-row>
+                    <!-- 客厅怎么装card -->
+                    <ion-col size="12">
+                      <ion-card>
+                        <ion-img src="https://img.zcool.cn/community/01df555d65edcea8012187f4e41c2f.jpg@2o.jpg"></ion-img>
+                        <ion-card-header>
+                          客厅怎么装
+                        </ion-card-header>
+                      </ion-card>
+                    </ion-col>
+                    <!-- 卧室怎么装card -->
+                    <ion-col size="12">
+                      <ion-card>
+                        <ion-img src="https://bjcache.leju.com/zxjiaju/zx_pic/20141120/e6/2e/e2e6920b5532429d94ee61bd1630f9c3.jpg"></ion-img>
+                        <ion-card-header>
+                          卧室怎么装
+                        </ion-card-header>
+                      </ion-card>
+                    </ion-col>
+                  </ion-row>
+      
+                </ion-grid>
+                
+              </ion-card-content>
+            </ion-card>
+          </ion-col>
+          <!-- 装前必看块 -->
+          <ion-col>
+            <ion-card>
+              <ion-card-header>
+                <ion-icon name="logo"></ion-icon>
+                <ion-label>空间设计</ion-label>
+              </ion-card-header>
+              <ion-card-content>
+                <ion-grid>
+                  <ion-row>
+                    <!-- 客厅怎么装card -->
+                    <ion-col>
+                      <ion-card>
+                        <ion-img src="assets/images/living_room.jpg"></ion-img>
+                        <ion-card-header>
+                          客厅怎么装
+                        </ion-card-header>
+                      </ion-card>
+                    </ion-col>
+                    <!-- 卧室怎么装card -->
+                    <ion-col>
+                      <ion-card>
+                        <ion-img src="assets/images/living_room.jpg"></ion-img>
+                        <ion-card-header>
+                          卧室怎么装
+                        </ion-card-header>
+                      </ion-card>
+                    </ion-col>
+                  </ion-row>
+      
+                </ion-grid>
+              </ion-card-content>
+            </ion-card>
+          </ion-col>
+          <!-- 家具家电块 -->
+          <ion-col>
+            <ion-card>
+              <ion-card-header>
+                <ion-icon name="logo"></ion-icon>
+                <ion-label>家具家电</ion-label>
+              </ion-card-header>
+              <ion-card-content>
+                <ion-grid>
+                  <ion-row>
+                    <!-- 客厅怎么装card -->
+                    <ion-col>
+                      <ion-card>
+                        <ion-img src="assets/images/living_room.jpg"></ion-img>
+                        <ion-card-header>
+                          客厅怎么装
+                        </ion-card-header>
+                      </ion-card>
+                    </ion-col>
+                    <!-- 卧室怎么装card -->
+                    <ion-col>
+                      <ion-card>
+                        <ion-img src="assets/images/living_room.jpg"></ion-img>
+                        <ion-card-header>
+                          卧室怎么装
+                        </ion-card-header>
+                      </ion-card>
+                    </ion-col>
+                  </ion-row>
+      
+                </ion-grid>
+              </ion-card-content>
+            </ion-card>
+          </ion-col>
+          <!-- 家居软装块 -->
+          <ion-col>
+            <ion-card>
+              <ion-card-header>
+                <ion-icon name="logo"></ion-icon>
+                <ion-label>家居软装</ion-label>
+              </ion-card-header>
+              <ion-card-content>
+                <ion-grid>
+                  <ion-row>
+                    <!-- 客厅怎么装card -->
+                    <ion-col>
+                      <ion-card>
+                        <ion-img src="assets/images/living_room.jpg"></ion-img>
+                        <ion-card-header>
+                          客厅怎么装
+                        </ion-card-header>
+                      </ion-card>
+                    </ion-col>
+                    <!-- 卧室怎么装card -->
+                    <ion-col>
+                      <ion-card>
+                        <ion-img src="assets/images/living_room.jpg"></ion-img>
+                        <ion-card-header>
+                          卧室怎么装
+                        </ion-card-header>
+                      </ion-card>
+                    </ion-col>
+                  </ion-row>
+      
+                </ion-grid>
+              </ion-card-content>
+            </ion-card>
+          </ion-col>
+          
+        </ion-row>
+      </ion-grid>
+      
+    </ion-card-content>
+  </ion-card>
 </ion-content>

+ 13 - 0
src/app/tab1/tab1.page.ts

@@ -6,7 +6,20 @@ import { Component } from '@angular/core';
   styleUrls: ['tab1.page.scss']
 })
 export class Tab1Page {
+  selectedSegment: string = 'company';
+
 
   constructor() {}
 
+  segmentChanged(event: CustomEvent) {
+    this.selectedSegment = event.detail.value;
+  }
+
+  contentList = [
+    { image: 'assets/images/image1.jpg', title: '示例标题1', user: '用户A', likes: 10, comments: 5, tags: '标签1, 标签2' },
+    { image: 'assets/images/image2.jpg', title: '示例标题2', user: '用户B', likes: 20, comments: 8, tags: '标签3, 标签4' },
+    // 添加更多示例数据
+  ];
+  
+
 }

+ 160 - 183
src/app/tab2/tab2.page.html

@@ -1,5 +1,5 @@
 <ion-header>
-  <ion-toolbar color="primary">
+  <ion-toolbar color="light">
     <ion-title>装修</ion-title>
   </ion-toolbar>
 </ion-header>
@@ -30,9 +30,8 @@
     <div *ngIf="selectedSegment === 'company'">
       <!-- 装修公司详情页 -->
       <ion-card *ngFor="let company of companies">
-        <ion-card-header>
-          公司名称: {{ company.name }}
-        </ion-card-header>
+        <ion-card-header><ion-card-title> {{ company.name }}</ion-card-title>
+      </ion-card-header>
         <ion-card-content>
           <ion-item>
             <ion-label>星级评分:</ion-label>
@@ -67,197 +66,175 @@
                 </ion-item>
               </ion-list>
             <!-- 底部按钮 -->
-            <ion-button expand="full">电话</ion-button>
-            <ion-button expand="full">预约</ion-button>
-            <ion-button expand="full">咨询</ion-button>
-            <ion-button expand="full">查看案例</ion-button>
+          <ion-button expand="full" color="secondary">电话</ion-button>
+          <ion-button expand="full" color="secondary">预约</ion-button>
+          <ion-button expand="full" color="secondary">咨询</ion-button>
+          <ion-button expand="full" color="secondary">查看案例</ion-button>
             </ion-card-content>
           </ion-card>
         </ion-card-content>
       </ion-card>
     </div>
-    <div *ngIf="selectedSegment === 'company'">
-      <!-- 公司详情页内容 -->
-    </div>
 
     <!-- 设计机构详情页 -->
     <div *ngIf="selectedSegment === 'design'">
-      <!-- 机构详情页内容 -->
-      <div *ngIf="selectedSegment === 'design'">
-        <!-- 设计机构详情页 -->
-        <ion-card>
-          <ion-card-header>
-            机构名称: {{ agency.name }}
-          </ion-card-header>
-          <ion-card-content>
-            <ion-item>
-              <ion-label>星级评分:</ion-label>
-              <ion-text>{{ agency.starRating }}</ion-text>
-            </ion-item>
-            <ion-item>
-              <ion-label>评价数量:</ion-label>
-              <ion-text>{{ agency.reviewCount }}</ion-text>
-            </ion-item>
-            <ion-item>
-              <ion-label>机构简介:</ion-label>
-              <ion-text>{{ agency.description }}</ion-text>
-            </ion-item>
-            <!-- 机构介绍 -->
-            <ion-card>
-              <ion-card-header>
-                机构介绍
-              </ion-card-header>
-              <ion-card-content>
-                <ion-list>
-                  <ion-item>
-                    <ion-label>服务:</ion-label>
-                    <ion-text>{{ agency.services }}</ion-text>
-                  </ion-item>
-                  <ion-item>
-                    <ion-label>优势:</ion-label>
-                    <ion-text>{{ agency.advantages }}</ion-text>
-                  </ion-item>
-                  <ion-item>
-                    <ion-label>案例:</ion-label>
-                    <ion-text>{{ agency.cases }}</ion-text>
-                  </ion-item>
-                </ion-list>
-              </ion-card-content>
-            </ion-card>
-            <!-- 设计师团队 -->
-            <ion-card>
-              <ion-card-header>
-                设计师团队
-              </ion-card-header>
-              <ion-card-content>
-                <!-- 展示机构的设计师团队 -->
-              </ion-card-content>
-            </ion-card>
-            <!-- 案例展示 -->
-            <ion-card>
-              <ion-card-header>
-                案例展示
-              </ion-card-header>
-              <ion-card-content>
-                <!-- 展示机构完成的装修案例 -->
-              </ion-card-content>
-            </ion-card>
-            <!-- 设计理念 -->
-            <ion-card>
-              <ion-card-header>
-                设计理念
-              </ion-card-header>
-              <ion-card-content>
-                <!-- 展示机构的设计理念和风格 -->
-              </ion-card-content>
-            </ion-card>
-            <!-- 服务流程 -->
-            <ion-card>
-              <ion-card-header>
-                服务流程
-              </ion-card-header>
-              <ion-card-content>
-                <!-- 展示机构的装修流程和服务标准 -->
-              </ion-card-content>
-            </ion-card>
-            <!-- 用户评价 -->
-            <ion-card>
-              <ion-card-header>
-                用户评价
-              </ion-card-header>
-              <ion-card-content>
-                <!-- 展示用户对机构的评价 -->
-              </ion-card-content>
-            </ion-card>
-            <!-- 底部按钮 -->
-            <ion-button expand="full">电话</ion-button>
-            <ion-button expand="full">预约</ion-button>
-            <ion-button expand="full">咨询</ion-button>
-            <ion-button expand="full">查看案例</ion-button>
-          </ion-card-content>
-        </ion-card>
-      </div>
+    <div *ngFor="let designCompany of designCompanies">
+      <ion-card class="company-card">
+        <ion-card-header>
+          <ion-card-title>{{ designCompany.name }}</ion-card-title>
+          <ion-card-subtitle>星级评分: {{ designCompany.starRating }} | 评价数量: {{ designCompany.reviewCount }}</ion-card-subtitle>
+        </ion-card-header>
+        <ion-card-content>
+          <ion-item lines="none">
+            <ion-label>机构简介:</ion-label>
+            <ion-text>{{ designCompany.description }}</ion-text>
+          </ion-item>
+  
+          <!-- 机构介绍 -->
+          <ion-card class="info-card">
+            <ion-card-header>
+              机构介绍
+            </ion-card-header>
+            <ion-card-content>
+              <ion-item>
+                <ion-label>服务:</ion-label>
+                <ion-text>{{ designCompany.services }}</ion-text>
+              </ion-item>
+              <ion-item>
+                <ion-label>优势:</ion-label>
+                <ion-text>{{ designCompany.advantages }}</ion-text>
+              </ion-item>
+              <ion-item>
+                <ion-label>案例:</ion-label>
+                <ion-text>{{ designCompany.cases }}</ion-text>
+              </ion-item>
+            </ion-card-content>
+          </ion-card>
+  
+          <!-- 设计师团队 -->
+          <ion-card class="team-card">
+            <ion-card-header>
+              设计师团队
+            </ion-card-header>
+            <ion-card-content>
+              <ion-item *ngFor="let designer of designCompany.designers" lines="none">
+                <ion-avatar slot="start">
+                  <img [src]="designer.avatar" alt="设计师头像">
+                </ion-avatar>
+                <ion-label>{{ designer.name }}</ion-label>
+                <ion-text>{{ designer.style }}</ion-text>
+                <ion-text>{{ designer.serviceArea }}</ion-text>
+                <ion-text>{{ designer.price }}</ion-text>
+              </ion-item>
+            </ion-card-content>
+          </ion-card>
+  
+          <!-- 案例展示 -->
+          <ion-card class="case-card">
+            <ion-card-header>
+              案例展示
+            </ion-card-header>
+            <ion-card-content>
+              <ion-item *ngFor="let case of designCompany.cases" lines="none">
+                <img [src]="case.image" alt="案例图片">
+                <ion-label>{{ case.description }}</ion-label>
+                <ion-text>{{ case.style }}</ion-text>
+              </ion-item>
+            </ion-card-content>
+          </ion-card>
+  
+          <!-- 设计理念 -->
+          <ion-card class="concept-card">
+            <ion-card-header>
+              设计理念
+            </ion-card-header>
+            <ion-card-content>
+              <ion-text>{{ designCompany.designConcept }}</ion-text>
+            </ion-card-content>
+          </ion-card>
+  
+          <!-- 服务流程 -->
+          <ion-card class="process-card">
+            <ion-card-header>
+              服务流程
+            </ion-card-header>
+            <ion-card-content>
+              <ion-text>{{ designCompany.serviceProcess }}</ion-text>
+            </ion-card-content>
+          </ion-card>
+  
+          <!-- 用户评价 -->
+          <ion-card class="review-card">
+            <ion-card-header>
+              用户评价
+            </ion-card-header>
+            <ion-card-content>
+              <ion-item *ngFor="let review of designCompany.userReviews" lines="none">
+                <img [src]="review.image" alt="用户评价图片">
+                <ion-label>{{ review.text }}</ion-label>
+                <ion-text>星级评分: {{ review.starRating }}</ion-text>
+              </ion-item>
+            </ion-card-content>
+          </ion-card>
+  
+          <!-- 底部按钮 -->
+          <ion-button expand="full" color="tertiary">电话</ion-button>
+          <ion-button expand="full" color="tertiary">预约</ion-button>
+          <ion-button expand="full" color="tertiary">咨询</ion-button>
+          <ion-button expand="full" color="tertiary">查看案例</ion-button>
+  
+        </ion-card-content>
+      </ion-card>
     </div>
+  </div>
 
     <!-- 设计师详情页 -->
     <div *ngIf="selectedSegment === 'designer'">
-      <!-- 设计师详情页内容 -->
-      <div *ngIf="selectedSegment === 'designer'">
-        <!-- 设计师详情页 -->
-        <ion-card>
-          <ion-card-header>
-            设计师信息
-          </ion-card-header>
-          <ion-card-content>
-            <ion-item>
-              <ion-avatar slot="start">
-                <ion-img src="{{ designer.avatar }}"></ion-img>
-              </ion-avatar>
-              <ion-label>
-                <h2>{{ designer.name }}</h2>
-                <p>{{ designer.specialty }}</p>
-              </ion-label>
-            </ion-item>
-            <ion-item>
-              <ion-label>擅长风格:</ion-label>
-              <ion-text>{{ designer.style }}</ion-text>
-            </ion-item>
-            <ion-item>
-              <ion-label>服务地区:</ion-label>
-              <ion-text>{{ designer.serviceArea }}</ion-text>
-            </ion-item>
-            <ion-item>
-              <ion-label>价格:</ion-label>
-              <ion-text>{{ designer.price }}</ion-text>
-            </ion-item>
-            <ion-item>
-              <ion-label>用户评价:</ion-label>
-              <ion-text>{{ designer.rating }}</ion-text>
-            </ion-item>
-            <!-- 设计师作品展示 -->
-            <ion-card>
-              <ion-card-header>
-                设计师作品
-              </ion-card-header>
-              <ion-card-content>
-                <ion-grid>
-                  <ion-row>
-                    <ion-col size="6" *ngFor="let work of designer.works">
-                      <ion-img src="{{ work.image }}"></ion-img>
-                      <p>{{ work.description }}</p>
-                    </ion-col>
-                  </ion-row>
-                </ion-grid>
-              </ion-card-content>
-            </ion-card>
-            <!-- 用户评价 -->
-            <ion-card>
-              <ion-card-header>
-                用户评价
-              </ion-card-header>
-              <ion-card-content>
-                <ion-list>
-                  <ion-item *ngFor="let review of designer.reviews">
-                    <ion-avatar slot="start">
-                      <ion-img src="{{ review.avatar }}"></ion-img>
-                    </ion-avatar>
-                    <ion-label>
-                      <h2>{{ review.username }}</h2>
-                      <p>{{ review.comment }}</p>
-                    </ion-label>
-                    <ion-icon slot="end" name="star" [color]="review.rating >= 4 ? 'warning' : 'medium'"></ion-icon>
-                  </ion-item>
-                </ion-list>
-              </ion-card-content>
-            </ion-card>
-            <!-- 底部按钮 -->
-            <ion-button expand="full">咨询</ion-button>
-            <ion-button expand="full">电话</ion-button>
-            <ion-button expand="full">在线预约</ion-button>
-            <ion-button expand="full">查看案例</ion-button>
-          </ion-card-content>
-        </ion-card>
-      </div>
+      <!-- 设计师详情页 -->
+      <ion-card *ngFor="let designer of designers">
+        <!-- 头部 -->
+        <ion-card-header>
+          <ion-avatar>
+            <img src="{{ designer.avatar }}" alt="Designer Avatar">
+          </ion-avatar>
+          <ion-card-title>{{ designer.username }}</ion-card-title>
+          <ion-button fill="outline" slot="end">关注</ion-button>
+        </ion-card-header>
+        <ion-card-content>
+          <p>{{ designer.bio }}</p>
+        </ion-card-content>
+    
+        <!-- 内容 -->
+        <ion-card-content>
+          <ion-img [src]="designer.portfolioImage" alt="Designer Portfolio"></ion-img>
+          <ion-item>
+            <ion-label>作品数量:</ion-label>
+            <ion-text>{{ designer.portfolioCount }}</ion-text>
+          </ion-item>
+          <ion-item>
+            <ion-label>擅长风格:</ion-label>
+            <ion-text>{{ designer.style }}</ion-text>
+          </ion-item>
+          <ion-item>
+            <ion-label>服务地区:</ion-label>
+            <ion-text>{{ designer.serviceArea }}</ion-text>
+          </ion-item>
+          <ion-item>
+            <ion-label>价格:</ion-label>
+            <ion-text>{{ designer.price }}</ion-text>
+          </ion-item>
+          <ion-item>
+            <ion-label>用户评价:</ion-label>
+            <ion-text>{{ designer.rating }}</ion-text>
+          </ion-item>
+        </ion-card-content>
+    
+        <!-- 底部 -->
+          <ion-button expand="full" fill="outline">咨询</ion-button>
+          <ion-button expand="full" fill="outline">电话</ion-button>
+          <ion-button expand="full" fill="outline">在线预约</ion-button>
+          <ion-button expand="full" fill="outline">查看案例</ion-button>
+      </ion-card>
     </div>
   </div>
 </ion-content>

+ 1 - 1
src/app/tab2/tab2.page.scss

@@ -1,3 +1,3 @@
 .details-container {
-    padding: 10px;
+    padding: 20px;
   }

+ 304 - 49
src/app/tab2/tab2.page.ts

@@ -7,10 +7,9 @@ import { Component } from '@angular/core';
   
 })
 export class Tab2Page {
-  selectedSegment: string = 'company';
   companies = [
     {
-      name: '装修公司A',
+      name: '和美空间设计',
       starRating: 4.7,
       reviewCount: 150,
       description: '装修公司A的简介',
@@ -19,7 +18,7 @@ export class Tab2Page {
       cases: '装修公司A的案例'
     },
     {
-      name: '装修公司B',
+      name: '灵感装修工程',
       starRating: 4.5,
       reviewCount: 120,
       description: '装修公司B的简介',
@@ -28,7 +27,34 @@ export class Tab2Page {
       cases: '装修公司B的案例'
     },
     {
-      name: '装修公司C',
+      name: '璞心设计工作室',
+      starRating: 4.5,
+      reviewCount: 120,
+      description: '装修公司C的简介',
+      services: '创意设计、个性定制',
+      advantages: '专业设计师、创新理念',
+      cases: '装修公司B的案例'
+    },
+    {
+      name: '悦居室内设计',
+      starRating: 4.5,
+      reviewCount: 120,
+      description: '装修公司C的简介',
+      services: '创意设计、个性定制',
+      advantages: '专业设计师、创新理念',
+      cases: '装修公司B的案例'
+    },
+    {
+      name: '彩虹装饰工程',
+      starRating: 4.5,
+      reviewCount: 120,
+      description: '装修公司C的简介',
+      services: '创意设计、个性定制',
+      advantages: '专业设计师、创新理念',
+      cases: '装修公司B的案例'
+    },
+    {
+      name: '素雅装饰设计',
       starRating: 4.5,
       reviewCount: 120,
       description: '装修公司C的简介',
@@ -38,51 +64,280 @@ export class Tab2Page {
     }
     // 添加更多装修公司信息
   ];
-  agency = {
-    name: '机构名称',
-    starRating: 4.4,
-    reviewCount: 95,
-    description: '机构简介',
-    services: '机构提供的服务',
-    advantages: '机构的优势',
-    cases: '机构的案例',
-    designers: [
-      { name: '设计师1', avatar: 'assets/designer1.jpg', specialty: '擅长风格1' },
-      { name: '设计师2', avatar: 'assets/designer2.jpg', specialty: '擅长风格2' },
-      // 添加更多设计师信息
-    ],
-    casesList: [
-      { image: 'assets/case1.jpg', description: '案例描述1' },
-      { image: 'assets/case2.jpg', description: '案例描述2' },
-      // 添加更多案例信息
-    ],
-    designPhilosophy: '设计理念内容',
-    serviceProcess: '服务流程内容',
-    reviews: [
-      { avatar: 'assets/user1.jpg', username: '用户1', comment: '评价1', rating: 5 },
-      { avatar: 'assets/user2.jpg', username: '用户2', comment: '评价2', rating: 4 },
-      // 添加更多用户评价
-    ]
-  };
-  designer = {
-    name: '设计师姓名',
-    avatar: 'assets/designer-avatar.jpg',
-    specialty: '设计师专长',
-    style: '设计风格',
-    serviceArea: '服务地区',
-    price: '设计师价格',
-    rating: '用户评价',
-    works: [
-      { image: 'assets/work1.jpg', title: '作品1', description: '作品描述1' },
-      { image: 'assets/work2.jpg', title: '作品2', description: '作品描述2' },
-      // 添加更多设计师作品
-    ],
-    reviews: [
-      { avatar: 'assets/user1.jpg', username: '用户1', comment: '评价1', rating: 5 },
-      { avatar: 'assets/user2.jpg', username: '用户2', comment: '评价2', rating: 4 },
-      // 添加更多用户评价
-    ]
-  };
+  selectedSegment: string = 'company';
+  
+  designCompanies = [
+    {
+      name: '源境设计工作室',
+      starRating: 4.8,
+      reviewCount: 200,
+      description: '设计机构X的简介',
+      services: '室内设计、景观设计',
+      advantages: '创新设计、高品质服务',
+      cases: [
+        {
+          image: 'case1.jpg',
+          description: '案例描述1',
+          style: '现代风格'
+        },
+        // 添加更多案例
+      ],
+      designers: [
+        {
+          avatar: 'designer1.jpg',
+          name: '设计师A',
+          style: '现代风格',
+          serviceArea: '城市A',
+          price: '1'
+        },
+        // 添加更多设计师
+      ],
+      designConcept: '设计理念描述',
+      serviceProcess: '服务流程描述',
+      userReviews: [
+        {
+          text: '用户评价1',
+          image: 'review1.jpg',
+          starRating: 5
+        },
+        // 添加更多用户评价
+      ]
+    },
+    {
+      name: '创意天地设计',
+      starRating: 4.5,
+      reviewCount: 150,
+      description: '设计机构Y的简介',
+      services: '建筑设计、室内设计',
+      advantages: '专业团队、精细施工',
+      cases: [
+        {
+          image: 'case2.jpg',
+          description: '案例描述2',
+          style: '现代简约风格'
+        },
+        // 添加更多案例
+      ],
+      designers: [
+        {
+          avatar: 'designer2.jpg',
+          name: '设计师B',
+          style: '简约风格',
+          serviceArea: '城市B',
+          price: '$$'
+        },
+        {
+          avatar: 'designer2.jpg',
+          name: '设计师B',
+          style: '简约风格',
+          serviceArea: '城市B',
+          price: '$$'
+        },
+        // 添加更多设计师
+      ],
+      designConcept: '设计理念描述',
+      serviceProcess: '服务流程描述',
+      userReviews: [
+        {
+          text: '用户评价2',
+          image: 'review2.jpg',
+          starRating: 4
+        },
+        // 添加更多用户评价
+      ]
+    },
+    {
+      name: '艺境空间设计',
+      starRating: 4.5,
+      reviewCount: 150,
+      description: '设计机构Y的简介',
+      services: '建筑设计、室内设计',
+      advantages: '专业团队、精细施工',
+      cases: [
+        {
+          image: 'case2.jpg',
+          description: '案例描述2',
+          style: '现代简约风格'
+        },
+        // 添加更多案例
+      ],
+      designers: [
+        {
+          avatar: 'designer2.jpg',
+          name: '设计师B',
+          style: '简约风格',
+          serviceArea: '城市B',
+          price: '$$'
+        },
+        {
+          avatar: 'designer2.jpg',
+          name: '设计师B',
+          style: '简约风格',
+          serviceArea: '城市B',
+          price: '$$'
+        },
+        // 添加更多设计师
+      ],
+      designConcept: '设计理念描述',
+      serviceProcess: '服务流程描述',
+      userReviews: [
+        {
+          text: '用户评价2',
+          image: 'review2.jpg',
+          starRating: 4
+        },
+        // 添加更多用户评价
+      ]
+    },
+    {
+      name: '星辰创意设计室',
+      starRating: 4.5,
+      reviewCount: 150,
+      description: '设计机构Y的简介',
+      services: '建筑设计、室内设计',
+      advantages: '专业团队、精细施工',
+      cases: [
+        {
+          image: 'case2.jpg',
+          description: '案例描述2',
+          style: '现代简约风格'
+        },
+        // 添加更多案例
+      ],
+      designers: [
+        {
+          avatar: 'designer2.jpg',
+          name: '设计师B',
+          style: '简约风格',
+          serviceArea: '城市B',
+          price: '$$'
+        },
+        {
+          avatar: 'designer2.jpg',
+          name: '设计师B',
+          style: '简约风格',
+          serviceArea: '城市B',
+          price: '$$'
+        },
+        // 添加更多设计师
+      ],
+      designConcept: '设计理念描述',
+      serviceProcess: '服务流程描述',
+      userReviews: [
+        {
+          text: '用户评价2',
+          image: 'review2.jpg',
+          starRating: 4
+        },
+        // 添加更多用户评价
+      ]
+    },
+    {
+      name: '创意空间探索所',
+      starRating: 4.5,
+      reviewCount: 150,
+      description: '设计机构Y的简介',
+      services: '建筑设计、室内设计',
+      advantages: '专业团队、精细施工',
+      cases: [
+        {
+          image: 'case2.jpg',
+          description: '案例描述2',
+          style: '现代简约风格'
+        },
+        // 添加更多案例
+      ],
+      designers: [
+        {
+          avatar: 'designer2.jpg',
+          name: '设计师B',
+          style: '简约风格',
+          serviceArea: '城市B',
+          price: '$$'
+        },
+        {
+          avatar: 'designer2.jpg',
+          name: '设计师B',
+          style: '简约风格',
+          serviceArea: '城市B',
+          price: '$$'
+        },
+        // 添加更多设计师
+      ],
+      designConcept: '设计理念描述',
+      serviceProcess: '服务流程描述',
+      userReviews: [
+        {
+          text: '用户评价2',
+          image: 'review2.jpg',
+          starRating: 4
+        },
+        // 添加更多用户评价
+      ]
+    }
+    // 添加更多设计机构信息
+  ];
+  selectedTab: string = 'designCompany';
+  
+  designers = [
+    {
+      username: '李宛如',
+      avatar: 'assets/designer1.jpg',
+      bio: '李宛如是一位充满创意和激情的室内设计师,擅长将空间转化为舒适且具有个性的居住环境。她注重细节,追求完美,致力于为客户打造独一无二的家居体验。',
+      portfolioImage: 'assets/portfolio1.jpg',
+      portfolioCount: 50,
+      style: '现代简约、北欧风格',
+      serviceArea: '北京',
+      price: '平均每平米价格为1000元',
+      rating: 4.8
+    },
+    {
+      username: '张晨光',
+      avatar: 'assets/designer2.jpg',
+      bio: '张晨光是一位充满创意和热情的室内设计师,擅长将空间与艺术相融合,为客户打造独特、舒适的家居环境。',
+      portfolioImage: 'assets/portfolio2.jpg',
+      portfolioCount: 80,
+      style: '现代简约、工业风格',
+      serviceArea: '上海',
+      price: '平均每平米价格为1500元',
+      rating: 4.6
+    },
+    {
+      username: '王梦洁',
+      avatar: 'assets/designer2.jpg',
+      bio: '王梦洁是一位注重细节和品质的室内设计师,擅长通过色彩和材质搭配打造温馨、时尚的居住空间。',
+      portfolioImage: 'assets/portfolio2.jpg',
+      portfolioCount: 60,
+      style: '北欧风格、现代简约',
+      serviceArea: '广州',
+      price: '平均每平米价格为1200元',
+      rating: 4.5
+    },
+    {
+      username: '刘阳光',
+      avatar: 'assets/designer2.jpg',
+      bio: '刘阳光是一位富有创意和想象力的室内设计师,致力于为客户打造个性化、独特的空间体验。',
+      portfolioImage: 'assets/portfolio2.jpg',
+      portfolioCount: 45,
+      style: '中式风格、现代简约',
+      serviceArea: '成都',
+      price: '平均每平米价格为1000元',
+      rating: 4.6
+    },
+    {
+      username: '陈思慧',
+      avatar: 'assets/designer2.jpg',
+      bio: ' 陈思慧是一位充满激情和创意的室内设计师,专注于打造具有个性和温暖感的居家空间,致力于为客户提供高品质的设计服务。',
+      portfolioImage: 'assets/portfolio2.jpg',
+      portfolioCount: 70,
+      style: '现代简约、地中海风格',
+      serviceArea: '广州',
+      price: '平均每平米价格为1300元',
+      rating: 4.8
+    }
+    // 添加更多设计师信息
+  ];
+  selectedDesignerSegment: string = 'designer';
 
   constructor() {}
 

+ 27 - 54
src/app/tab3/tab3.page.html

@@ -1,41 +1,43 @@
 <ion-header [translucent]="true">
-  <ion-toolbar>
+  <ion-toolbar color="primary">
     <ion-title>
       消息
     </ion-title>
+      <ion-button slot="end"  (click)="openSettingsPage()">
+        <ion-icon name="settings-outline"></ion-icon>
+      </ion-button>
   </ion-toolbar>
 </ion-header>
 
 <ion-content>
-  <ion-list>
-    <ion-item>
-      <ion-icon slot="start" name="chatbubble-ellipses"></ion-icon>
-      <ion-label>评论和回复</ion-label>
-    </ion-item>
-    
-    <ion-item>
-      <ion-icon slot="start" name="thumbs-up"></ion-icon>
-      <ion-label>赞与收藏</ion-label>
-    </ion-item>
-    
-    <ion-item>
-      <ion-icon slot="start" name="person-add"></ion-icon>
-      <ion-label>新增关注</ion-label>
-    </ion-item>
-    
-    <ion-item>
-      <ion-icon slot="start" name="notifications"></ion-icon>
-      <ion-label>系统消息</ion-label>
-    </ion-item>
-  </ion-list>
-
+  <ion-searchbar placeholder="输入关键字搜索"></ion-searchbar>
+  <ion-toolbar>
+   <ion-segment value="explore">
+    <ion-segment-button value="explore">
+      <ion-icon (click)="navigateToPage('comment-reply')" name="chatbubble-ellipses"></ion-icon>
+      评论和回复
+    </ion-segment-button>
+    <ion-segment-button value="video">
+      <ion-icon  name="thumbs-up"></ion-icon>
+      赞与收藏
+    </ion-segment-button>
+    <ion-segment-button value="search">
+      <ion-icon (click)="navigateToPage('follow')" name="person-add"></ion-icon>
+      新增关注
+    </ion-segment-button>
+    <ion-segment-button value="system">
+      <ion-icon (click)="navigateToPage('system-message')" name="notifications"></ion-icon>
+      系统消息
+    </ion-segment-button>
+   </ion-segment>
+  </ion-toolbar>
   <ion-card>
     <ion-card-header>
       <ion-card-title>最新推荐</ion-card-title>
     </ion-card-header>
     <ion-card-content>
       <ion-avatar slot="start">
-        <ion-img src="assets/avatar.jpg"></ion-img>
+        <ion-img src="Assets/avatar.jpg"></ion-img>
       </ion-avatar>
       <ion-label>用户名</ion-label>
       <ion-label>标签</ion-label>
@@ -43,33 +45,4 @@
       <ion-button expand="block">免费提问</ion-button>
     </ion-card-content>
   </ion-card>
-</ion-content>
-
-<!--<ion-footer>
-  <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-button routerLink="/tabs/tab1">
-        <ion-icon name="home"></ion-icon>
-        首页
-      </ion-button>
-    </ion-buttons>
-    <ion-buttons slot="start">
-      <ion-button routerLink="/tabs/tab2">
-        <ion-icon name="construct"></ion-icon>
-        装修
-      </ion-button>
-    </ion-buttons>
-    <ion-buttons slot="start">
-      <ion-button routerLink="/tabs/tab3" color="primary">
-        <ion-icon name="chatbubbles"></ion-icon>
-        消息
-      </ion-button>
-    </ion-buttons>
-    <ion-buttons slot="start">
-      <ion-button routerLink="/tabs/tab4">
-        <ion-icon name="person"></ion-icon>
-        我的
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-footer>-->
+</ion-content>

+ 2 - 1
src/app/tab3/tab3.page.scss

@@ -1,4 +1,5 @@
 ion-card {
+  top: 25px;
   margin: 10px;
 }
 
@@ -8,4 +9,4 @@ ion-card-title {
 
 ion-avatar {
   margin-right: 10px;
-}
+}

+ 12 - 1
src/app/tab3/tab3.page.ts

@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-tab3',
@@ -7,6 +8,16 @@ import { Component } from '@angular/core';
 })
 export class Tab3Page {
 
-  constructor() {}
+  constructor(private router: Router) {}
+  openFeedbackPage() {
+    // 打开反馈页面
+  }
+  
 
+  openSettingsPage() {
+    // 打开设置页面
+  }
+  navigateToPage(page: string) {
+    this.router.navigate([`/tabs/${page}`]);
+  }
 }