Merge remote-tracking branch 'origin/main'

@@ -50,6 +50,7 @@ export struct HomePageBottomCommentComponent {
         CustomPullToRefresh({
         CustomPullToRefresh({
           alldata:this.data_comment,
           alldata:this.data_comment,
           scroller:this.scroller,
           scroller:this.scroller,
+          hasMore:this.hasMore,
           customList:()=>{
           customList:()=>{
             this.ListLayout()
             this.ListLayout()
           },
           },
@@ -184,7 +185,7 @@ export struct HomePageBottomCommentComponent {
 
 
       this.count = this.data_comment.totalCount()
       this.count = this.data_comment.totalCount()
       this.commentNum = value.totalCount
       this.commentNum = value.totalCount
-      if (this.data_comment.totalCount() < value.totalCount) {
+      if (value.pageNum === 1) {
         this.curPageNum++
         this.curPageNum++
       } else {
       } else {
         this.hasMore = false
         this.hasMore = false
@@ -217,7 +218,7 @@ export struct HomePageBottomCommentComponent {
 
 
       this.count = this.data_comment.totalCount()
       this.count = this.data_comment.totalCount()
       this.commentNum = value.totalCount
       this.commentNum = value.totalCount
-      if (this.data_comment.totalCount() < value.totalCount) {
+      if (value.pageNum === 1) {
         this.curPageNum++
         this.curPageNum++
       } else {
       } else {
         this.hasMore = false
         this.hasMore = false

@@ -50,6 +50,7 @@ export struct OtherHomePageBottomCommentComponent {
         CustomPullToRefresh({
         CustomPullToRefresh({
           alldata:this.data_comment,
           alldata:this.data_comment,
           scroller:this.scroller,
           scroller:this.scroller,
+          hasMore:this.hasMore,
           customList:()=>{
           customList:()=>{
             this.ListLayout()
             this.ListLayout()
           },
           },
@@ -69,6 +70,7 @@ export struct OtherHomePageBottomCommentComponent {
               this.isLoading = true
               this.isLoading = true
               //加载分页数据
               //加载分页数据
               this.getNewPageData()
               this.getNewPageData()
+              if(resolve) resolve('刷新成功')
             }
             }
           }
           }
         })
         })
@@ -108,6 +110,13 @@ export struct OtherHomePageBottomCommentComponent {
         }
         }
       }
       }
     }
     }
+    // .onReachEnd(()=>{
+    //   if (!this.isLoading) {
+    //     this.isLoading = true
+    //     //加载分页数据
+    //     this.getNewPageData()
+    //   }
+    // })
     .cachedCount(5)
     .cachedCount(5)
     .layoutWeight(1)
     .layoutWeight(1)
     .scrollBar(BarState.Off)
     .scrollBar(BarState.Off)
@@ -185,7 +194,7 @@ export struct OtherHomePageBottomCommentComponent {
 
 
       this.count = this.data_comment.totalCount()
       this.count = this.data_comment.totalCount()
       this.commentNum = value.totalCount
       this.commentNum = value.totalCount
-      if (this.data_comment.totalCount() < value.totalCount) {
+      if (value.hasNext === 1) {
         this.curPageNum++
         this.curPageNum++
       } else {
       } else {
         this.hasMore = false
         this.hasMore = false
@@ -214,7 +223,7 @@ export struct OtherHomePageBottomCommentComponent {
 
 
       this.count = this.data_comment.totalCount()
       this.count = this.data_comment.totalCount()
       this.commentNum = value.totalCount
       this.commentNum = value.totalCount
-      if (this.data_comment.totalCount() < value.totalCount) {
+      if (value.hasNext === 1) {
         this.curPageNum++
         this.curPageNum++
       } else {
       } else {
         this.hasMore = false
         this.hasMore = false

 @Component
 @Component
 export struct PermissionDesComponent {
 export struct PermissionDesComponent {
   @State translateY: number = 0
   @State translateY: number = 0
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
 
 
   aboutToAppear(): void {
   aboutToAppear(): void {
     this.startDismiss()
     this.startDismiss()
@@ -29,7 +30,7 @@ export struct PermissionDesComponent {
     // .height(60)
     // .height(60)
     .backgroundColor('#FFFFFF')
     .backgroundColor('#FFFFFF')
     .border({ radius: 5 })
     .border({ radius: 5 })
-    .margin({ top: 12 })
+    .margin({ top: px2vp(this.topSafeHeight) })
     .padding(12)
     .padding(12)
     .zIndex(20)
     .zIndex(20)
   }
   }

@@ -115,7 +115,7 @@ struct LoginPage {
           Image($r("app.media.login_logo"))
           Image($r("app.media.login_logo"))
             .width(120)
             .width(120)
             .height(66)
             .height(66)
-            .margin({ top: 78 })
+            .margin({ top: 78 + px2vp(this.topSafeHeight) })
             .align(Alignment.Center)
             .align(Alignment.Center)
 
 
           LoginInputComponent({
           LoginInputComponent({
@@ -225,7 +225,7 @@ struct LoginPage {
         Image($r('app.media.login_closed'))
         Image($r('app.media.login_closed'))
           .width(24)
           .width(24)
           .height(24)
           .height(24)
-          .margin({ top: 10, right: 15 })
+          .margin({ top:px2vp(this.topSafeHeight), right: 15 })
           .alignRules({
           .alignRules({
             top: { anchor: "__container__", align: VerticalAlign.Top },
             top: { anchor: "__container__", align: VerticalAlign.Top },
             right: { anchor: "__container__", align: HorizontalAlign.End }
             right: { anchor: "__container__", align: HorizontalAlign.End }
@@ -249,7 +249,7 @@ struct LoginPage {
     .backgroundColor(Color.White)
     .backgroundColor(Color.White)
     }.width("100%")
     }.width("100%")
     .height("100%")
     .height("100%")
-    .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
+    // .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
 
 
   }
   }