From df0c9bfd3a7b0fb2d8bceb8510aea39f5b69ed95 Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Mon, 13 Apr 2020 16:12:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dscroll-view=E5=AD=90?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E4=BD=BF=E7=94=A8=E7=99=BE=E5=88=86=E6=AF=94?=
 =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E6=97=B6=E5=A4=A7=E5=B0=8F=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/components/scroll-view/index.vue     | 118 ++++++++++--------
 1 file changed, 63 insertions(+), 55 deletions(-)

diff --git a/src/core/view/components/scroll-view/index.vue b/src/core/view/components/scroll-view/index.vue
index 0dbf4af4c..e577c411f 100644
--- a/src/core/view/components/scroll-view/index.vue
+++ b/src/core/view/components/scroll-view/index.vue
@@ -9,7 +9,10 @@
         :style="{'overflow-x': scrollX?'auto':'hidden','overflow-y': scrollY?'auto':'hidden'}"
         class="uni-scroll-view"
       >
-        <div ref="content">
+        <div
+          ref="content"
+          class="uni-scroll-view-content"
+        >
           <div
             v-if="refresherEnabled"
             ref="refresherinner"
@@ -68,16 +71,16 @@
 <script>
 import scroller from 'uni-mixins/scroller/index'
 import {
-  supportsPassive,
-  disableScrollBounce
+  supportsPassive,
+  disableScrollBounce
 } from 'uni-shared'
 
 const passiveOptions = supportsPassive ? {
   passive: true
 } : false
-
-// const PULLING = 'pulling'
-// const REFRESHING = 'refreshing'
+
+// const PULLING = 'pulling'
+// const REFRESHING = 'refreshing'
 
 export default {
   name: 'ScrollView',
@@ -529,38 +532,43 @@ uni-scroll-view[hidden] {
   max-height: inherit;
 }
 
+.uni-scroll-view-content {
+  width: 100%;
+  height: 100%;
+}
+
 .uni-scroll-view-refresher {
   position: relative;
   overflow: hidden;
 }
-
-.uni-scroll-view-refresh {
-  position: absolute;
-  top: 0;
-  left: 0;
+
+.uni-scroll-view-refresh {
+  position: absolute;
+  top: 0;
+  left: 0;
   right: 0;
   bottom: 0;
   display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-}
-
-.uni-scroll-view-refresh-inner {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  line-height: 0;
-  width: 40px;
-  height: 40px;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+}
+
+.uni-scroll-view-refresh-inner {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  line-height: 0;
+  width: 40px;
+  height: 40px;
   border-radius: 50%;
   background-color: #fff;
-  box-shadow: 0 1px 6px rgba(0, 0, 0, .117647), 0 1px 4px rgba(0, 0, 0, .117647);
-}
-
-.uni-scroll-view-refresh__spinner {
-  transform-origin: center center;
-  animation: uni-scroll-view-refresh-rotate 2s linear infinite;
+  box-shadow: 0 1px 6px rgba(0, 0, 0, .117647), 0 1px 4px rgba(0, 0, 0, .117647);
+}
+
+.uni-scroll-view-refresh__spinner {
+  transform-origin: center center;
+  animation: uni-scroll-view-refresh-rotate 2s linear infinite;
 }
 
 .uni-scroll-view-refresh__spinner > circle {
@@ -568,31 +576,31 @@ uni-scroll-view[hidden] {
   stroke-linecap: round;
   animation: uni-scroll-view-refresh-dash 2s linear infinite;
 }
-
-@keyframes uni-scroll-view-refresh-rotate {
-  0% {
-    transform: rotate(0deg);
-  }
-
-  100% {
-    transform: rotate(360deg);
-  }
-}
-
-@keyframes uni-scroll-view-refresh-dash {
-  0% {
-    stroke-dasharray: 1, 200;
-    stroke-dashoffset: 0;
-  }
-
-  50% {
-    stroke-dasharray: 89, 200;
-    stroke-dashoffset: -35px;
-  }
-
-  100% {
-    stroke-dasharray: 89, 200;
-    stroke-dashoffset: -124px;
-  }
+
+@keyframes uni-scroll-view-refresh-rotate {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+@keyframes uni-scroll-view-refresh-dash {
+  0% {
+    stroke-dasharray: 1, 200;
+    stroke-dashoffset: 0;
+  }
+
+  50% {
+    stroke-dasharray: 89, 200;
+    stroke-dashoffset: -35px;
+  }
+
+  100% {
+    stroke-dasharray: 89, 200;
+    stroke-dashoffset: -124px;
+  }
 }
 </style>
-- 
GitLab