1
0

5 Коммиты c95edb79cf ... f4dd4f0070

Автор SHA1 Сообщение Дата
  0225273 f4dd4f0070 Merge branch 'master' of http://git.fmode.cn:3000/0225273/APPmy 7 месяцев назад
  0225273 2fba7c3dd4 videos 7 месяцев назад
  0225273 a483e903e2 video change 7 месяцев назад
  0225273 098bafe911 Merge branch 'master' of http://git.fmode.cn:3000/0225273/APPmy 7 месяцев назад
  0225273 7d5c1ad396 add videos 7 месяцев назад

+ 18 - 26
src/app/tab1/tab1.page.html

@@ -308,32 +308,24 @@
   <!-- 视频页 -->
   <div *ngIf="selectedSegment === 'video'">
     <!-- 视频内容 -->
-    <div class="like-wrapper">
-      <input class="check" type="checkbox" id="like-toggle" />
-      <label class="container" for="like-toggle">
-        <svg
-          viewBox="0 0 512 512"
-          xmlns="http://www.w3.org/2000/svg"
-          class="icon inactive"
-        >
-          <path
-            d="M225.8 468.2l-2.5-2.3L48.1 303.2C17.4 274.7 0 234.7 0 192.8v-3.3c0-70.4 50-130.8 119.2-144C158.6 37.9 198.9 47 231 69.6c9 6.4 17.4 13.8 25 22.3c4.2-4.8 8.7-9.2 13.5-13.3c3.7-3.2 7.5-6.2 11.5-9c0 0 0 0 0 0C313.1 47 353.4 37.9 392.8 45.4C462 58.6 512 119.1 512 189.5v3.3c0 41.9-17.4 81.9-48.1 110.4L288.7 465.9l-2.5 2.3c-8.2 7.6-19 11.9-30.2 11.9s-22-4.2-30.2-11.9zM239.1 145c-.4-.3-.7-.7-1-1.1l-17.8-20c0 0-.1-.1-.1-.1c0 0 0 0 0 0c-23.1-25.9-58-37.7-92-31.2C81.6 101.5 48 142.1 48 189.5v3.3c0 28.5 11.9 55.8 32.8 75.2L256 430.7 431.2 268c20.9-19.4 32.8-46.7 32.8-75.2v-3.3c0-47.3-33.6-88-80.1-96.9c-34-6.5-69 5.4-92 31.2c0 0 0 0-.1 .1s0 0-.1 .1l-17.8 20c-.3 .4-.7 .7-1 1.1c-4.5 4.5-10.6 7-16.9 7s-12.4-2.5-16.9-7z"
-          ></path>
-        </svg>
-        <svg
-          viewBox="0 0 512 512"
-          xmlns="http://www.w3.org/2000/svg"
-          class="icon active"
-        >
-          <path
-            d="M47.6 300.4L228.3 469.1c7.5 7 17.4 10.9 27.7 10.9s20.2-3.9 27.7-10.9L464.4 300.4c30.4-28.3 47.6-68 47.6-109.5v-5.8c0-69.9-50.5-129.5-119.4-141C347 36.5 300.6 51.4 268 84L256 96 244 84c-32.6-32.6-79-47.5-124.6-39.9C50.5 55.6 0 115.2 0 185.1v5.8c0 41.5 17.2 81.2 47.6 109.5z"
-          ></path>
-        </svg>
-        <div class="checkmark"></div>
-        <span class="like-text">like</span>
-      </label>
-    </div>
-    <img src="assets\img\customer-avatar.jpg" alt="Example 0">
+    <ion-grid>
+      <ion-row>
+        <ion-col size="12" size-md="6" size-lg="4" *ngFor="let video of videos">
+          <ion-card>
+            <video width="100%" controls>
+              <source [src]="video.videoUrl" type="video/mp4">
+              Your browser does not support the video tag.
+            </video>
+            <ion-card-header>
+              <ion-card-title>{{video.title}}</ion-card-title>
+            </ion-card-header>
+            <ion-card-content>
+              {{video.description}}
+            </ion-card-content>
+          </ion-card>
+        </ion-col>
+      </ion-row>
+    </ion-grid>
   </div>
 
   <!-- 案例设计页 -->

+ 10 - 0
src/app/tab1/tab1.page.scss

@@ -325,4 +325,14 @@ p {
 .swiper-slide img {
   display: block;
   width: 100%;
+}
+
+ion-card {
+  margin: 10px;
+}
+
+ion-card img {
+  width: 100%;
+  height: 200px;
+  object-fit: cover;
 }

+ 53 - 1
src/app/tab1/tab1.page.ts

@@ -53,7 +53,59 @@ export class Tab1Page implements OnInit {
     // 添加更多示例数据
   ];
   
-
+  videos: { videoUrl: string, title: string, description: string }[] = [
+    {
+      videoUrl: 'assets/videos/video1.mp4',
+      title: '房屋装修设计指南',
+      description: '了解如何打造理想的家居装修风格'
+    },
+    {
+      videoUrl: 'assets/videos/video2.mp4',
+      title: '家具选购攻略',
+      description: '挑选适合你家的家具,打造舒适空间'
+    },
+    {
+      videoUrl: 'assets/videos/video3.mp4',
+      title: '客厅装饰灵感',
+      description: '打造温馨舒适的客厅装饰'
+    },
+    {
+      videoUrl: 'assets/videos/video4.mp4',
+      title: '卧室设计技巧',
+      description: '掌握卧室设计的实用技巧'
+    },
+    {
+      videoUrl: 'assets/videos/video5.mp4',
+      title: '厨房装修实例',
+      description: '欣赏不同风格的厨房装修案例'
+    },
+    {
+      videoUrl: 'assets/videos/video6.mp4',
+      title: '阳台花园布置',
+      description: '打造美丽的阳台花园'
+    },
+    {
+      videoUrl: 'assets/videos/video7.mp4',
+      title: '书房设计灵感',
+      description: '打造宁静的读书空间'
+    },
+    {
+      videoUrl: 'assets/videos/video8.mp4',
+      title: '浴室装修技巧',
+      description: '打造舒适的浴室空间'
+    },
+    {
+      videoUrl: 'assets/videos/video9.mp4',
+      title: '家居风水指南',
+      description: '了解家居风水的重要性'
+    },
+    {
+      videoUrl: 'assets/videos/video10.mp4',
+      title: '家庭影院布置',
+      description: '打造私人家庭影院'
+    }
+    // 可以根据需要添加更多视频数据
+  ];
 
 
 

+ 2 - 2
src/app/tab2/tab2.page.spec.ts

@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { IonicModule } from '@ionic/angular';
 
-import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';
+//import { ExploreContainerComponentModule } from '../explore-container/explore-container.module';
 
 import { Tab2Page } from './tab2.page';
 
@@ -12,7 +12,7 @@ describe('Tab2Page', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [Tab2Page],
-      imports: [IonicModule.forRoot(), ExploreContainerComponentModule]
+      //imports: [IonicModule.forRoot(), ExploreContainerComponentModule]
     }).compileComponents();
 
     fixture = TestBed.createComponent(Tab2Page);

+ 1 - 1
src/app/tab3/tab3.page.html

@@ -158,5 +158,5 @@
     </ion-item>
    </div>
   </div>
-  </div>
+</div>
 </ion-content>

BIN
src/assets/videos/video1.mp4


BIN
src/assets/videos/video10.mp4


BIN
src/assets/videos/video2.mp4


BIN
src/assets/videos/video3.mp4


BIN
src/assets/videos/video4.mp4


BIN
src/assets/videos/video5.mp4


BIN
src/assets/videos/video6.mp4


BIN
src/assets/videos/video7.mp4


BIN
src/assets/videos/video8.mp4


BIN
src/assets/videos/video9.mp4