From 29a3d489e80c562f4606622ecb22ef514603313a Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 22 Jan 2021 15:17:43 +0800
Subject: [PATCH] fix(mp-baidu): onInit fix #710d4cfd

---
 .../packages/mp-vue/dist/mp.runtime.esm.js        | 15 ++++++++-------
 src/core/runtime/mp/constants.js                  |  9 +++++----
 src/core/service/plugins/lifecycle.js             | 11 ++++++-----
 .../mp-baidu/runtime/wrapper/page-parser.js       |  5 -----
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/packages/vue-cli-plugin-uni/packages/mp-vue/dist/mp.runtime.esm.js b/packages/vue-cli-plugin-uni/packages/mp-vue/dist/mp.runtime.esm.js
index b4c29988a..f29912aa5 100644
--- a/packages/vue-cli-plugin-uni/packages/mp-vue/dist/mp.runtime.esm.js
+++ b/packages/vue-cli-plugin-uni/packages/mp-vue/dist/mp.runtime.esm.js
@@ -5964,12 +5964,13 @@ var LIFECYCLE_HOOKS$1 = [
     'onLaunch',
     'onShow',
     'onHide',
-    'onUniNViewMessage',
-    'onPageNotFound',
-    'onThemeChange',
-    'onError',
+    'onUniNViewMessage',
+    'onPageNotFound',
+    'onThemeChange',
+    'onError',
     'onUnhandledRejection',
     //Page
+    'onInit',
     'onLoad',
     // 'onShow',
     'onReady',
@@ -5977,10 +5978,10 @@ var LIFECYCLE_HOOKS$1 = [
     'onUnload',
     'onPullDownRefresh',
     'onReachBottom',
-    'onTabItemTap',
-    'onAddToFavorites',
+    'onTabItemTap',
+    'onAddToFavorites',
     'onShareTimeline',
-    'onShareAppMessage',
+    'onShareAppMessage',
     'onResize',
     'onPageScroll',
     'onNavigationBarButtonTap',
diff --git a/src/core/runtime/mp/constants.js b/src/core/runtime/mp/constants.js
index 771dbd4e8..99b262f19 100644
--- a/src/core/runtime/mp/constants.js
+++ b/src/core/runtime/mp/constants.js
@@ -1,6 +1,6 @@
 export const SOURCE_KEY = '__data__'
 
-export const COMPONENT_LIFECYCLE = {
+export const COMPONENT_LIFECYCLE = {
   created: 'onServiceCreated',
   attached: 'onServiceAttached',
   ready: 'mounted',
@@ -19,17 +19,18 @@ export const PAGE_LIFETIMES = {
 export const PAGE_LIFETIMES_KEYS = Object.keys(PAGE_LIFETIMES)
 // TODO 待整理，现在到处都是
 export const PAGE_LIFECYCLE = [
+  'onInit',
   'onLoad',
   'onShow',
   'onReady',
   'onHide',
   'onUnload',
   'onPullDownRefresh',
-  'onReachBottom',
-  'onAddToFavorites',
+  'onReachBottom',
+  'onAddToFavorites',
   'onShareTimeline',
   'onShareAppMessage',
   'onPageScroll',
   'onResize',
   'onTabItemTap'
-]
+]
diff --git a/src/core/service/plugins/lifecycle.js b/src/core/service/plugins/lifecycle.js
index 6cf7846b1..e0aa95e58 100644
--- a/src/core/service/plugins/lifecycle.js
+++ b/src/core/service/plugins/lifecycle.js
@@ -5,12 +5,13 @@ const LIFECYCLE_HOOKS = [
   'onLaunch',
   'onShow',
   'onHide',
-  'onUniNViewMessage',
-  'onPageNotFound',
+  'onUniNViewMessage',
+  'onPageNotFound',
   'onThemeChange',
-  'onError',
+  'onError',
   'onUnhandledRejection',
   // Page
+  'onInit',
   'onLoad',
   // 'onShow',
   'onReady',
@@ -18,8 +19,8 @@ const LIFECYCLE_HOOKS = [
   'onUnload',
   'onPullDownRefresh',
   'onReachBottom',
-  'onTabItemTap',
-  'onAddToFavorites',
+  'onTabItemTap',
+  'onAddToFavorites',
   'onShareTimeline',
   'onShareAppMessage',
   'onResize',
diff --git a/src/platforms/mp-baidu/runtime/wrapper/page-parser.js b/src/platforms/mp-baidu/runtime/wrapper/page-parser.js
index 3f144471e..fec3bddfe 100644
--- a/src/platforms/mp-baidu/runtime/wrapper/page-parser.js
+++ b/src/platforms/mp-baidu/runtime/wrapper/page-parser.js
@@ -29,11 +29,6 @@ export default function parsePage (vuePageOptions) {
     initRelation
   })
 
-  const onInit = (vuePageOptions.default || vuePageOptions).onInit
-  if (onInit) {
-    pageOptions.methods.onInit = onInit
-  }
-
   // 纠正百度小程序生命周期methods:onShow在methods:onLoad之前触发的问题
   pageOptions.methods.onShow = function onShow () {
     if (this.$vm && this.$vm.$mp.query) {
-- 
GitLab