From ae92c8a1b006232b68a2834c88d4ade79a6f7a0d Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Thu, 4 Jan 2024 13:40:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E4=B8=8E=E6=B5=8B=E8=AF=95=E4=BE=8B=E9=80=82=E9=85=8Dweb?=
 =?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/API/request/request.test.js    | 27 +++++++++++++++------------
 pages/CSS/layout/position.uvue       |  3 +++
 pages/CSS/transform/rotate.uvue      |  2 +-
 pages/CSS/transform/scale.uvue       |  2 +-
 pages/CSS/transform/translate.uvue   |  2 +-
 pages/CSS/transition/transition.uvue |  2 +-
 6 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/pages/API/request/request.test.js b/pages/API/request/request.test.js
index d4fbf939..8639e985 100644
--- a/pages/API/request/request.test.js
+++ b/pages/API/request/request.test.js
@@ -79,16 +79,19 @@ describe('ExtApi-Request', () => {
     await request(page, 'HEAD');
   });
 
-  it('Check Set Cookie', async () => {
-    res = await page.callMethod('jest_set_cookie')
-    await page.waitFor(500);
-    res = await page.data('jest_result');
-    expect(res).toBe(true)
-  });
-  it('Check Delete Cookie', async () => {
-    res = await page.callMethod('jest_delete_cookie')
-    await page.waitFor(1000);
-    res = await page.data('jest_result');
-    expect(res).toBe(true)
-  });
+
+  if (process.env.uniTestPlatformInfo.indexOf('web') === -1) {
+    it('Check Set Cookie', async () => {
+      res = await page.callMethod('jest_set_cookie')
+      await page.waitFor(500);
+      res = await page.data('jest_result');
+      expect(res).toBe(true)
+    });
+    it('Check Delete Cookie', async () => {
+      res = await page.callMethod('jest_delete_cookie')
+      await page.waitFor(1000);
+      res = await page.data('jest_result');
+      expect(res).toBe(true)
+    });
+  }
 });
diff --git a/pages/CSS/layout/position.uvue b/pages/CSS/layout/position.uvue
index 130ff813..2a013bfa 100644
--- a/pages/CSS/layout/position.uvue
+++ b/pages/CSS/layout/position.uvue
@@ -7,6 +7,7 @@
         <text>position: relative</text>
         <scroll-view
           style="width: 500rpx; height: 500rpx; background-color: gray"
+          scroll-y="true"
         >
           <view
             style="width: 100rpx; height: 100rpx; background-color: red"
@@ -42,6 +43,7 @@
         <text>position: absolute</text>
         <scroll-view
           style="width: 500rpx; height: 500rpx; background-color: gray"
+          scroll-y="true"
         >
           <view
             style="width: 100rpx; height: 100rpx; background-color: red"
@@ -77,6 +79,7 @@
         <text>position: fixed</text>
         <scroll-view
           style="width: 500rpx; height: 500rpx; background-color: gray"
+          scroll-y="true"
         >
           <view
             style="width: 100rpx; height: 100rpx; background-color: red"
diff --git a/pages/CSS/transform/rotate.uvue b/pages/CSS/transform/rotate.uvue
index c2fe9333..e5fb3fb3 100644
--- a/pages/CSS/transform/rotate.uvue
+++ b/pages/CSS/transform/rotate.uvue
@@ -1,5 +1,5 @@
 <template>
-<scroll-view class="page">
+<scroll-view class="page" scroll-y="true">
 
 	<view class="trace">
 		<view class="base reserve">
diff --git a/pages/CSS/transform/scale.uvue b/pages/CSS/transform/scale.uvue
index 72c97b82..98ffc62a 100644
--- a/pages/CSS/transform/scale.uvue
+++ b/pages/CSS/transform/scale.uvue
@@ -1,5 +1,5 @@
 <template>
-<scroll-view class="page">
+<scroll-view class="page" scroll-y="true">
 	<view class="trace">
 		<view class="base reserve">
 			<text class="reserve-text">scaleX(0.6)</text>
diff --git a/pages/CSS/transform/translate.uvue b/pages/CSS/transform/translate.uvue
index 8f08abd8..cdf12265 100644
--- a/pages/CSS/transform/translate.uvue
+++ b/pages/CSS/transform/translate.uvue
@@ -1,5 +1,5 @@
 <template>
-<scroll-view class="page">
+<scroll-view class="page" scroll-y="true">
 	<view class="trace">
 		<view class="base reserve">
 			<text class="reserve-text">translateX(80%)</text>
diff --git a/pages/CSS/transition/transition.uvue b/pages/CSS/transition/transition.uvue
index 548cccef..ee81fc31 100644
--- a/pages/CSS/transition/transition.uvue
+++ b/pages/CSS/transition/transition.uvue
@@ -125,7 +125,7 @@
       propertyChangeBackground() {
         if (!this.isSetTransition) {
           this.propertyStyleBackground?.style?.setProperty("transition-property", "background-color")
-          this.propertyStyleBackground?.style?.setProperty("transition-duration", "1000")
+          this.propertyStyleBackground?.style?.setProperty("transition-duration", "1000ms")
           this.isSetTransition = true
         }
         this.propertyStyleBackground?.style?.setProperty("background-color", this.isTransitionpropertystyleBackground
-- 
GitLab