Merge remote-tracking branch 'origin/main'

@@ -109,6 +109,7 @@ export struct HomePageBottomFollowComponent {
         CustomPullToRefresh({
         CustomPullToRefresh({
           alldata:this.data_follow,
           alldata:this.data_follow,
           scroller:this.scroller,
           scroller:this.scroller,
+          hasMore:this.hasMore,
           customList:()=>{
           customList:()=>{
             this.ListLayout()
             this.ListLayout()
           },
           },
@@ -128,6 +129,7 @@ export struct HomePageBottomFollowComponent {
               this.isLoading = true
               this.isLoading = true
               //加载分页数据
               //加载分页数据
               this.getNewPageData()
               this.getNewPageData()
+              if(resolve) resolve('刷新成功')
             }
             }
           }
           }
         })
         })
@@ -197,7 +199,7 @@ export struct HomePageBottomFollowComponent {
 
 
   getMyFollowListDetail() {
   getMyFollowListDetail() {
     if (this.hasMore) {
     if (this.hasMore) {
-      let object = new FollowListDetailRequestItem(-1, 20, this.curPageNum)
+      let object = new FollowListDetailRequestItem(-1, 10, this.curPageNum)
 
 
       MinePageDatasModel.getMineFollowListData(object, getContext(this)).then((value) => {
       MinePageDatasModel.getMineFollowListData(object, getContext(this)).then((value) => {
         if (this.curPageNum === 1) this.data_follow.clear()
         if (this.curPageNum === 1) this.data_follow.clear()
@@ -222,7 +224,7 @@ export struct HomePageBottomFollowComponent {
           })
           })
           this.data_follow.notifyDataReload()
           this.data_follow.notifyDataReload()
           this.count = this.data_follow.totalCount()
           this.count = this.data_follow.totalCount()
-          if (this.data_follow.totalCount() < value.totalCount) {
+          if (value.hasNext === 1) {
             this.curPageNum++
             this.curPageNum++
           } else {
           } else {
             this.hasMore = false
             this.hasMore = false

@@ -70,6 +70,7 @@ export struct OtherHomePageBottomFollowComponent{
         CustomPullToRefresh({
         CustomPullToRefresh({
           alldata:this.data_follow,
           alldata:this.data_follow,
           scroller:this.scroller,
           scroller:this.scroller,
+          hasMore:this.hasMore,
           customList:()=>{
           customList:()=>{
             this.ListLayout()
             this.ListLayout()
           },
           },
@@ -89,6 +90,7 @@ export struct OtherHomePageBottomFollowComponent{
               this.isLoading = true
               this.isLoading = true
               //加载分页数据
               //加载分页数据
               this.getNewPageData()
               this.getNewPageData()
+              if(resolve) resolve('刷新成功')
             }
             }
           }
           }
         })
         })
@@ -160,7 +162,7 @@ export struct OtherHomePageBottomFollowComponent{
     this.isLoading = true
     this.isLoading = true
     //关注列表
     //关注列表
     if(this.hasMore){
     if(this.hasMore){
-      let object = new UserFollowListRequestItem(Number(this.curUserId),20,this.curPageNum,"1")
+      let object = new UserFollowListRequestItem(Number(this.curUserId),10,this.curPageNum,"1")
 
 
       MinePageDatasModel.getOtherUserFollowListData(object,getContext(this)).then((value)=>{
       MinePageDatasModel.getOtherUserFollowListData(object,getContext(this)).then((value)=>{
 
 
@@ -186,7 +188,7 @@ export struct OtherHomePageBottomFollowComponent{
           this.data_follow.notifyDataReload()
           this.data_follow.notifyDataReload()
           this.count = this.data_follow.totalCount()
           this.count = this.data_follow.totalCount()
 
 
-          if (this.data_follow.totalCount() < value.totalCount) {
+          if (value.hasNext === 1) {
             this.curPageNum++
             this.curPageNum++
           }else {
           }else {
             this.hasMore = false
             this.hasMore = false

@@ -665,7 +665,7 @@ export struct PaperSingleColumn999CardView {
   buildSourceString(): string {
   buildSourceString(): string {
     let contentString: string = ''
     let contentString: string = ''
     if (this.item?.rmhInfo?.rmhName.length > 0) {
     if (this.item?.rmhInfo?.rmhName.length > 0) {
-      contentString = this.item?.rmhInfo?.rmhName
+      // contentString = this.item?.rmhInfo?.rmhName
     }else if(this.item?.source.length > 0){
     }else if(this.item?.source.length > 0){
       contentString = this.item?.source
       contentString = this.item?.source
     }
     }