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

packages/uni-app-plus/dist/index.js

@@ -1166,7 +1166,9 @@ function parseBaseApp (vm, {
         app: this
       };
 
-      this.$vm.$scope = this;
+      this.$vm.$scope = this;
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData;
 
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted', args);

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

@@ -1558,7 +1558,9 @@ function parseBaseApp (vm, {
         app: this
       };
 
-      this.$vm.$scope = this;
+      this.$vm.$scope = this;
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData;
 
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted', args);

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

@@ -1303,7 +1303,9 @@ function parseBaseApp (vm, {
         app: this
       };
 
-      this.$vm.$scope = this;
+      this.$vm.$scope = this;
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData;
 
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted', args);

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

@@ -1221,7 +1221,9 @@ function parseBaseApp (vm, {
         app: this
       };
 
-      this.$vm.$scope = this;
+      this.$vm.$scope = this;
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData;
 
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted', args);

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

@@ -1313,7 +1313,9 @@ function parseBaseApp (vm, {
         app: this
       };
 
-      this.$vm.$scope = this;
+      this.$vm.$scope = this;
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData;
 
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted', args);

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

@@ -1166,7 +1166,9 @@ function parseBaseApp (vm, {
         app: this
       };
 
-      this.$vm.$scope = this;
+      this.$vm.$scope = this;
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData;
 
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted', args);

src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js

@@ -64,7 +64,9 @@ export default function parseBaseApp (vm, {
         app: this
       }
 
-      this.$vm.$scope = this
+      this.$vm.$scope = this
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData
 
       this.$vm._isMounted = true
       this.$vm.__call_hook('mounted', args)