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/menudesign/index.jsx | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index 3f94889..ad11d1f 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -888,10 +888,21 @@
Api.fileuploadbase64(param).then(result => {
if (result.status) {
+ 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
+
Api.getCloudConfig({
func: 's_PrintTemplateMSub',
ID: config.uuid,
- Images: Utils.getcloudurl(result.Images),
+ Images: url,
Remark: '',
temp_type: 'billprint',
}).then(response => {
@@ -1160,6 +1171,7 @@
updateLogConfig = (config) => {
config.fstMenuId = this.state.config.fstMenuId || config.fstMenuId || ''
config.parentId = this.state.config.parentId || config.parentId || ''
+ config.open_edition = this.state.config.open_edition || ''
this.setState({
config: null
--
Gitblit v1.8.0