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

src/platforms/app-plus/service/api/location/open-location-weex.js

+import {
+  invoke
+} from '../../bridge'
+
 import {
   showPage
 } from '../page.js'
 
-export function openLocation (data) {
+export function openLocation (data, callbackId) {
   showPage({
     url: '__uniappopenlocation',
     data,
     style: {
       titleNView: {
         type: 'transparent'
-      }
+      },
+      popGesture: 'close',
+      backButtonAutoControl: 'close'
+    },
+    onClose () {
+      invoke(callbackId, {
+        errMsg: 'openLocation:fail cancel'
+      })
     }
   })
   return {