Merge remote-tracking branch 'origin/main'

@@ -50,9 +50,11 @@ export struct CardSourceInfo {
 
 
   showCommentNum() {
   showCommentNum() {
     const curRouter = router.getState().name;
     const curRouter = router.getState().name;
-    return curRouter !== 'PeopleShipHomePage'
+    // return curRouter !== 'PeopleShipHomePage'
+    return true
   }
   }
 
 
+
   /**
   /**
    * 全域数字显示规则
    * 全域数字显示规则
    * 1、当数量为千位以內时，显示数字，不保留小数点，比如 4585
    * 1、当数量为千位以內时，显示数字，不保留小数点，比如 4585
@@ -154,8 +156,6 @@ export struct CardSourceInfo {
           .fontSize($r("app.float.font_size_11"))
           .fontSize($r("app.float.font_size_11"))
           .fontColor($r("app.color.color_B0B0B0"))
           .fontColor($r("app.color.color_B0B0B0"))
           .flexShrink(0)
           .flexShrink(0)
-          .visibility(Number(this.getContentDtoBean()?.interactData?.commentNum) === 0 ? Visibility.None :
-          Visibility.Visible)
       }
       }
 
 
       // if (this.getContentDtoBean()?.interactData?.commentNum && this.contentDTO.source) {
       // if (this.getContentDtoBean()?.interactData?.commentNum && this.contentDTO.source) {

@@ -109,9 +109,7 @@ export struct Card6Component {
       }
       }
 
 
       .alignItems(HorizontalAlign.Start)
       .alignItems(HorizontalAlign.Start)
-      .height(this.contentDTO.appStyle === CompStyle.Card_13 ? '' : 156)
-
-
+      .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 78 : 156)
       .justifyContent(FlexAlign.SpaceBetween)
       .justifyContent(FlexAlign.SpaceBetween)
       .width('64%')
       .width('64%')
 
 

@@ -58,7 +58,6 @@ export struct HomePageBottomCommentComponent {
             this.curPageNum = 1;
             this.curPageNum = 1;
             this.hasMore = true
             this.hasMore = true
             this.isGetRequest = false
             this.isGetRequest = false
-            this.data_comment.clear()
 
 
             if (!this.isLoading){
             if (!this.isLoading){
               this.getNewPageData()
               this.getNewPageData()
@@ -71,6 +70,7 @@ export struct HomePageBottomCommentComponent {
               this.isLoading = true
               this.isLoading = true
               //加载分页数据
               //加载分页数据
               this.getNewPageData()
               this.getNewPageData()
+              if(resolve) resolve('刷新成功')
             }
             }
           }
           }
         })
         })
@@ -127,6 +127,7 @@ export struct HomePageBottomCommentComponent {
       let object = new FollowListDetailRequestItem(-1, 20, this.curPageNum)
       let object = new FollowListDetailRequestItem(-1, 20, this.curPageNum)
 
 
       MinePageDatasModel.getMineCommentListData(time, object, getContext(this)).then((value) => {
       MinePageDatasModel.getMineCommentListData(time, object, getContext(this)).then((value) => {
+        if (this.curPageNum === 1) this.data_comment.clear()
         if (!this.data_comment || value.list.length == 0) {
         if (!this.data_comment || value.list.length == 0) {
           this.hasMore = false
           this.hasMore = false
           this.isLoading = false
           this.isLoading = false
@@ -185,7 +186,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 (value.pageNum === 1) {
+      if (value.hasNext === 1) {
         this.curPageNum++
         this.curPageNum++
       } else {
       } else {
         this.hasMore = false
         this.hasMore = false
@@ -218,7 +219,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 (value.pageNum === 1) {
+      if (value.hasNext === 1) {
         this.curPageNum++
         this.curPageNum++
       } else {
       } else {
         this.hasMore = false
         this.hasMore = false

@@ -73,6 +73,7 @@ struct MineHomePage {
   }
   }
 
 
   build() {
   build() {
+    Column(){
       if(this.isConnectNetwork){
       if(this.isConnectNetwork){
         Stack({ alignContent: Alignment.Top }){
         Stack({ alignContent: Alignment.Top }){
           Stack({ alignContent: Alignment.Top }){
           Stack({ alignContent: Alignment.Top }){
@@ -299,7 +300,7 @@ struct MineHomePage {
           }
           }
           .margin({top:px2vp(this.topSafeHeight)})
           .margin({top:px2vp(this.topSafeHeight)})
         }.width('100%')
         }.width('100%')
-        .padding({bottom:px2vp(this.bottomSafeHeight)})
+        // .padding({bottom:px2vp(this.bottomSafeHeight)})
         .layoutWeight(1)
         .layoutWeight(1)
       }else{
       }else{
         Column(){
         Column(){
@@ -316,6 +317,8 @@ struct MineHomePage {
         }
         }
       }
       }
 
 
+    }.padding({bottom:px2vp(this.bottomSafeHeight)})
+
   }
   }
   @Builder MineHomeTitleTransparent() {
   @Builder MineHomeTitleTransparent() {
     RelativeContainer() {
     RelativeContainer() {