陈剑华

Merge remote-tracking branch 'origin/main'

@@ -17,7 +17,7 @@ export struct ColumnPage { @@ -17,7 +17,7 @@ export struct ColumnPage {
17 pageId: string = ""; 17 pageId: string = "";
18 channelId: string = ""; 18 channelId: string = "";
19 pageName: string = '' 19 pageName: string = ''
20 - 20 + @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
21 aboutToAppear() { 21 aboutToAppear() {
22 this.pageId = this.param.pageId 22 this.pageId = this.param.pageId
23 this.channelId = this.param.channelId 23 this.channelId = this.param.channelId
@@ -26,6 +26,7 @@ export struct ColumnPage { @@ -26,6 +26,7 @@ export struct ColumnPage {
26 26
27 build() { 27 build() {
28 Column() { 28 Column() {
  29 + Blank().height(`${this.topSafeHeight}px`)
29 CustomTitleUI({ titleName: this.pageName }) 30 CustomTitleUI({ titleName: this.pageName })
30 PageComponent({ 31 PageComponent({
31 currentTopNavSelectedIndex: $currentTopNavSelectedIndex, 32 currentTopNavSelectedIndex: $currentTopNavSelectedIndex,