diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 50a12943..8e496d80 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -3,7 +3,7 @@ import AccountProfile from "../../modules/user/AccountProfile"; import { getImageUrl } from 'educoder' import axios from 'axios'; import cookie from 'react-cookies'; -import { Input , notification , Dropdown ,Popover, Menu,Badge, Button } from 'antd'; +import { notification , Dropdown ,Popover, Menu,Badge } from 'antd'; import { Link } from 'react-router-dom'; import LoginDialog from '../../modules/login/LoginDialog'; @@ -15,7 +15,7 @@ import CheckProfile from '../Component/ProfileModal/Profile'; import './header.scss'; import NoticeContent from './NoticeContent'; -const $ = window.$ +import MainLogo from './img/logo.png'; // TODO 这部分脚本从公共脚本中直接调用 let old_url; @@ -387,6 +387,12 @@ class NewHeader extends Component { {...this.props} {...this.state} /> : ""} + { + publicNav && + + + + } { settings && settings.nav_logo_url ? diff --git a/src/forge/Head/img/logo.png b/src/forge/Head/img/logo.png new file mode 100644 index 00000000..ab71a10e Binary files /dev/null and b/src/forge/Head/img/logo.png differ diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js index 0f5d191e..f56945ca 100644 --- a/src/forge/Order/MilepostDetail.js +++ b/src/forge/Order/MilepostDetail.js @@ -211,7 +211,7 @@ class MilepostDetail extends Component { const { issue_chosen, issues, limit, page, search_count, data, isSpin , status_type } = this.state; const { projectsId, meilid ,owner} = this.props.match.params; - + const { current_user , showLoginDialog , projectDetail } = this.props; const menu = ( this.getOption(e)}> 最新创建 @@ -239,8 +239,17 @@ class MilepostDetail extends Component { {data && data.percent && data.percent.toFixed(2)}%完成
- 编辑里程碑 - {this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建易修 + { + (current_user && current_user.login) && ( projectDetail && projectDetail.permission && projectDetail.permission !== "Reporter") ? + 编辑里程碑 + :"" + } + { + current_user && current_user.login ? + {this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建易修 + : + 创建易修 + }
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js index 08178864..b3b02ba4 100644 --- a/src/forge/Order/OrderItem.js +++ b/src/forge/Order/OrderItem.js @@ -52,7 +52,7 @@ class OrderItem extends Component { {current_user && current_user.login && checkbox}

- {item.name} + {item.name} {TagInfo(item.priority,"mr10")}

diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx index d9fa1bfa..4f47b33c 100644 --- a/src/forge/SecuritySetting/Index.jsx +++ b/src/forge/SecuritySetting/Index.jsx @@ -13,6 +13,7 @@ import { getImageUrl } from 'educoder'; import { Link } from 'react-router-dom'; import './Index.scss'; +import { useEffect } from "react"; const MyNoticeIndex = Loadable({ loader: () => import("./notice/myNotice/Index"), @@ -43,10 +44,15 @@ const PrivateLetter = Loadable({ }); function Index(props){ - const { current_user,mygetHelmetapi } = props; + const { current_user,mygetHelmetapi , checkIfLogin } = props; const { pathname } = props.location; const notice_url = mygetHelmetapi && mygetHelmetapi.common && mygetHelmetapi.common.notice; + useEffect(()=>{ + if(checkIfLogin() === false){ + props.history.push('/login'); + } + },[]) return(