src/app/tab1/tab1.page.html

@@ -1,8 +1,6 @@
-<<<<<<< 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">
@@ -64,11 +62,7 @@
     <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>
@@ -107,8 +101,6 @@
       <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 + '%)' }">
@@ -120,6 +112,7 @@
     </ng-container>
   </div>
 >>>>>>> 4f45335c00c8e925b67f803d52e4c36b1fd571e3
+>>>>>>> b008be561b87c697d051ef39af1817f6cc35bd8d
 </div>
 
 <!-- 浮动操作按钮 -->