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

packages/uni-mp-alipay/dist/index.js

@@ -1047,6 +1047,12 @@ function createSelectorQuery () {
       return this
     };
   }
+
+  if (!query.in) {
+    query.in = function () {
+      return this
+    };
+  }
   return query
 }
 

packages/vue-cli-plugin-uni/packages/mp-vue/dist/mp.runtime.esm.js

@@ -5829,9 +5829,21 @@ function internalMixin(Vue) {
 
   MP_METHODS.forEach(function (method) {
     Vue.prototype[method] = function(args) {
-      if (this.$scope) {
+      if (this.$scope && this.$scope[method]) {
         return this.$scope[method](args)
       }
+      // mp-alipay
+      if(typeof my === 'undefined'){
+        return
+      }
+      if (method === 'createSelectorQuery') {
+        /* eslint-disable no-undef */
+        return my.createSelectorQuery(args)
+      } else if (method === 'createIntersectionObserver') {
+        /* eslint-disable no-undef */
+        return my.createIntersectionObserver(args)
+      }
+      // TODO mp-alipay 暂不支持 selectAllComponents,selectComponent
     };
   });
 

src/platforms/mp-alipay/runtime/api/index.js

@@ -88,6 +88,12 @@ export function createSelectorQuery () {
       return this
     }
   }
+
+  if (!query.in) {
+    query.in = function () {
+      return this
+    }
+  }
   return query
 }