From 032c772ddd91d3fcc8695e599027ae4240cef35b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 25 十二月 2020 15:34:01 +0800
Subject: [PATCH] 2020-12-25
---
src/components/tabview/index.jsx | 2 +-
src/index.js | 2 +-
src/components/header/index.jsx | 4 ++--
src/tabviews/zshare/fileupload/index.jsx | 2 +-
src/utils/utils.js | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index f9fdafa..2b2bf02 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -138,8 +138,8 @@
}
if (value.PageParam.OpenType === 'menu') {
this.props.modifyMainMenu(value)
- } else {
- window.open('#/' + value.PageParam.linkUrl + '/')
+ } else if (value.PageParam.OpenType === 'outpage') {
+ window.open(value.PageParam.linkUrl)
}
}
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index 9f990a9..3a7e507 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -33,7 +33,7 @@
if (process.env.NODE_ENV === 'production') {
service = document.location.origin + '/' + window.GLOB.service + 'zh-CN/'
} else {
- service = window.GLOB.location + window.GLOB.service + 'zh-CN/'
+ service = window.GLOB.location + '/' + window.GLOB.service + 'zh-CN/'
}
class Header extends Component {
diff --git a/src/index.js b/src/index.js
index 9da847a..8b4739e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -182,7 +182,7 @@
GLOB.service = _service ? _service + '/' : ''
} else {
GLOB.linkurl = ''
- GLOB.location = 'http://qingqiumarket.cn/'
+ GLOB.location = 'http://qingqiumarket.cn'
GLOB.service = 'mkwms/'
}
diff --git a/src/tabviews/zshare/fileupload/index.jsx b/src/tabviews/zshare/fileupload/index.jsx
index 0207a36..7578173 100644
--- a/src/tabviews/zshare/fileupload/index.jsx
+++ b/src/tabviews/zshare/fileupload/index.jsx
@@ -12,7 +12,7 @@
if (process.env.NODE_ENV === 'production') {
service = document.location.origin + '/' + window.GLOB.service
} else {
- service = window.GLOB.location + window.GLOB.service
+ service = window.GLOB.location + '/' + window.GLOB.service
}
class FileUpload extends Component {
diff --git a/src/utils/utils.js b/src/utils/utils.js
index ca41324..bee9aae 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -698,7 +698,7 @@
if (process.env.NODE_ENV === 'production') {
baseurl = document.location.origin + '/' + window.GLOB.service
} else {
- baseurl = window.GLOB.location + window.GLOB.service
+ baseurl = window.GLOB.location + '/' + window.GLOB.service
}
let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
--
Gitblit v1.8.0