Merge branch 'master' of http://git.fmode.cn:3000/0225273/APPmy

src/app/app-routing.module.ts

@@ -10,7 +10,10 @@ const routes: Routes = [
     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: [

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 {}

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 {}

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>

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();
+  });
+});

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() {
+  }
+
+}

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 {}

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 {}

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>

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();
+  });
+});

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() {
+  }
+
+}

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 {}

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 {}

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>

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();
+  });
+});

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() {
+  }
+
+}

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 {}

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 {}

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>

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();
+  });
+});

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() {
+  }
+
+}

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>
@@ -75,22 +75,151 @@
     </ion-card-header>
     <ion-card-content>
       <!-- 装修锦囊卡片 -->
-      <ion-card>
-        <ion-card-header>
-          <ion-icon name="logo"></ion-icon>
-          <ion-label>空间设计</ion-label>
-        </ion-card-header>
-        <ion-card-content>
-          <!-- 客厅怎么装card -->
-          <ion-card>
-            <ion-img src="assets/images/living_room.jpg"></ion-img>
-            <ion-card-header>
-              客厅怎么装
-            </ion-card-header>
-          </ion-card>
-          <!-- 其他装修卡片类似添加 -->
-        </ion-card-content>
-      </ion-card>
+      <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>

src/app/tab3/tab3.page.html

@@ -3,9 +3,8 @@
     <ion-title>
       消息
     </ion-title>
-      <ion-button (click)="openSettingsPage()">
+      <ion-button slot="end"  (click)="openSettingsPage()">
         <ion-icon name="settings-outline"></ion-icon>
-        <ion-label>设置</ion-label>
       </ion-button>
   </ion-toolbar>
 </ion-header>
@@ -15,7 +14,7 @@
   <ion-toolbar>
    <ion-segment value="explore">
     <ion-segment-button value="explore">
-      <ion-icon  name="chatbubble-ellipses"></ion-icon>
+      <ion-icon (click)="navigateToPage('comment-reply')" name="chatbubble-ellipses"></ion-icon>
       评论和回复
     </ion-segment-button>
     <ion-segment-button value="video">
@@ -23,11 +22,11 @@
       赞与收藏
     </ion-segment-button>
     <ion-segment-button value="search">
-      <ion-icon  name="person-add"></ion-icon>
+      <ion-icon (click)="navigateToPage('follow')" name="person-add"></ion-icon>
       新增关注
     </ion-segment-button>
     <ion-segment-button value="system">
-      <ion-icon  name="notifications"></ion-icon>
+      <ion-icon (click)="navigateToPage('system-message')" name="notifications"></ion-icon>
       系统消息
     </ion-segment-button>
    </ion-segment>
@@ -38,7 +37,7 @@
     </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>
@@ -46,4 +45,4 @@
       <ion-button expand="block">免费提问</ion-button>
     </ion-card-content>
   </ion-card>
-</ion-content>
+</ion-content>

src/app/tab3/tab3.page.scss

@@ -1,6 +1,3 @@
-.details-container {
-  padding: 10px;
-}
 ion-card {
   top: 25px;
   margin: 10px;
@@ -13,6 +10,3 @@ ion-card-title {
 ion-avatar {
   margin-right: 10px;
 }
-ion-toolbar{
-  top: 10px;
-}

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,7 +8,7 @@ import { Component } from '@angular/core';
 })
 export class Tab3Page {
 
-  constructor() {}
+  constructor(private router: Router) {}
   openFeedbackPage() {
     // 打开反馈页面
   }
@@ -16,5 +17,7 @@ export class Tab3Page {
   openSettingsPage() {
     // 打开设置页面
   }
-
+  navigateToPage(page: string) {
+    this.router.navigate([`/tabs/${page}`]);
+  }
 }