From de68654963c1b53111f49909e187e7c8e2a25cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <1261960504@qq.com> Date: Wed, 29 Dec 2021 19:57:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/notice/fetch.js | 4 ++-- src/military/task/fetch.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/military/notice/fetch.js b/src/military/notice/fetch.js index 38f2a078..54297138 100644 --- a/src/military/notice/fetch.js +++ b/src/military/notice/fetch.js @@ -2,8 +2,8 @@ import javaFetch from '../javaFetch'; -let settings=JSON.parse(localStorage.chromesetting); -let actionUrl = settings.api_urls? settings.api_urls.notice :'https://info.osredm.com'; +let settings = JSON.parse(localStorage.chromesetting); +let actionUrl = settings && settings.api_urls ? settings.api_urls.notice : 'https://info.osredm.com'; const service = javaFetch(actionUrl); export const httpUrl = actionUrl; diff --git a/src/military/task/fetch.js b/src/military/task/fetch.js index 9140d89e..894bfd60 100644 --- a/src/military/task/fetch.js +++ b/src/military/task/fetch.js @@ -2,8 +2,8 @@ import javaFetch from '../javaFetch'; -let settings=JSON.parse(localStorage.chromesetting); -let actionUrl = settings.api_urls? settings.api_urls.task :'https://task.osredm.com'; +let settings = JSON.parse(localStorage.chromesetting); +let actionUrl = settings && settings.api_urls ? settings.api_urls.task : 'https://task.osredm.com'; const service = javaFetch(actionUrl); export const httpUrl = actionUrl; From 6f05e84f82b6f78657348f33ddf5238a115a13b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <1261960504@qq.com> Date: Wed, 12 Jan 2022 21:07:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/users/Infos.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js index 0965d27a..62662721 100644 --- a/src/forge/users/Infos.js +++ b/src/forge/users/Infos.js @@ -137,7 +137,9 @@ class Infos extends Component { render() { - const { current_user, main_web_site_url } = this.props; + let settings = JSON.parse(localStorage.chromesetting); + let main_web_site_url = settings.main_web_site_url; + const { current_user } = this.props; const { username } = this.props.match.params; const { user, isSpin, project_type, route_type } = this.state; @@ -167,7 +169,7 @@ class Infos extends Component {