From 687814e6af1230d4fdc7cde5c86fe1a82e1d15ae Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Wed, 22 Jul 2020 11:39:45 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../runtime/wrapper/component-parser.js       | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/platforms/mp-baidu/runtime/wrapper/component-parser.js b/src/platforms/mp-baidu/runtime/wrapper/component-parser.js
index e09ccec1..7f48279a 100644
--- a/src/platforms/mp-baidu/runtime/wrapper/component-parser.js
+++ b/src/platforms/mp-baidu/runtime/wrapper/component-parser.js
@@ -15,10 +15,10 @@ export default function parseComponent (vueOptions) {
   const componentOptions = parseBaseComponent(vueOptions, {
     isPage,
     initRelation
-  })
-
-  // 关于百度小程序生命周期的说明(组件作为页面时):
-  // lifetimes:attached --> methods:onShow --> methods:onLoad --> methods:onReady
+  })
+
+  // 关于百度小程序生命周期的说明(组件作为页面时):
+  // lifetimes:attached --> methods:onShow --> methods:onLoad --> methods:onReady
   // 这里在强制将onShow挪到onLoad之后触发,另外一处修改在page-parser.js
   const oldAttached = componentOptions.lifetimes.attached
   componentOptions.lifetimes.attached = function attached () {
@@ -28,36 +28,28 @@ export default function parseComponent (vueOptions) {
       this.pageinstance.$vm = this.$vm
       if (hasOwn(this.pageinstance, '_$args')) {
         this.$vm.$mp.query = this.pageinstance._$args
-        this.$vm.__call_hook('onLoad', this.pageinstance._$args)
+        this.$vm.__call_hook('onLoad', this.pageinstance._$args)
         this.$vm.__call_hook('onShow')
         delete this.pageinstance._$args
       }
-    } else {
-      // 百度小程序组件不触发methods内的onReady
-      if (this.$vm) {
-        this.$vm._isMounted = true
-        this.$vm.__call_hook('mounted')
-      }
-    }
-  }
-
-  if (newLifecycle) {
-    delete componentOptions.lifetimes.ready
-    componentOptions.methods.onReady = function () {
+    } else {
+      // 百度小程序组件不触发methods内的onReady
       if (this.$vm) {
         this.$vm._isMounted = true
         this.$vm.__call_hook('mounted')
-        this.$vm.__call_hook('onReady')
-      } else {
-        // this.is && console.warn(this.is + ' is not attached')
       }
     }
   }
 
+  if (newLifecycle) {
+    componentOptions.methods.onReady = componentOptions.lifetimes.ready
+    delete componentOptions.lifetimes.ready
+  }
+
   componentOptions.messages = {
     __l: componentOptions.methods.__l
   }
   delete componentOptions.methods.__l
 
   return componentOptions
-}
+}
-- 
GitLab