From 56623a72aa2c2d3c8655736e39643ee77995799b Mon Sep 17 00:00:00 2001
From: taohebin <taohebin@dcloud.io>
Date: Tue, 29 Aug 2023 09:51:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=20=E5=8E=BB=E9=99=A4=E4=B8=8D?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9A=84css=E6=A0=B7=E5=BC=8F=202.=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dscroll-view=E7=A4=BA=E4=BE=8Brebound=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/input-data/input-data.vue               |  1 -
 pages/component/scroll-view/scroll-view-props.uvue | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/input-data/input-data.vue b/components/input-data/input-data.vue
index 1a8cb909..74e535f2 100644
--- a/components/input-data/input-data.vue
+++ b/components/input-data/input-data.vue
@@ -91,7 +91,6 @@
 	.input-wrapper_image {
 		width: 22px;
 		height: 22px;
-		align-self: center;
 		margin-right: 10rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/component/scroll-view/scroll-view-props.uvue b/pages/component/scroll-view/scroll-view-props.uvue
index 43a7309b..6ec4680e 100644
--- a/pages/component/scroll-view/scroll-view-props.uvue
+++ b/pages/component/scroll-view/scroll-view-props.uvue
@@ -8,8 +8,8 @@
 			<scroll-view v-if="scrollX" :scroll-x="true" :scroll-top="scrollTop" :scroll-left="scrollLeft"
 				:upper-threshold="upperThreshold" :lower-threshold="lowerThreshold" :scroll-into-view="scrollIntoView"
 				:enable-back-to-top="enableBackToTop" :scroll-with-animation="scrollWithAnimation"
-				:show-scrollbar="showScrollbar" @scrolltoupper="scrolltoupper" @scrolltolower="scrolltolower"
-				@scroll="scroll" @scrollend="scrollend">
+				:show-scrollbar="showScrollbar" :rebound="rebound" @scrolltoupper="scrolltoupper"
+				@scrolltolower="scrolltolower" @scroll="scroll" @scrollend="scrollend">
 				<view class="item" :id="'horizontal_'+item.id" v-for="(item,_) in items">
 					<text class="uni-text">{{item.label}}</text>
 				</view>
@@ -17,8 +17,8 @@
 			<scroll-view v-else :scroll-x="false" :scroll-top="scrollTop" :scroll-left="scrollLeft"
 				:upper-threshold="upperThreshold" :lower-threshold="lowerThreshold" :scroll-into-view="scrollIntoView"
 				:enable-back-to-top="enableBackToTop" :scroll-with-animation="scrollWithAnimation"
-				:show-scrollbar="showScrollbar" @scrolltoupper="scrolltoupper" @scrolltolower="scrolltolower"
-				@scroll="scroll" @scrollend="scrollend">
+				:show-scrollbar="showScrollbar" :rebound="rebound" @scrolltoupper="scrolltoupper"
+				@scrolltolower="scrolltolower" @scroll="scroll" @scrollend="scrollend">
 				<view class="item" :id="item.id" v-for="(item,_) in items">
 					<text class="uni-text">{{item.label}}</text>
 				</view>
@@ -32,7 +32,7 @@
 			</view>
 			<view class="uni-option">
 				<text>是否有反弹效果</text>
-				<switch :checked="bounces" @change="bounces=!bounces"></switch>
+				<switch :checked="rebound" @change="rebound=!rebound"></switch>
 			</view>
 			<view class="uni-option">
 				<text>是否开启滚动时使用动画过渡</text>
@@ -89,7 +89,7 @@
 			return {
 				items: [] as Item[],
 				scrollX: false,
-				bounces: false,
+				rebound: false,
 				scrollTop: 0,
 				scrollLeft: 0,
 				scrollIntoView: "",
-- 
GitLab