From 66bdbc1df92e8ec4a5108a4e0323e25a7b9ff8f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:37:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/printTemplate/index.jsx | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/views/printTemplate/index.jsx b/src/views/printTemplate/index.jsx
index dcb5d22..8f72e0c 100644
--- a/src/views/printTemplate/index.jsx
+++ b/src/views/printTemplate/index.jsx
@@ -831,7 +831,18 @@
Api.fileuploadbase64(param).then(result => { // 鍥剧墖涓婁紶锛屽苟鑾峰彇鍥剧墖璺緞
if (result.status) {
- resolve(Utils.getcloudurl(result.Images))
+ let url = result.Images
+ let baseurl = ''
+
+ if (window.GLOB.cloudServiceApi) {
+ baseurl = window.GLOB.cloudServiceApi.replace(/webapi(.*)$/, '')
+ } else {
+ baseurl = window.GLOB.baseurl
+ }
+
+ url = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
+
+ resolve(url)
} else {
notification.warning({
top: 92,
--
Gitblit v1.8.0