diff --git a/src/home/FourthSection/index.jsx b/src/home/FourthSection/index.jsx index 8e36ad9f..2cc762cd 100644 --- a/src/home/FourthSection/index.jsx +++ b/src/home/FourthSection/index.jsx @@ -33,7 +33,7 @@ function FourthSection({ fourth, history }) {

开源项目

开源项目版块集项目托管、版本管理等功能于一体,为开源协作和群智汇聚提供创作环境

- +
diff --git a/src/military/components/adminRouter/index.jsx b/src/military/components/adminRouter/index.jsx index 5ec4397c..7f652efd 100644 --- a/src/military/components/adminRouter/index.jsx +++ b/src/military/components/adminRouter/index.jsx @@ -84,7 +84,7 @@ export default props => { const checkMenu = useMemo(() => { return 企业认证 - 开源项目 + {/* 开源项目 */} 统筹任务发布审批 自主任务发布审批 成果/评论审批 diff --git a/src/military/javaFetch.js b/src/military/javaFetch.js index 1a47425a..5f75dd8b 100644 --- a/src/military/javaFetch.js +++ b/src/military/javaFetch.js @@ -17,11 +17,11 @@ export default function javaFetch(actionUrl){ // request拦截器 service.interceptors.request.use(config => { if (cookie.load(TokenKey)) { - config.headers['Authorization'] = cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改 + config.headers['Authorization'] = cookie.load(TokenKey) ||cookie.load('autologin_trustie'); // 让每个请求携带自定义token 请根据实际情况自行修改 } if (window.location.port === "3007") { // 模拟token为登录用户 - const osredmToken = sessionStorage.osredmToken; + const osredmToken = cookie.load(TokenKey) ||cookie.load('autologin_trustie')||sessionStorage.osredmToken; if (config.url.indexOf('?') === -1) { config.url = `${config.url}?token=${osredmToken}`; } else { diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx index 46fc2935..733df9cd 100644 --- a/src/military/task/taskDetail/index.jsx +++ b/src/military/task/taskDetail/index.jsx @@ -363,7 +363,8 @@ export default Form.create()( } function goUserProfiles() { - window.open(`/users/${current_user.login}/profiles`); + const main_web_site_url =localStorage.chromesetting&& JSON.parse(localStorage.chromesetting).main_web_site_url; + window.open(`${main_web_site_url}/users/${current_user.login}/profiles`); } function backPublicEnd(makePublicAt, makePublicDays) { diff --git a/src/military/task/taskManage/index.js b/src/military/task/taskManage/index.js index 60bcacea..b3776641 100644 --- a/src/military/task/taskManage/index.js +++ b/src/military/task/taskManage/index.js @@ -52,7 +52,7 @@ export default Form.create()(({ form, showNotification, match, history }) => { } setLoading(false); }) - }, [reload, statusString, curPage, searchObj]); + }, [reload, statusString, curPage, searchObj ,publishMode]); const helper = useCallback(