From e564d7b52f8ea58509c202cfaf434aefa702603d Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 29 Jan 2021 15:39:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(App):=20=E4=BF=AE=E5=A4=8D=E5=AE=89?=
 =?UTF-8?q?=E5=8D=9310=E4=BB=A5=E4=B8=8Acanvas=E7=BB=98=E5=88=B6=E7=BD=91?=
 =?UTF-8?q?=E7=BB=9C=E5=9B=BE=E7=89=87=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/view/components/canvas/index.vue | 24 +++++++++++++----------
 src/platforms/app-plus/helpers/file.js    |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/core/view/components/canvas/index.vue b/src/core/view/components/canvas/index.vue
index 3167fa003..d553daf22 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"
   >
-    <canvas
-      ref="canvas"
-      width="300"
-      height="150"
+    <canvas
+      ref="canvas"
+      width="300"
+      height="150"
     />
     <div
       style="
@@ -21,9 +21,9 @@
     >
       <slot />
     </div>
-    <v-uni-resize-sensor
-      ref="sensor"
-      @resize="_resize"
+    <v-uni-resize-sensor
+      ref="sensor"
+      @resize="_resize"
     />
   </uni-canvas>
 </template>
@@ -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 7f464af4f..0cf1b9df7 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)
   })
 }
-- 
GitLab