修改bug

.env.development

@@ -5,7 +5,6 @@ VUE_APP_TITLE = 夜来香后台管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-# VUE_APP_BASE_API = 'https://test.baoxianzhanggui.com/nightFragrance'
 # VUE_APP_BASE_API = 'https://city.baoxianzhanggui.com/nightFragrance'
 VUE_APP_BASE_API = 'http://192.168.1.190:8087'
 

.env.production

@@ -6,5 +6,4 @@ ENV = 'production'
 
 # 若依管理系统/生产环境
 # VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'https://test.baoxianzhanggui.com/nightFragrance'
-#VUE_APP_BASE_API = 'https://city.baoxianzhanggui.com/nightFragrance'
+VUE_APP_BASE_API = 'https://city.baoxianzhanggui.com/nightFragrance'

src/components/ImagePreview/index.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { isExternal } from "@/utils/validate";
+import { normalizeResourceUrl } from '@/utils/resource'
 
 export default {
   name: "ImagePreview",
@@ -36,10 +36,7 @@ export default {
         return;
       }
       let real_src = this.src.split(",")[0];
-      if (isExternal(real_src)) {
-        return real_src;
-      }
-      return real_src;
+      return normalizeResourceUrl(real_src);
     },
     realSrcList() {
       if (!this.src) {
@@ -48,10 +45,7 @@ export default {
       let real_src_list = this.src.split(",");
       let srcList = [];
       real_src_list.forEach(item => {
-        if (isExternal(item)) {
-          return srcList.push(item);
-        }
-        return srcList.push(item);
+        return srcList.push(normalizeResourceUrl(item));
       });
       return srcList;
     },

src/components/ImageUpload/index.vue

@@ -48,6 +48,7 @@
 
 <script>
 import { getToken } from "@/utils/auth";
+import { normalizeResourceUrl } from '@/utils/resource'
 
 export default {
   props: {
@@ -107,11 +108,7 @@ export default {
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {
-              if (item.indexOf(this.baseUrl) === -1) {
-                  item = { name: item, url: item };
-              } else {
-                  item = { name: item, url: item };
-              }
+              item = { name: item, url: normalizeResourceUrl(item) };
             }
             return item;
           });
@@ -173,7 +170,7 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res, file) {
       if (res.code === 200) {
-        this.uploadList.push({ name: res.fileName, url: res.fileName });
+        this.uploadList.push({ name: res.fileName, url: normalizeResourceUrl(res.fileName) });
         this.uploadedSuccessfully();
       } else {
         this.number--;

src/utils/resource.js

@@ -0,0 +1,18 @@
+import { isExternal } from '@/utils/validate'
+
+export function normalizeResourceUrl(url) {
+  if (!url || isExternal(url)) {
+    return url
+  }
+
+  const baseUrl = (process.env.VUE_APP_BASE_API || '').replace(/\/$/, '')
+  if (!baseUrl || url.indexOf(baseUrl) === 0) {
+    return url
+  }
+
+  if (url.charAt(0) === '/') {
+    return `${baseUrl}${url}`
+  }
+
+  return url
+}