diff --git a/src/core/view/components/canvas/index.vue b/src/core/view/components/canvas/index.vue index 3167fa0035bc59ee66d873ac4f4849039d3d2953..d553daf22b06985e4d8789d73dff14eed13e24cb 100644 --- a/src/core/view/components/canvas/index.vue +++ b/src/core/view/components/canvas/index.vue @@ -4,10 +4,10 @@ :disable-scroll="disableScroll" v-on="_listeners" > -
@@ -311,9 +311,13 @@ export default { image.ready = true } - // 安卓 WebView 本地路径 - if (__PLATFORM__ === 'app-plus' && navigator.vendor === 'Google Inc.' && src.indexOf('file://') === 0) { - image.crossOrigin = 'anonymous' + // 安卓 WebView 除本地路径无跨域问题 + if (__PLATFORM__ === 'app-plus' && navigator.vendor === 'Google Inc.') { + if (src.indexOf('file://') === 0) { + image.crossOrigin = 'anonymous' + } + image.src = src + return } getSameOriginUrl(src).then(src => { image.src = src diff --git a/src/platforms/app-plus/helpers/file.js b/src/platforms/app-plus/helpers/file.js index 7f464af4fec989577e65a3cac8fec31b1a97f209..0cf1b9df7e676a30e832b98c8b3f100ed03c1ecb 100644 --- a/src/platforms/app-plus/helpers/file.js +++ b/src/platforms/app-plus/helpers/file.js @@ -48,6 +48,6 @@ export function getSameOriginUrl (url) { if (window.webkit && window.webkit.messageHandlers) { return getBase64(url) } - return url + return plus.io.convertLocalFileSystemURL(url) }) }