From ad70269499182183abe7d495e0ee66d1abf4346c Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Tue, 9 Apr 2019 19:09:01 +0800
Subject: [PATCH] fix(runtime): globalData

---
 packages/uni-app-plus/dist/index.js    | 13 ++++++++-----
 packages/uni-app-plus/package.json     |  2 +-
 packages/uni-mp-weixin/dist/index.js   | 13 ++++++++-----
 packages/uni-mp-weixin/package.json    |  2 +-
 src/core/runtime/wrapper/create-app.js | 11 +++++++----
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js
index 4e65b027..31a4a0bd 100644
--- a/packages/uni-app-plus/dist/index.js
+++ b/packages/uni-app-plus/dist/index.js
@@ -658,16 +658,19 @@ function createApp (vm) {
 
       this.$vm = vm;
 
+      this.$vm.$mp = {
+        app: this
+      };
+
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted');
 
       this.$vm.__call_hook('onLaunch', args);
     }
-  };
-
-  if (vm.$options.globalData) { // 兼容旧版本 globalData
-    appOptions.globalData = vm.$options.globalData;
-  }
+  };
+
+  // 兼容旧版本 globalData
+  appOptions.globalData = vm.$options.globalData || {};
 
   initHooks(appOptions, hooks); // 延迟执行，因为 App 的注册在 main.js 之前，可能导致生命周期内 Vue 原型上开发者注册的属性无法访问
 
diff --git a/packages/uni-app-plus/package.json b/packages/uni-app-plus/package.json
index e064bca8..867f6f5f 100644
--- a/packages/uni-app-plus/package.json
+++ b/packages/uni-app-plus/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-app-plus",
-	"version": "0.0.213",
+	"version": "0.0.215",
 	"description": "uni-app app-plus",
 	"main": "dist/index.js",
 	"scripts": {
diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js
index 12ea83ed..6909e87f 100644
--- a/packages/uni-mp-weixin/dist/index.js
+++ b/packages/uni-mp-weixin/dist/index.js
@@ -690,16 +690,19 @@ function createApp (vm) {
 
       this.$vm = vm;
 
+      this.$vm.$mp = {
+        app: this
+      };
+
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted');
 
       this.$vm.__call_hook('onLaunch', args);
     }
-  };
-
-  if (vm.$options.globalData) { // 兼容旧版本 globalData
-    appOptions.globalData = vm.$options.globalData;
-  }
+  };
+
+  // 兼容旧版本 globalData
+  appOptions.globalData = vm.$options.globalData || {};
 
   initHooks(appOptions, hooks); // 延迟执行，因为 App 的注册在 main.js 之前，可能导致生命周期内 Vue 原型上开发者注册的属性无法访问
 
diff --git a/packages/uni-mp-weixin/package.json b/packages/uni-mp-weixin/package.json
index 597d21e9..36b47044 100644
--- a/packages/uni-mp-weixin/package.json
+++ b/packages/uni-mp-weixin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-weixin",
-	"version": "0.0.932",
+	"version": "0.0.934",
 	"description": "uni-app mp-weixin",
 	"main": "dist/index.js",
 	"scripts": {
diff --git a/src/core/runtime/wrapper/create-app.js b/src/core/runtime/wrapper/create-app.js
index 1a8eb856..e904370d 100644
--- a/src/core/runtime/wrapper/create-app.js
+++ b/src/core/runtime/wrapper/create-app.js
@@ -52,17 +52,20 @@ export function createApp (vm) {
 
       this.$vm = vm
 
+      this.$vm.$mp = {
+        app: this
+      }
+
       this.$vm._isMounted = true
       this.$vm.__call_hook('mounted')
 
       this.$vm.__call_hook('onLaunch', args)
     }
-  }
-
-  if (vm.$options.globalData) { // 兼容旧版本 globalData
-    appOptions.globalData = vm.$options.globalData
   }
 
+  // 兼容旧版本 globalData
+  appOptions.globalData = vm.$options.globalData || {}
+
   initHooks(appOptions, hooks) // 延迟执行，因为 App 的注册在 main.js 之前，可能导致生命周期内 Vue 原型上开发者注册的属性无法访问
 
   App(appOptions)
-- 
GitLab