From eee229150d3cb59eede0398fe9dd9052476b96da Mon Sep 17 00:00:00 2001
From: Anne_LXM <liuxiaomei@dcloud.io>
Date: Wed, 12 Jun 2024 21:48:56 +0800
Subject: [PATCH] =?UTF-8?q?test(scroll-view):=20=E6=94=AF=E6=8C=81=20iOS?=
 =?UTF-8?q?=20=E7=AB=AF=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/scroll-view/scroll-view-refresher.uvue |  8 ++++----
 pages/component/scroll-view/scroll-view.test.js        | 10 +---------
 pages/component/scroll-view/scroll-view.uvue           |  2 +-
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/pages/component/scroll-view/scroll-view-refresher.uvue b/pages/component/scroll-view/scroll-view-refresher.uvue
index ddd5611a..f3c5398d 100644
--- a/pages/component/scroll-view/scroll-view-refresher.uvue
+++ b/pages/component/scroll-view/scroll-view-refresher.uvue
@@ -43,7 +43,7 @@
     },
 
     methods: {
-      onRefresherrefresh(e : UniRefresherEvent)) {
+      onRefresherrefresh(e : UniRefresherEvent) {
         this.refresherrefresh = true
         console.log("onRefresherrefresh------下拉刷新触发")
         this.checkEventTest({
@@ -58,7 +58,7 @@
           this.refresherTriggered = false
         }, 1500)
       },
-      onRefresherabort(e : UniRefresherEvent)) {
+      onRefresherabort(e : UniRefresherEvent) {
         console.log("onRefresherabort------下拉刷新被中止")
         this.checkEventTest({
           type:e.type,
@@ -67,7 +67,7 @@
           dy:e.detail.dy,
         } as RefresherEventTest,'refresherabort')
       },
-      onRefresherrestore(e : UniRefresherEvent)) {
+      onRefresherrestore(e : UniRefresherEvent) {
         this.refresherrefresh = false
         console.log("onRefresherrestore------下拉刷新被复位")
         this.checkEventTest({
@@ -77,7 +77,7 @@
           dy:e.detail.dy,
         } as RefresherEventTest,'refresherrestore')
       },
-      onRefresherpulling(e : UniRefresherEvent)) {
+      onRefresherpulling(e : UniRefresherEvent) {
         console.log("onRefresherpulling------拉刷新控件被下拉-dy=" + e.detail.dy)
         this.checkEventTest({
           type:e.type,
diff --git a/pages/component/scroll-view/scroll-view.test.js b/pages/component/scroll-view/scroll-view.test.js
index 996f85f2..f2b82ea8 100644
--- a/pages/component/scroll-view/scroll-view.test.js
+++ b/pages/component/scroll-view/scroll-view.test.js
@@ -1,13 +1,5 @@
 jest.setTimeout(30000);
 describe('component-native-scroll-view', () => {
-  const platformInfo = process.env.uniTestPlatformInfo.toLocaleLowerCase()
-  const isIos = platformInfo.startsWith('ios')
-  if (isIos) {
-    it('dummyTest', () => {
-      expect(1).toBe(1)
-    })
-    return
-  }
   let page;
   beforeAll(async () => {
     page = await program.reLaunch('/pages/component/scroll-view/scroll-view');
@@ -40,7 +32,7 @@ describe('component-native-scroll-view', () => {
       expect(topScrollDetail.scrollHeight).toBeGreaterThan(0)
       expect(topScrollDetail.scrollWidth).toBeGreaterThan(0)
       expect(topScrollDetail.deltaX).toBe(0)
-      expect(topScrollDetail.deltaY).toBe(-100)
+      expect(topScrollDetail.deltaY).not.toBe(0)
     }
     expect(await page.data('isScrollTest')).toBe('scroll:Success')
   })
diff --git a/pages/component/scroll-view/scroll-view.uvue b/pages/component/scroll-view/scroll-view.uvue
index 77df240f..66810f21 100644
--- a/pages/component/scroll-view/scroll-view.uvue
+++ b/pages/component/scroll-view/scroll-view.uvue
@@ -11,7 +11,7 @@
         </view>
         <view>
           <scroll-view :scroll-top="scrollTop" direction="vertical" class="scroll-Y" scroll-with-animation="true"
-            @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" :show-scrollbar="showScrollbar">
+            @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll" @scrollend="end" :show-scrollbar="showScrollbar">
             <view class="scroll-view-item uni-bg-red"><text class="text">A</text></view>
             <view class="scroll-view-item uni-bg-green"><text class="text">B</text></view>
             <view class="scroll-view-item uni-bg-blue"><text class="text">C</text></view>
-- 
GitLab