From 9965b1509a4a41c7d43780e3f8d63e10aa14afa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Mon, 18 Mar 2024 10:13:51 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=BC=80=E9=80=9A=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=8F=B0=E6=8C=89=E9=92=AE=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Team/List.jsx | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

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){
             <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>

From 18c0b62361561c1f0a4a78d8775d94d43fd27da9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Wed, 20 Mar 2024 10:23:34 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/tpm/TPMIndexHOC.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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){

From eb9afc52ffc147f7b75f145bdec1ab26d04f1f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Wed, 27 Mar 2024 16:21:35 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Head/Header.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 246eeb7ba..48073c625 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -274,7 +274,7 @@ class NewHeader extends Component {
           <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>
+          <a href={`/${this.props.current_user}`}>首页</a>
         </Menu.Item>
         <Menu.Item>
           <a href={`/${this.props.current_user  && this.props.current_user.login}`}>代码库主页</a>

From 83568bef5eaec1daa8d974ca23d344e6d0fc4ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Thu, 28 Mar 2024 11:35:31 +0800
Subject: [PATCH 4/5] cont.

---
 src/forge/Head/Header.js      | 2 +-
 src/forge/Main/CoderDepot.jsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 48073c625..e8d9f5154 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -274,7 +274,7 @@ class NewHeader extends Component {
           <span className="currentName" title={current_user && current_user.username}>{current_user && current_user.username}</span>
         </Menu.Item> */}
         <Menu.Item>
-          <a href={`/${this.props.current_user}`}>首页</a>
+          <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>
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 &&
                             <CheckProfile {...props} sureFunc={compare}>+ 合并请求</CheckProfile>
                           }
-                        {
+                        {/* {
                           issuesFlag &&
                           <CheckProfile {...props} sureFunc={createIssue} checklogin>+ 疑修</CheckProfile>
-                        }
+                        } */}
 
                       </div>
                       { fileOperate &&

From 2f2aa927a53deae4b98711d436823e4142f34ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Wed, 3 Apr 2024 09:28:44 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Head/Header.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index e8d9f5154..a8c9fa2e8 100644
--- a/src/forge/Head/Header.js
+++ b/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>
+        {/* <Menu.Item>
           <a href={`/${this.props.current_user && this.props.current_user.login}`}>首页</a>
-        </Menu.Item>
+        </Menu.Item> */}
         <Menu.Item>
           <a href={`/${this.props.current_user  && this.props.current_user.login}`}>代码库主页</a>
         </Menu.Item>