logo and issues

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 &&
+              <a href={settings && settings.new_course.default_url} className={"fl pr15"}>
+                <img src={MainLogo} alt="" style={{ heigth: "40px" }}/>
+              </a>
+            }
             {
               settings && settings.nav_logo_url ?
               <a href={settings && settings.new_course.default_url} className={"fl mr50"} style={{minWidth:"45px"}}>

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 = (
       <Menu onClick={(e) => this.getOption(e)}>
         <Menu.Item key={'created_on'} value="desc">最新创建</Menu.Item>
@@ -239,8 +239,17 @@ class MilepostDetail extends Component {
               <span className="font-weight-bold">{data && data.percent && data.percent.toFixed(2)}%完成 </span>
             </span>
             <div className="milepostdiv">
-              <Link to={`/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link>
-              <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建易修</CheckProfile>
+              {
+                (current_user && current_user.login) && ( projectDetail && projectDetail.permission && projectDetail.permission !== "Reporter") ?
+                <Link to={`/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link>
+                :""
+              }
+              {
+                current_user && current_user.login ?
+                <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建易修</CheckProfile>
+                :
+                <a className="topWrapper_btn" onClick={showLoginDialog}>创建易修</a>
+              }
             </div>
           </FlexAJ>
         </div>

src/forge/Order/OrderItem.js

@@ -52,7 +52,7 @@ class OrderItem extends Component {
         {current_user && current_user.login && checkbox}
         <div className="flex-1">
           <p className="mb10 df" style={{alignItems:"center"}}>
-            <Link to={`/${owner}/${projectsId}/issues/${item.id}`} target="_blank" title={item.name} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"370px"}}>{item.name}</Link>
+            <Link to={`/${owner}/${projectsId}/issues/${item.id}`} title={item.name} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"370px"}}>{item.name}</Link>
             {TagInfo(item.priority,"mr10")}
           </p>
           <p className="color-grey-6 font-12">

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(
     <div className="newMain clearfix whiteBack">
       <div className="boies">