Merge branch 'master' of http://git.fmode.cn:3000/5230275/FilmTraceExplore

src/app/search/search.page.ts

@@ -9,8 +9,8 @@ import { Router } from '@angular/router';
 })
 
 export class SearchPage {
-  hotSearches: string[] = ['JavaScript', 'Angular', 'Ionic', 'TypeScript'];
-  searchHistory: string[] = ['React', 'Vue', 'Node.js'];
+  hotSearches: string[] = ['大闹天宫', '秘密森林', '无双', '霸王别姬'];
+  searchHistory: string[] = ['无双', '满城尽带黄金甲', '白鹿原'];
 
   search() {
     // 实现搜索功能的逻辑

src/app/tab1/tab1.page.scss

@@ -1,5 +1,5 @@
 .carousel {
-  padding: 5%;
+  padding: 2%;
   display: flex;  
   overflow-x: auto;  
   scrollbar-width: none; /* Firefox */