merge

src/forge/Head/Header.js

@@ -273,9 +273,9 @@ class NewHeader extends Component {
         {/* <Menu.Item>
           <span className="currentName" title={current_user && current_user.username}>{current_user && current_user.username}</span>
         </Menu.Item> */}
-        <Menu.Item>
-          <a href={`https://testpm.trustie.net`}>首页</a>
-        </Menu.Item>
+        {/* <Menu.Item>
+          <a href={`/${this.props.current_user && this.props.current_user.login}`}>首页</a>
+        </Menu.Item> */}
         <Menu.Item>
           <a href={`/${this.props.current_user  && this.props.current_user.login}`}>代码库主页</a>
         </Menu.Item>

src/forge/Main/CoderDepot.jsx

@@ -493,10 +493,10 @@ function CoderDepot(props){
                             baseOperate &&
                             <CheckProfile {...props} sureFunc={compare}>+ 合并请求</CheckProfile>
                           }
-                        {
+                        {/* {
                           issuesFlag &&
                           <CheckProfile {...props} sureFunc={createIssue} checklogin>+ 疑修</CheckProfile>
-                        }
+                        } */}
 
                       </div>
                       { fileOperate &&

src/forge/Team/List.jsx

@@ -100,16 +100,18 @@ function List(props){
             <span className="orz-name task-hide">{organizeDetail && organizeDetail.nickname}</span>
             {organizeDetail && (
               <div>
-                {!enterpriseOpenInfo.isOpen && organizeDetail.is_admin && (
-                  <Link to={`/${OIdentifier}/enterprise`}>
-                    <Button type='primary'>开通工作台</Button>
-                  </Link>
-                )}
-                {enterpriseOpenInfo.isOpen && enterpriseOpenInfo.url ? (
-                  <Button type='primary' onClick={() => { window.open(enterpriseOpenInfo.url) }}>前往工作台</Button>
-                ) : (
-                  <Button type='primary'>正在开通工作台</Button>
-                )}
+                {
+                  !enterpriseOpenInfo.isOpen ? organizeDetail.is_admin && (
+                    <Link to={`/${OIdentifier}/enterprise`}>
+                      <Button type='primary'>开通工作台</Button>
+                    </Link>
+                  ) :
+                  enterpriseOpenInfo.url ? (
+                    <Button type='primary' onClick={() => { window.open(enterpriseOpenInfo.url) }}>前往工作台</Button>
+                  ) : (
+                    <Button type='primary'>正在开通工作台</Button>
+                  )
+                }
               </div>
             )}
             </p>

src/modules/tpm/TPMIndexHOC.js

@@ -131,9 +131,7 @@ export function TPMIndexHOC(WrappedComponent) {
 			this.getComlist();
 		}
 		getComlist=()=>{
-			console.log(this.props.history.location);
 			getOrzCompanyList().then(res=>{
-				console.log(res);
 				if(res){
 					this.setState({
 						companyList:res.data.rows
@@ -247,7 +245,9 @@ export function TPMIndexHOC(WrappedComponent) {
 						// 如果处于登录状态，且刚刚打开，那么跳到个人主页
 						// let hrefStr = this.props.match.path === "/login" || this.props.match.path === "/register" || this.props.match.path === "/resetPassword";
 						// console.log("111:",hrefStr,this.props.match.path);
-						if(this.props.match.path === "/"){
+						if(this.props.location.search.includes('path=organizes')) {
+							this.props.history.push(`/${response.data.login}/organizes`)
+						} else if(this.props.match.path === "/"){
 							this.props.history.push(`/${response.data.login}`)
 						}
 						if(!response.data.phone){