From 592723c4838539168a956100de3f7625166976e1 Mon Sep 17 00:00:00 2001
From: DCloud-XHY <xionghuayu@dcloud.io>
Date: Sat, 9 Mar 2024 15:23:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=20scroll-view=20=E5=B1=9E=E6=80=A7=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B=20=E5=A2=9E=E5=8A=A0=20enable-back-to-top=20=E7=9A=84?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B=EF=BC=9B=202.=20border-style=20=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B=20=E5=A2=9E=E5=8A=A0=20=E6=B5=8B=E8=AF=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/CSS/border/border-style.uvue               | 16 ++++++++++++++++
 .../component/scroll-view/scroll-view-props.uvue |  6 +++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/pages/CSS/border/border-style.uvue b/pages/CSS/border/border-style.uvue
index 4f8b1059..86ae698f 100644
--- a/pages/CSS/border/border-style.uvue
+++ b/pages/CSS/border/border-style.uvue
@@ -42,6 +42,22 @@
           style="border-bottom-width: 5px; border-bottom-style: dotted"
         ></view>
       </view>
+
+      <view>
+        <text>border-style: solid (缺省 border-width)</text>
+        <view
+          class="common"
+          style="border-style: solid;"
+        ></view>
+      </view>
+
+      <view>
+        <text>border-style: none</text>
+        <view
+          class="common"
+          style="border-style: none; border-width: 5px;"
+        ></view>
+      </view>
     </view>
     <!-- #ifdef APP -->
   </scroll-view>
diff --git a/pages/component/scroll-view/scroll-view-props.uvue b/pages/component/scroll-view/scroll-view-props.uvue
index b9a0390f..8a27e04f 100644
--- a/pages/component/scroll-view/scroll-view-props.uvue
+++ b/pages/component/scroll-view/scroll-view-props.uvue
@@ -25,7 +25,11 @@
       </scroll-view>
     </view>
 
-    <scroll-view class="uni-list" :showScrollbar="true" :scroll-y="true">
+    <scroll-view class="uni-list" :showScrollbar="true" :scroll-y="true">
+      <view class="uni-list-cell uni-list-cell-padding">
+        <text>点击状态栏回到顶部（仅iOS）</text>
+        <switch :checked="enableBackToTop" @change="enableBackToTop=!enableBackToTop"></switch>
+      </view>
       <view class="uni-list-cell uni-list-cell-padding">
         <text>是否显示滚动条</text>
         <switch :checked="showScrollbar" @change="showScrollbar=!showScrollbar"></switch>
-- 
GitLab