diff --git a/build/rollup.config.app.js b/build/rollup.config.app.js index cdb7e9d5b3205219adf22f9c86c102a29d90f5a5..ca7bafbf5633fc623e2d21671ba6e30e26942ade 100644 --- a/build/rollup.config.app.js +++ b/build/rollup.config.app.js @@ -23,10 +23,12 @@ if (process.env.UNI_SERVICE === 'legacy') { output.format = 'iife' output.name = 'serviceContext' output.banner = - `export function createServiceContext(Vue, weex, plus, __uniConfig, __uniRoutes, UniServiceJSBridge){ + `export function createServiceContext(Vue, weex, plus, __uniConfig, __uniRoutes, UniServiceJSBridge,instanceContext){ var localStorage = plus.storage -var setTimeout = global.setTimeout -var clearTimeout = global.clearTimeout +var setTimeout = instanceContext.setTimeout +var clearTimeout = instanceContext.clearTimeout +var setInterval = instanceContext.setInterval +var clearInterval = instanceContext.clearInterval ` output.footer = ` diff --git a/lib/apis.js b/lib/apis.js index 7cdec791090ae72d83f15dd6a71d95f30edb819e..4a40ae5fb0624c347927103b069d39a584f8232b 100644 --- a/lib/apis.js +++ b/lib/apis.js @@ -52,7 +52,6 @@ const media = [ 'getImageInfo', 'saveImageToPhotosAlbum', 'compressImage', - 'chooseMessageFile', 'getRecorderManager', 'getBackgroundAudioManager', 'createInnerAudioContext', diff --git a/src/platforms/app-plus-nvue/service/api/route/switch-tab.js b/src/platforms/app-plus-nvue/service/api/route/switch-tab.js index b42b77aa0b384c7435b344e6b465f0c0be4c60d2..960edd4eeb3466ff30c111bfb1384034566af25d 100644 --- a/src/platforms/app-plus-nvue/service/api/route/switch-tab.js +++ b/src/platforms/app-plus-nvue/service/api/route/switch-tab.js @@ -37,8 +37,6 @@ export function switchTab ({ currentPage.$getAppWebview().close('auto') } } else { - // TODO 客户端 Bug - currentPage.$getAppWebview().hide('none') // 前一个 tabBar 触发 onHide currentPage.$vm.__call_hook('onHide') } diff --git a/src/platforms/app-plus/service/framework/plus-message.js b/src/platforms/app-plus/service/framework/plus-message.js index f3a4b0bdaf79f55889594fdbc64287dd08b44190..4a3755ca2e4364741a797599b1df077a94b705aa 100644 --- a/src/platforms/app-plus/service/framework/plus-message.js +++ b/src/platforms/app-plus/service/framework/plus-message.js @@ -29,7 +29,7 @@ export function consumePlusMessage (type, args) { */ export function registerPlusMessage (type, callback, keepAlive = true) { if (callbacks[type]) { - throw new Error(`${type} 已注册:` + (callbacks[type].toString())) + return console.warn(`${type} 已注册:` + (callbacks[type].toString())) } callback.keepAlive = !!keepAlive callbacks[type] = callback