Merge remote-tracking branch 'origin/main'

@@ -48,19 +48,26 @@ export struct PeopleShipHomeArticleListComponent {
     } else if (this.viewType == 2) {
     } else if (this.viewType == 2) {
       ErrorComponent()
       ErrorComponent()
     }  else {
     }  else {
-      this.ListLayout()
-      // CustomPullToRefresh({
-      //   alldata:this.arr,
-      //   scroller:this.scroller,
-      //   hasMore: false,
-      //   customList:()=>{
-      //     this.ListLayout()
-      //   },
-      //   onRefresh:(resolve)=>{
-      //     this.currentPage = 1
-      //     this.getPeopleShipPageArticleList(resolve)
-      //   },
-      // })
+      CustomPullToRefresh({
+        alldata:this.arr,
+        scroller:this.scroller,
+        hasMore:this.hasMore,
+        customList:()=>{
+          this.ListLayout()
+        },
+        onRefresh:(resolve)=>{
+          this.currentPage = 1
+          this.getPeopleShipPageArticleList(resolve)
+        },
+        onLoadMore:(resolve)=> {
+          if (this.hasMore === false) {
+            if(resolve) resolve('')
+            return
+          }
+          this.currentPage++
+          this.getPeopleShipPageArticleList(resolve)
+        }
+      })
     }
     }
 
 
   }
   }
@@ -90,14 +97,16 @@ export struct PeopleShipHomeArticleListComponent {
 
 
         // 加载更多
         // 加载更多
         ListItem() {
         ListItem() {
-          if (this.hasMore && this.arr && this.arr.length > 0) {
-            LoadMoreLayout({ isVisible: this.hasMore })
-          } else if (!this.hasMore && !this.isLoading) {
+          // if (this.hasMore && this.arr && this.arr.length > 0) {
+          //   LoadMoreLayout({ isVisible: this.hasMore })
+          // } else
+          if (!this.hasMore && !this.isLoading) {
             PeopleShipNoMoreData()
             PeopleShipNoMoreData()
           }
           }
         }
         }
     }
     }
     .cachedCount(4)
     .cachedCount(4)
+    .scrollBar(BarState.Off)
     .backgroundColor(Color.Transparent)
     .backgroundColor(Color.Transparent)
     .width("100%")
     .width("100%")
     .height("100%")
     .height("100%")

@@ -104,8 +104,8 @@ struct LaunchAdvertisingPage {
                 .margin({top:'10lpx',right:'19lpx'})
                 .margin({top:'10lpx',right:'19lpx'})
                 .backgroundColor('#80000000')
                 .backgroundColor('#80000000')
                 .onClick(() => {
                 .onClick(() => {
-                  this.enter()
                   this.trackingLaunchJumpOver()
                   this.trackingLaunchJumpOver()
+                  this.enter()
                 }).margin({right:16})
                 }).margin({right:16})
 
 
               }.margin({top:50}).width('100%').height('56lpx')
               }.margin({top:50}).width('100%').height('56lpx')