Merge remote-tracking branch 'origin/main'

@@ -26,6 +26,8 @@ struct SearchCreatorPage {
   @State isLoading: boolean = false
   @State hasMore: boolean = true
   curPageNum: number = 1;
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
 
   onPageShow() {
     this.keyword = this.params?.pageID;
@@ -154,51 +156,57 @@ struct SearchCreatorPage {
   }
 
   build() {
-    Column() {
-      CustomTitleUI({ titleName: "全部结果" })
-      Divider()
-        .width('100%')
-        .height('1lpx')
-        .color($r('app.color.color_F5F5F5'))
-        .strokeWidth('1lpx')
-
-      Column(){
-        if(this.count === 0){
-          ListHasNoMoreDataUI({style:2})
-            .height('100%')
-        }else{
-          List({ space: 3 }) {
-            LazyForEach(this.data, (item: FollowListDetailItem, index: number = 0) => {
-              ListItem() {
-                FollowChildComponent({data: item,type:1})
-              }
-              .onClick(() => {
-              })
-            }, (item: FollowListDetailItem, index: number) => index.toString())
+    Column(){
+      Column() {
+        CustomTitleUI({ titleName: "全部结果" })
+        Divider()
+          .width('100%')
+          .height('1lpx')
+          .color($r('app.color.color_F5F5F5'))
+          .strokeWidth('1lpx')
+
+        Column(){
+          if(this.count === 0){
+            ListHasNoMoreDataUI({style:2})
+              .height('100%')
+          }else{
+            List({ space: 3 }) {
+              LazyForEach(this.data, (item: FollowListDetailItem, index: number = 0) => {
+                ListItem() {
+                  FollowChildComponent({data: item,type:1})
+                }
+                .onClick(() => {
+                })
+              }, (item: FollowListDetailItem, index: number) => index.toString())
 
-            //没有更多数据  显示提示
-            if(!this.hasMore){
-              ListItem(){
-                ListHasNoMoreDataUI()
+              //没有更多数据  显示提示
+              if(!this.hasMore){
+                ListItem(){
+                  ListHasNoMoreDataUI()
+                }
               }
-            }
-          }.cachedCount(5)
-          .padding({left:'31lpx',right:'31lpx'})
-          .layoutWeight(1)
-          .scrollBar(BarState.Off)
-          .onReachEnd(()=>{
-            console.log(TAG,"触底了");
-            if(!this.isLoading){
-              this.isLoading = true
-              //加载分页数据
-              this.getNewPageData()
-            }
-          })
-        }
-      }.layoutWeight(1)
+            }.cachedCount(5)
+            .padding({left:'31lpx',right:'31lpx'})
+            .layoutWeight(1)
+            .scrollBar(BarState.Off)
+            .onReachEnd(()=>{
+              console.log(TAG,"触底了");
+              if(!this.isLoading){
+                this.isLoading = true
+                //加载分页数据
+                this.getNewPageData()
+              }
+            })
+          }
+        }.layoutWeight(1)
+        .width('100%')
+      }
       .width('100%')
-    }
-    .width('100%')
-    .height('100%')
+      .height('100%')
+    }.width("100%")
+    .height("100%")
+    .backgroundColor($r('app.color.color_transparent'))
+    .padding({top:px2vp(this.topSafeHeight)})
+
   }
 }
\ No newline at end of file