Merge branch 'dev' of https://github.com/dcloudio/uni-app into dev-quickapp

src/core/view/components/movable-view/index.vue

@@ -377,7 +377,7 @@ export default {
       var self = this
       if (!this._isScaling && !this.disabled && this._isTouching) {
         disableScrollBounce({
-          disable: true
+          disable: false
         })
         this.$el.style.willChange = 'auto'
         this._isTouching = false

src/shared/scroll.js

@@ -4,6 +4,7 @@ import {
 let view
 let pullToRefreshStyle
 let disabled
+const lastAction = {}
 
 export function disableScrollBounce ({
   disable
@@ -22,7 +23,12 @@ export function disableScrollBounce ({
       }))
     }
   }
-
+  const time = Date.now()
+  if (disable === lastAction.disable && time - lastAction.time < 20) {
+    return
+  }
+  lastAction.disable = disable
+  lastAction.time = time
   plusReady(() => {
     if (plus.os.name === 'iOS') {
       // 延迟执行避免iOS13触摸卡死
@@ -30,5 +36,5 @@ export function disableScrollBounce ({
     } else {
       exec()
     }
-  })
-}
+  })
+}