From 1f537e73c32b27fe65f633dce152e160e8a91dfd Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Thu, 12 Dec 2019 17:45:53 +0800
Subject: [PATCH] fix(h5): onWebInvokeAppService

---
 src/core/service/bridge/on.js                          |  6 +++++-
 .../service/framework/subscribe-handlers/index.js      |  3 ---
 .../on-web-invoke-app-service.js                       |  0
 src/platforms/h5/service/on-web-invoke-app-service.js  | 10 ++++++++++
 4 files changed, 15 insertions(+), 4 deletions(-)
 rename src/platforms/app-plus/service/{framework/subscribe-handlers => }/on-web-invoke-app-service.js (100%)
 create mode 100644 src/platforms/h5/service/on-web-invoke-app-service.js

diff --git a/src/core/service/bridge/on.js b/src/core/service/bridge/on.js
index 01c9b20d..308b4a78 100644
--- a/src/core/service/bridge/on.js
+++ b/src/core/service/bridge/on.js
@@ -6,6 +6,8 @@ import {
 import {
   setPullDownRefreshPageId
 } from 'uni-platform/service/api/ui/pull-down-refresh'
+
+import onWebInvokeAppService from 'uni-platform/service/on-web-invoke-app-service'
 
 export default function initOn (on, {
   getApp,
@@ -89,5 +91,7 @@ export default function initOn (on, {
 
   on('onNavigationBarSearchInputChanged', createCallCurrentPageHook('onNavigationBarSearchInputChanged'))
   on('onNavigationBarSearchInputConfirmed', createCallCurrentPageHook('onNavigationBarSearchInputConfirmed'))
-  on('onNavigationBarSearchInputClicked', createCallCurrentPageHook('onNavigationBarSearchInputClicked'))
+  on('onNavigationBarSearchInputClicked', createCallCurrentPageHook('onNavigationBarSearchInputClicked'))
+
+  on('onWebInvokeAppService', onWebInvokeAppService)
 }
diff --git a/src/platforms/app-plus/service/framework/subscribe-handlers/index.js b/src/platforms/app-plus/service/framework/subscribe-handlers/index.js
index 9c5ccd23..346dac65 100644
--- a/src/platforms/app-plus/service/framework/subscribe-handlers/index.js
+++ b/src/platforms/app-plus/service/framework/subscribe-handlers/index.js
@@ -20,7 +20,6 @@ import onVdSync from './on-vd-sync'
 import onVdSyncCallback from './on-vd-sync-callback'
 
 import onInvokeApi from './on-invoke-api'
-import onWebInvokeAppService from './on-web-invoke-app-service'
 import onWxsInvokeCallMethod from './on-wxs-invoke-call-method'
 
 import {
@@ -59,8 +58,6 @@ export function initSubscribeHandlers () {
     emit('onWebInvokeAppService', data, webviewIds)
   })
 
-  on('onWebInvokeAppService', onWebInvokeAppService)
-
   subscribe('onWxsInvokeCallMethod', onWxsInvokeCallMethod)
 
   subscribe(VD_SYNC, onVdSync)
diff --git a/src/platforms/app-plus/service/framework/subscribe-handlers/on-web-invoke-app-service.js b/src/platforms/app-plus/service/on-web-invoke-app-service.js
similarity index 100%
rename from src/platforms/app-plus/service/framework/subscribe-handlers/on-web-invoke-app-service.js
rename to src/platforms/app-plus/service/on-web-invoke-app-service.js
diff --git a/src/platforms/h5/service/on-web-invoke-app-service.js b/src/platforms/h5/service/on-web-invoke-app-service.js
new file mode 100644
index 00000000..a27c9701
--- /dev/null
+++ b/src/platforms/h5/service/on-web-invoke-app-service.js
@@ -0,0 +1,10 @@
+export default function onWebInvokeAppService ({
+  name,
+  arg
+}, pageId) {
+  if (name === 'postMessage') {
+    // TODO 小程序后退、组件销毁、分享时通知
+  } else {
+    uni[name](arg)
+  }
+}
-- 
GitLab