Merge branch 'master' of http://git.dcloud.io/uni-app-x/hello-uniapp-x into master

pages/component/scroll-view/scroll-view-refresher.uvue

 <template>
 	<view class="container">
 		<page-head title="scroll-view 下拉刷新"></page-head>
-		<scroll-view class="scroll" refresher-enabled = true @refresherrefresh="onRefresherrefresh" :refresher-triggered = "refresherTriggered">
+		<scroll-view class="scroll" refresher-enabled = true :refresher-triggered = "refresherTriggered"
+		@refresherrefresh="onRefresherrefresh" @refresherabort="onRefresherabort" @refresherrestore="onRefresherrestore"
+		@refresherpulling="onRefresherpulling" @scrolltolower="onScrolltolower">
 			<view v-for="key in scrollData" :key="key">
 				<view class="scroll-item">
 					<text class="scroll-item-title">{{key}}</text>
@@ -10,8 +12,8 @@
 		</scroll-view>
 	</view>
 </template>
-<script>
-import RefresherEvent from 'io.dcloud.uniapp.runtime.RefresherEvent';
+<script>
+
 	export default {
 
 		data() {
@@ -29,13 +31,25 @@ import RefresherEvent from 'io.dcloud.uniapp.runtime.RefresherEvent';
 		},
 
 		methods: {
-			onRefresherrefresh(e: RefresherEvent) {
+			onRefresherrefresh(e: RefresherEvent) {
 				console.log("onRefresherrefresh--------------下拉刷新触发")
 				this.refresherTriggered = true
 				setTimeout(function(){
 					this.refresherTriggered = false
 				}, 1500)
 				
+			},
+			onRefresherabort(e: RefresherEvent) {
+				console.log("onRefresherabort------下拉刷新被中止")
+			},
+			onRefresherrestore(e: RefresherEvent) {
+				console.log("onRefresherrestore------下拉刷新被复位")
+			},
+			onRefresherpulling(e: RefresherEvent) {
+				console.log("onRefresherrestore------拉刷新控件被下拉-dy="+e.detail.dy)
+			},
+			onScrolltolower(e: ScrollToLowerEvent) {
+				console.log("onScrolltolower 滚动到底部-----"+e.detail.direction)
 			}
 		}
 	};