From eb9f6523f86ca6c1c1748efde3f2055ff43053ea Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 2 Jul 2019 16:32:13 +0800
Subject: [PATCH 1/3] fun
---
public/react/src/modules/login/LoginDialog.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index 82d3406ad..d3c60286a 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -433,7 +433,7 @@ class LoginDialog extends Component {
{}
// console.log(1)
}
>
From 330dd6dd137c7957af7fb87cc4242b78c7309f5c Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 2 Jul 2019 16:32:32 +0800
Subject: [PATCH 2/3] url2
---
public/react/src/common/UrlTool.js | 7 +++++++
public/react/src/common/educoder.js | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/public/react/src/common/UrlTool.js b/public/react/src/common/UrlTool.js
index 71eb8e32a..c4ea468bf 100644
--- a/public/react/src/common/UrlTool.js
+++ b/public/react/src/common/UrlTool.js
@@ -36,6 +36,13 @@ export function getUrl(path, goTest) {
}
return `${path ? path: ''}`;
}
+export function getUrl2(path, goTest) {
+ const local = 'http://localhost:3000'
+ if (isDev) {
+ return `${local}${path?path:''}`
+ }
+ return `${path ? path: ''}`;
+}
export function getUploadActionUrl(path, goTest) {
return `${getUrl()}/api/attachments.json${isDev ? `?debug=${window._debugType || 'admin'}` : ''}`
}
diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js
index 5026eee28..db93b4d56 100644
--- a/public/react/src/common/educoder.js
+++ b/public/react/src/common/educoder.js
@@ -2,7 +2,7 @@ import { from } from '_array-flatten@2.1.2@array-flatten';
// export { default as OrderStateUtil } from '../routes/Order/components/OrderStateUtil';
-export { getImageUrl as getImageUrl, getUrl as getUrl,setImagesUrl as setImagesUrl, getUploadActionUrl as getUploadActionUrl } from './UrlTool';
+export { getImageUrl as getImageUrl, getUrl as getUrl, getUrl2 as getUrl2, setImagesUrl as setImagesUrl, getUploadActionUrl as getUploadActionUrl } from './UrlTool';
export { default as queryString } from './UrlTool2';
export { SnackbarHOC as SnackbarHOC } from './SnackbarHOC';
From ba3f437269d298bd8ce724584be7c9c8aecffd6d Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 2 Jul 2019 16:38:42 +0800
Subject: [PATCH 3/3] compatibility.htm
---
public/react/public/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/public/index.html b/public/react/public/index.html
index ff03855aa..4925affe5 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -31,7 +31,7 @@
location.pathname.indexOf("/compatibility") == -1) {
// location.href = './compatibility'
- location.href = './compatibility.html'
+ location.href = '/compatibility.html'
}