Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge

src/forge/Index.js

@@ -29,6 +29,7 @@ const ProjectDetail = Loadable({
 
 class Index extends Component {
   render() {
+  console.log("ddd",document.cookie);
     return (
       <div className="newMain clearfix">
         <Switch {...this.props}>

src/modules/tpm/NewHeader.js

@@ -729,18 +729,6 @@ class NewHeader extends Component {
         }
       })
     }
-
-    const contents = (
-      <div className="questiontypes" style={{
-        width: '93px',
-        height: '80px',
-      }}>
-        <a href={'/question'}  ><p className="questiontype">试题库</p></a>
-        <p className="questiontypeheng"></p>
-        <a href={'/paperlibrary'}  ><p className="questiontype">试卷库</p></a>
-        <p className="questiontypeheng"></p>
-      </div>
-    );
     return (
       <div className="newHeaders" id="nHeader">
         <div className="headerContent">
@@ -923,24 +911,13 @@ class NewHeader extends Component {
               <ul className="edu-menu-list" style={{ top: '46px', 'textAlign': 'center' }}>
               <li className="bor-bottom-greyE">
               <a href={`/users/${this.props.current_user.login}`}>个人中心</a>
-            {/* <a href="javascript:void(0)" className="fs12 hide-1 task-hide edu-txt-w80">{user.username}</a> */}
                 </li>
-                {/* {
-                  mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.edit_account &&
-                  <li><a href={`${mygetHelmetapi2.new_course.edit_account}`} target="_blank">修改资料</a></li>
-                } */}
                 {
                   mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_courses &&
                   <li><a href={`${mygetHelmetapi2.new_course.my_courses}`} target="_blank">我的课程</a></li>
                 }
-                {/* {
-                  mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_projects &&
-                  <li><Link to={`/users/${this.props.current_user.login}`} >我的项目</Link></li>
-                } */}
-
                 {
                   mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_organ &&
-                  // <li><a href={`${mygetHelmetapi2.new_course.my_organ}`} target="_blank">我的组织</a></li>
                   <li><a href={`/users/${this.props.current_user.login}/organize`} target="_blank">我的组织</a></li>
                 }
                 <li className="bor-top-greyE">

src/modules/tpm/TPMIndexHOC.js

@@ -13,7 +13,6 @@ import cookies from 'react-cookies';
 export function TPMIndexHOC(WrappedComponent) {
 	return class II extends React.Component {
 		constructor(props) {
-			console.log("cook  ",cookies.load("autologin_trustie"));
 			super(props);
 			window.$('#root').css('position', 'relative')
 
@@ -22,7 +21,6 @@ export function TPMIndexHOC(WrappedComponent) {
 				resLoading: true,
 				Headertop: undefined,
 				Footerdown: undefined,
-				coursedata: {},
 
 				isRender: false,
 				AccountProfiletype: false,