diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 246eeb7ba..a8c9fa2e8 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -273,9 +273,9 @@ class NewHeader extends Component {
{/*
{current_user && current_user.username}
*/}
-
- 首页
-
+ {/*
+ 首页
+ */}
代码库主页
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index b9186c27f..55d42ff13 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -493,10 +493,10 @@ function CoderDepot(props){
baseOperate &&
+ 合并请求
}
- {
+ {/* {
issuesFlag &&
+ 疑修
- }
+ } */}
{ fileOperate &&
diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx
index ee75a42bc..941f4d947 100644
--- a/src/forge/Team/List.jsx
+++ b/src/forge/Team/List.jsx
@@ -100,16 +100,18 @@ function List(props){
{organizeDetail && organizeDetail.nickname}
{organizeDetail && (
- {!enterpriseOpenInfo.isOpen && organizeDetail.is_admin && (
-
-
-
- )}
- {enterpriseOpenInfo.isOpen && enterpriseOpenInfo.url ? (
-
- ) : (
-
- )}
+ {
+ !enterpriseOpenInfo.isOpen ? organizeDetail.is_admin && (
+
+
+
+ ) :
+ enterpriseOpenInfo.url ? (
+
+ ) : (
+
+ )
+ }
)}
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index 52b6d5947..b458c931a 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/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){