From 557dc146a543f701d0b2b82d62b1ae1a8aceee18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 31 Jul 2019 19:02:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/NewHeader.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 45e4acc4a..2c07bc744 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -477,8 +477,12 @@ submittojoinclass=(value)=>{
       }else if( response.data.status===6){
         this.submitstatevalue( 1,"您已成功加入项目",response.data.project)
       }else if( response.data.status===0){
-				this.openNotification("加入项目成功!");
-				window.location.href(`/projects/${response.data.project_id}`)
+      	if(RadioGroupvalue==="reporter"){
+					this.openNotification("您加入项目成功!");
+					window.location.href=`/projects/${response.data.project_id}`;
+				}else{
+					this.openNotification("您的申请已提交，请等待项目管理员审批!");
+				}
 			}
     })
   }
@@ -877,7 +881,7 @@ submittojoinclass=(value)=>{
                   {/*<li>*/}
                   <a onClick={this.tojoinitem}>加入项目</a>
                   {/*</li>*/}
-                  <Modal
+									{tojoinitemtype===true?<Modal
                     keyboard={false}
                     title="加入项目"
                     visible={tojoinitemtype}
@@ -923,7 +927,7 @@ submittojoinclass=(value)=>{
                         </ul>
                       </div>
                     </div>
-                  </Modal>
+                  </Modal>:""}
                 </ul>
               </div>
             </div>