From 8ea1aa046c70e8598f4ee3d102f0bccf57597744 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Wed, 8 Sep 2021 11:45:41 +0800
Subject: [PATCH] fix(h5): base url

---
 packages/uni-h5/dist/uni-h5.cjs.js  | 3 +++
 packages/uni-h5/dist/uni-h5.es.js   | 3 +++
 packages/uni-h5/src/platform/dom.ts | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js
index 870716547..86f2c17e2 100644
--- a/packages/uni-h5/dist/uni-h5.cjs.js
+++ b/packages/uni-h5/dist/uni-h5.cjs.js
@@ -903,6 +903,9 @@ var index$C = /* @__PURE__ */ defineBuiltInComponent({
 });
 const baseUrl = __IMPORT_META_ENV_BASE_URL__;
 function addBase(filePath) {
+  if (("/" + filePath).indexOf(baseUrl) === 0) {
+    return "/" + filePath;
+  }
   return baseUrl + filePath;
 }
 function getRealPath(filePath) {
diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js
index 20fc91d41..776341d19 100644
--- a/packages/uni-h5/dist/uni-h5.es.js
+++ b/packages/uni-h5/dist/uni-h5.es.js
@@ -1899,6 +1899,9 @@ function findElem(vm) {
 }
 const baseUrl = import.meta.env.BASE_URL;
 function addBase(filePath) {
+  if (("/" + filePath).indexOf(baseUrl) === 0) {
+    return "/" + filePath;
+  }
   return baseUrl + filePath;
 }
 function getRealPath(filePath) {
diff --git a/packages/uni-h5/src/platform/dom.ts b/packages/uni-h5/src/platform/dom.ts
index e70b7f41c..b30f6971a 100644
--- a/packages/uni-h5/src/platform/dom.ts
+++ b/packages/uni-h5/src/platform/dom.ts
@@ -19,6 +19,10 @@ export function findElem(vm: ComponentPublicInstance) {
 
 const baseUrl = __IMPORT_META_ENV_BASE_URL__
 function addBase(filePath: string) {
+  // filepath可能已经被补充了baseUrl
+  if (('/' + filePath).indexOf(baseUrl) === 0) {
+    return '/' + filePath
+  }
   return baseUrl + filePath
 }
 
-- 
GitLab