init: web3-1234567 0.1

src/app/tab1/tab1.page.html

@@ -1,5 +1,8 @@
+<<<<<<< HEAD
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
+=======
+>>>>>>> 4f45335c00c8e925b67f803d52e4c36b1fd571e3
 <ion-header>
   <ion-toolbar color="primary">
     <ion-buttons slot="start">
@@ -61,7 +64,11 @@
     <div class="title">今日推荐医生</div>
     <div class="subtitle">每日更新</div>
   </div>
+<<<<<<< HEAD
   <div class="scroll-container" id="carousel" (touchstart)="onTouchStart($event)" (touchmove)="onTouchMove($event)" (touchend)="onTouchEnd($event)" [ngStyle]="{ transform: 'translateX(' + currentTranslate + 'px)' }">
+=======
+  <div class="scroll-container" id="carousel" (touchstart)="onTouchStart($event)" (touchmove)="onTouchMove($event)" (touchend)="onTouchEnd($event)" [ngStyle]="{ transform: 'translateX(' + currentTranslate + '%)' }">
+>>>>>>> 4f45335c00c8e925b67f803d52e4c36b1fd571e3
     <ng-container *ngFor="let doctor of doctors; let i = index">
       <div class="card">
         <div class="tag">专家</div>
@@ -100,6 +107,19 @@
       <div class="label">{{ item.label }}</div>
     </div>
   </div>
+<<<<<<< HEAD
+=======
+
+  <!-- 轮播图区域 -->
+  <div class="promotion-carousel" id="promotionCarousel" (touchstart)="onPromotionTouchStart($event)" (touchmove)="onPromotionTouchMove($event)" (touchend)="onPromotionTouchEnd($event)" [ngStyle]="{ transform: 'translateX(' + promotionCurrentTranslate + '%)' }">
+    <ng-container *ngFor="let poster of promotionPosters; let i = index">
+      <div class="poster">
+        <img [src]="poster.image" alt="Promotion Poster" />
+        <div class="description">{{ poster.description }}</div>
+      </div>
+    </ng-container>
+  </div>
+>>>>>>> 4f45335c00c8e925b67f803d52e4c36b1fd571e3
 </div>
 
 <!-- 浮动操作按钮 -->

src/app/tab1/tab1.page.scss

@@ -1,4 +1,3 @@
-
 ion-toolbar {
     --background: #1a73e8; /* 主题颜色 */
     --color: white; /* 文字颜色 */