Merge remote-tracking branch 'origin/main'

@@ -38,20 +38,19 @@ export struct QualityCommentsComponent {
 
 
 
 
   aboutToDisappear(): void {
   aboutToDisappear(): void {
-
-    const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
-    const windowClass: window.Window = windowStage.getMainWindowSync(); // 获取应用主窗口
-    windowClass.setWindowBackgroundColor(this.lastWindowColor)
-    windowClass.setWindowLayoutFullScreen(false)
     // windowClass.setWindowSystemBarProperties({ statusBarColor: '#000' })
     // windowClass.setWindowSystemBarProperties({ statusBarColor: '#000' })
-
     this.dialogController = null // 将dialogController置空
     this.dialogController = null // 将dialogController置空
+  }
 
 
+  onPageShow(): void {
+    WindowModel.shared.setWindowLayoutFullScreen(true)
   }
   }
 
 
-  aboutToAppear(): void {
+  onPageHide(): void {
+    WindowModel.shared.setWindowLayoutFullScreen(false)
+  }
 
 
-    this.fullScreen();
+  aboutToAppear(): void {
     this.getData();
     this.getData();
     this.showAlert()
     this.showAlert()
   }
   }
@@ -100,13 +99,6 @@ export struct QualityCommentsComponent {
     })
     })
   }
   }
 
 
-  fullScreen() {
-    const windowStage = WindowModel.shared.getWindowStage() as window.WindowStage
-    const windowClass: window.Window = windowStage.getMainWindowSync(); // 获取应用主窗口
-    windowClass.setWindowLayoutFullScreen(true)
-
-  }
-
   @Builder
   @Builder
   titleHeader() {
   titleHeader() {
     Row() {
     Row() {
@@ -249,7 +241,7 @@ export struct QualityCommentsComponent {
       }
       }
       // ListItem() {
       // ListItem() {
       //
       //
-      // }.height(this.bottomSafeHeight)
+      // }.height(`${this.bottomSafeHeight}` + 'px')
     }.onReachEnd(()=>{
     }.onReachEnd(()=>{
       this.currentPage++
       this.currentPage++
       this.getData()
       this.getData()