diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index 0965d27a..9df74d99 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -137,10 +137,13 @@ class Infos extends Component {
render() {
- const { current_user, main_web_site_url } = this.props;
+ const { current_user } = this.props;
const { username } = this.props.match.params;
const { user, isSpin, project_type, route_type } = this.state;
+
+ let main_web_site_url = JSON.parse(localStorage.chromesetting).main_web_site_url;
+
return (
@@ -167,7 +170,7 @@ class Infos extends Component {
{
- current_user && current_user.login && current_user.login === username &&
-
+ // current_user && current_user.login && current_user.login === username &&
+ //
}
diff --git a/src/military/fetch.js b/src/military/fetch.js
index bbf41f03..e94c1a03 100644
--- a/src/military/fetch.js
+++ b/src/military/fetch.js
@@ -15,7 +15,7 @@ const TokenKey = 'autologin_forge_military';
// 创建axios实例
const service = axios.create({
baseURL: httpUrl,
- timeout: 10000, // 请求超时时间
+ timeout: 1800000, // 请求超时时间
});
// request拦截器
diff --git a/src/military/notice/fetch.js b/src/military/notice/fetch.js
index 07e20261..f462c040 100644
--- a/src/military/notice/fetch.js
+++ b/src/military/notice/fetch.js
@@ -16,7 +16,7 @@ const TokenKey = 'autologin_forge_military';
// 创建axios实例
const service = axios.create({
baseURL: httpUrl,
- timeout: 10000, // 请求超时时间
+ timeout: 1800000, // 请求超时时间
});
// request拦截器
diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index bd57e094..e37976e4 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -433,7 +433,8 @@ class LoginDialog extends Component {
}
};
getloginurl = (url) => {
- window.location.href = url;
+ let settings=JSON.parse(localStorage.chromesetting);
+ window.location.href =settings.main_web_site_url+url;
};
openweixinlogin = () => {
this.setState({
@@ -580,9 +581,9 @@ class LoginDialog extends Component {
- this.getloginurl("https://osredm.com/account/lost_password")}
- className="mr3 color-grey-9">找回密码
- this.getloginurl("https://osredm.com/user_join")} className="color-grey-9">注册
+ {/* this.getloginurl("/account/lost_password")}
+ className="mr3 color-grey-9">找回密码 */}
+ this.getloginurl("/user_join")} className="color-grey-9">注册