fix:bug[17410] 我的关注无法下拉刷新

yangchenggong1_wd
Commit 8b4f8de672db546ee73187beb0132d24f1b0d062 8b4f8de6 1 parent 74fa31aa
Showing 2 changed files with 69 additions and 28 deletions
sight_harmony/features/wdComponent/src/main/ets/components/mine/home/HomePageBottomFollowComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/mine/home/OtherHomePageBottomFollowComponent.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/mine/home/HomePageBottomFollowComponent.ets
View file @8b4f8de
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/mine/home/HomePageBottomFollowComponent.ets
View file @8b4f8de
@@ -7,6 +7,7 @@ import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
 import { FollowChildComponent } from '../follow/FollowChildComponent';
 import dataPreferences from '@ohos.data.preferences';
 import { EmptyComponent } from '../../view/EmptyComponent';
+import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh';
 const TAG = "HomePageBottomFollowComponent"
 /**
@@ -14,6 +15,7 @@ const TAG = "HomePageBottomFollowComponent"
  */
 @Component
 export struct HomePageBottomFollowComponent {
+  private scroller: Scroller = new Scroller();
   @State data_follow: LazyDataSource<FollowListDetailItem> = new LazyDataSource();
   @State isLoading: boolean = false
   @State hasMore: boolean = true
@@ -104,8 +106,40 @@ export struct HomePageBottomFollowComponent {
           })
         }.layoutWeight(1)
       } else {
-        List({ space: 3 }) {
+        CustomPullToRefresh({
+          alldata:this.data_follow,
+          scroller:this.scroller,
+          customList:()=>{
+            this.ListLayout()
+          },
+          onRefresh:(resolve)=>{
+            this.curPageNum = 1;
+            this.hasMore = true
+            this.isGetRequest = false
+            this.data_follow.clear()
+
+            if (!this.isLoading){
+              this.getNewPageData()
+              if(resolve) resolve('刷新成功')
+            }
+          },
+          onLoadMore:(resolve)=> {
+            console.log(TAG, "触底了");
+            if (!this.isLoading) {
+              this.isLoading = true
+              //加载分页数据
+              this.getNewPageData()
+            }
+          }
+        })
+      }
+    }.layoutWeight(1)
+    .justifyContent(FlexAlign.Start)
+    .width('100%')
+  }
+  @Builder ListLayout(){
+    List({ space: 3 ,scroller:this.scroller}) {
       ListItem() {
         Row() {
           Text("关注更多人民号")
@@ -136,7 +170,6 @@ export struct HomePageBottomFollowComponent {
           FollowChildComponent({ data: item, type: 2 })
         }
       }, (item: FollowListDetailItem, index: number) => index.toString())
-
       //没有更多数据  显示提示
       if (!this.hasMore) {
         ListItem() {
@@ -153,18 +186,6 @@ export struct HomePageBottomFollowComponent {
       scrollForward: NestedScrollMode.PARENT_FIRST,
       scrollBackward: NestedScrollMode.SELF_FIRST
     })
-        .onReachEnd(() => {
-          console.log(TAG, "触底了");
-          if (!this.isLoading) {
-            this.isLoading = true
-            //加载分页数据
-            this.getNewPageData()
-          }
-        })
-      }
-    }.layoutWeight(1)
-    .justifyContent(FlexAlign.Start)
-    .width('100%')
   }
   @Styles
--- a/sight_harmony/features/wdComponent/src/main/ets/components/mine/home/OtherHomePageBottomFollowComponent.ets
View file @8b4f8de
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/mine/home/OtherHomePageBottomFollowComponent.ets
View file @8b4f8de
@@ -4,6 +4,7 @@ import { WDRouterRule, WDRouterPage } from 'wdRouter';
 import MinePageDatasModel from '../../../model/MinePageDatasModel';
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem';
 import { UserFollowListRequestItem } from '../../../viewmodel/UserFollowListRequestItem';
+import { CustomPullToRefresh } from '../../reusable/CustomPullToRefresh';
 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
 import { EmptyComponent } from '../../view/EmptyComponent';
 import { FollowChildComponent } from '../follow/FollowChildComponent';
@@ -22,7 +23,7 @@ export struct OtherHomePageBottomFollowComponent{
   @State count:number = 0;
   @Prop curUserId: string
   @State isGetRequest:boolean = false
-
+  private scroller: Scroller = new Scroller();
   aboutToAppear(){
     this.getNewPageData()
@@ -66,8 +67,39 @@ export struct OtherHomePageBottomFollowComponent{
         }.layoutWeight(1)
         .justifyContent(FlexAlign.Start)
       }else{
-        List({ space: 3 }) {
+        CustomPullToRefresh({
+          alldata:this.data_follow,
+          scroller:this.scroller,
+          customList:()=>{
+            this.ListLayout()
+          },
+          onRefresh:(resolve)=>{
+            this.curPageNum = 1;
+            this.hasMore = true
+            this.isGetRequest = false
+            this.data_follow.clear()
+            if (!this.isLoading){
+              this.getNewPageData()
+              if(resolve) resolve('刷新成功')
+            }
+          },
+          onLoadMore:(resolve)=> {
+            console.log(TAG, "触底了");
+            if (!this.isLoading) {
+              this.isLoading = true
+              //加载分页数据
+              this.getNewPageData()
+            }
+          }
+        })
+      }
+    }
+    .width('100%')
+  }
+
+  @Builder ListLayout(){
+    List({ space: 3 ,scroller:this.scroller}) {
       ListItem() {
         Row(){
           Text("关注更多人民号")
@@ -115,19 +147,7 @@ export struct OtherHomePageBottomFollowComponent{
       scrollForward: NestedScrollMode.PARENT_FIRST,
       scrollBackward: NestedScrollMode.SELF_FIRST
     })
-        .onReachEnd(()=>{
-          console.log(TAG,"触底了");
-          if(!this.isLoading){
-            this.isLoading = true
-            //加载分页数据
-            this.getNewPageData()
   }
-        })
-      }
-    }
-    .width('100%')
-  }
-
   @Styles
   listStyle() {