From 00ca65e38a1d20c7a06e974b3e257788f0e4beb5 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Mon, 27 May 2019 20:09:05 +0800
Subject: [PATCH] fix(mp): mp-baidu onShow

---
 packages/uni-mp-baidu/dist/index.js                       | 8 ++++++--
 packages/uni-mp-baidu/package.json                        | 2 +-
 .../mp-baidu/runtime/wrapper/component-parser.js          | 4 +++-
 src/platforms/mp-baidu/runtime/wrapper/page-parser.js     | 4 +++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/uni-mp-baidu/dist/index.js b/packages/uni-mp-baidu/dist/index.js
index e8283be9b..3c4203b29 100644
--- a/packages/uni-mp-baidu/dist/index.js
+++ b/packages/uni-mp-baidu/dist/index.js
@@ -1208,7 +1208,9 @@ function parseComponent (vueOptions) {
       this.pageinstance.$vm = this.$vm;
 
       this.$vm.$mp.query = this.pageinstance._$args; // 兼容 mpvue
-      this.$vm.__call_hook('onLoad', this.pageinstance._$args);
+      this.$vm.__call_hook('onLoad', this.pageinstance._$args);
+      // TODO  目前版本 百度 Component 作为页面时，methods 中的 onShow 不触发
+      this.$vm.__call_hook('onShow');
     }
   };
 
@@ -1261,7 +1263,7 @@ function onPageUnload ($vm) {
   });
 }
 
-function parsePage (vuePageOptions) {
+function parsePage (vuePageOptions) {
   const pageOptions = parseBasePage(vuePageOptions, {
     isPage: isPage$1,
     initRelation: initRelation$1
@@ -1271,6 +1273,8 @@ function parsePage (vuePageOptions) {
     // 百度 onLoad 在 attached 之前触发，先存储 args, 在 attached 里边触发 onLoad
     this.pageinstance._$args = args;
   };
+  // TODO  目前版本 百度 Component 作为页面时，methods 中的 onShow 不触发
+  delete pageOptions.methods.onShow;
 
   pageOptions.methods.onUnload = function onUnload () {
     this.$vm.__call_hook('onUnload');
diff --git a/packages/uni-mp-baidu/package.json b/packages/uni-mp-baidu/package.json
index 69867d78a..f68af13a4 100644
--- a/packages/uni-mp-baidu/package.json
+++ b/packages/uni-mp-baidu/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-baidu",
-	"version": "0.0.837",
+	"version": "0.0.838",
 	"description": "uni-app mp-baidu",
 	"main": "dist/index.js",
 	"scripts": {
diff --git a/src/platforms/mp-baidu/runtime/wrapper/component-parser.js b/src/platforms/mp-baidu/runtime/wrapper/component-parser.js
index 01ce01f31..7c375f29e 100644
--- a/src/platforms/mp-baidu/runtime/wrapper/component-parser.js
+++ b/src/platforms/mp-baidu/runtime/wrapper/component-parser.js
@@ -20,7 +20,9 @@ export default function parseComponent (vueOptions) {
       this.pageinstance.$vm = this.$vm
 
       this.$vm.$mp.query = this.pageinstance._$args // 兼容 mpvue
-      this.$vm.__call_hook('onLoad', this.pageinstance._$args)
+      this.$vm.__call_hook('onLoad', this.pageinstance._$args)
+      // TODO  目前版本 百度 Component 作为页面时，methods 中的 onShow 不触发
+      this.$vm.__call_hook('onShow')
     }
   }
 
diff --git a/src/platforms/mp-baidu/runtime/wrapper/page-parser.js b/src/platforms/mp-baidu/runtime/wrapper/page-parser.js
index 8923c6d09..43ec8dfd9 100644
--- a/src/platforms/mp-baidu/runtime/wrapper/page-parser.js
+++ b/src/platforms/mp-baidu/runtime/wrapper/page-parser.js
@@ -19,7 +19,7 @@ function onPageUnload ($vm) {
   })
 }
 
-export default function parsePage (vuePageOptions) {
+export default function parsePage (vuePageOptions) {
   const pageOptions = parseBasePage(vuePageOptions, {
     isPage,
     initRelation
@@ -29,6 +29,8 @@ export default function parsePage (vuePageOptions) {
     // 百度 onLoad 在 attached 之前触发，先存储 args, 在 attached 里边触发 onLoad
     this.pageinstance._$args = args
   }
+  // TODO  目前版本 百度 Component 作为页面时，methods 中的 onShow 不触发
+  delete pageOptions.methods.onShow
 
   pageOptions.methods.onUnload = function onUnload () {
     this.$vm.__call_hook('onUnload')
-- 
GitLab