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

# Conflicts:
#	src/platforms/app-plus/service/framework/app.js

src/platforms/app-plus/service/framework/app.js

@@ -4,12 +4,6 @@ import {
 
 import initOn from 'uni-core/service/bridge/on'
 
-import {
-  requireNativePlugin
-  ,
-  publish
-} from '../bridge'
-
 import {
   NETWORK_TYPES
 } from '../api/constants'
@@ -24,6 +18,11 @@ import {
 
 import tabBar from './tab-bar'
 
+import {
+  publish,
+  requireNativePlugin
+} from '../bridge'
+
 import {
   initSubscribeHandlers
 } from './subscribe-handlers'

src/platforms/app-plus/view/components/map/index.vue

@@ -208,9 +208,9 @@ export default {
     map.onclick = (e) => {
       this.$trigger('click', {}, e)
     }
-    map.onstatuschanged((data = {}) => {
-      this.$trigger('end', {}, data)
-    })
+    map.onstatuschanged = (e) => {
+      this.$trigger('regionchange', {}, e)
+    }
     this._addMarkers(this.markers)
     this._addMapLines(this.polyline)
     this._addMapCircles(this.circles)