|  | @@ -102,17 +102,6 @@
 | 
	
		
			
				|  |  |      </div>
 | 
	
		
			
				|  |  |    </div>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -  <!-- 轮播图区域 -->
 | 
	
		
			
				|  |  | -  <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
 | 
	
		
			
				|  |  | ->>>>>>> b008be561b87c697d051ef39af1817f6cc35bd8d
 | 
	
		
			
				|  |  |  </div>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  <!-- 浮动操作按钮 -->
 |