From da58b17ca210b564a01f49e70f145d9acc6fbbfa Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sun, 24 Apr 2022 15:39:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95-checkiflogin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                                         | 4 ++--
 src/forge/Team/List.jsx                            | 1 +
 src/forge/Team/RightBox.jsx                        | 6 ++++--
 src/forge/users/GeneralView/ConcentrateBox.jsx     | 4 +++-
 src/forge/users/GeneralView/ConcentrateProject.jsx | 4 +++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/App.js b/src/App.js
index 94e2debff..7c126c595 100644
--- a/src/App.js
+++ b/src/App.js
@@ -395,14 +395,14 @@ class App extends Component {
                   }
                 }>
               </Route>
-              <Route
+              {/* <Route
                 path={"/"}
                 render={
                   (props) => {
                     return (<Projects {...this.props} {...props} {...this.state} />)
                   }
                 }>
-              </Route>
+              </Route> */}
 
               {/* 判断为用户/组织，并进入对应页面 */}
               {
diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx
index 48a19c227..cad2fbef6 100644
--- a/src/forge/Team/List.jsx
+++ b/src/forge/Team/List.jsx
@@ -111,6 +111,7 @@ function List(props){
           }
         </div>
       <Right 
+        {...props}
         admin={organizeDetail && organizeDetail.is_admin} 
         OIdentifier={OIdentifier} 
         showCompeleteDialog={props.showCompeleteDialog} 
diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx
index 5c85ae474..fcf6b3855 100644
--- a/src/forge/Team/RightBox.jsx
+++ b/src/forge/Team/RightBox.jsx
@@ -37,10 +37,9 @@ const Img = styled.img`{
   height:45px;
   margin-right:12px;
 }`
-function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,completeProfile  }) {
+function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,completeProfile ,checkIfLogin , showLoginDialog , current_user }) {
   const [ memberData, setMemberData ] = useState(undefined);
   const [ groupData, setGroupData ] = useState(undefined);
-
   useEffect(()=>{
     if(OIdentifier){
       getMember(OIdentifier);
@@ -91,6 +90,9 @@ function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,complet
         bottom={
           admin && 
           <CheckProfile 
+            current_user={current_user}
+            checkIfLogin={checkIfLogin}
+            showLoginDialog={showLoginDialog}
             showCompeleteDialog={showCompeleteDialog} 
             completeProfile={completeProfile}
             sureFunc={()=>history.push(`/${OIdentifier}/teams/new`)}
diff --git a/src/forge/users/GeneralView/ConcentrateBox.jsx b/src/forge/users/GeneralView/ConcentrateBox.jsx
index dacf5f840..ef135f613 100644
--- a/src/forge/users/GeneralView/ConcentrateBox.jsx
+++ b/src/forge/users/GeneralView/ConcentrateBox.jsx
@@ -5,7 +5,7 @@ import CheckProfile from '../../Component/ProfileModal/Profile';
 
 const { Search } = Input;
 const limit = 20;
-function ConcentrateBox({ visible , onCancel , onSure , username , choosed , history , showCompeleteDialog , completeProfile , current_user }) {
+function ConcentrateBox({ visible , onCancel , onSure , username , choosed , history , showCompeleteDialog , completeProfile , current_user,checkIfLogin,showLoginDialog }) {
   const [ page , setPage ]= useState(1);
   const [ total , setTotal ]= useState(0);
   const [ pageSize , setPageSize ] = useState(false);
@@ -173,6 +173,8 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed , his
           (list && list.length === 0) && (copyList && copyList.length === 0) && 
           <div style={{textAlign:"center"}}>您还没有公开的{search && `“${search}”`}项目，先去
             <CheckProfile 
+              checkIfLogin={checkIfLogin}
+              showLoginDialog={showLoginDialog}
               current_user={current_user}
               showCompeleteDialog={showCompeleteDialog}
               completeProfile={completeProfile}
diff --git a/src/forge/users/GeneralView/ConcentrateProject.jsx b/src/forge/users/GeneralView/ConcentrateProject.jsx
index d3f99e53c..6a97c0526 100644
--- a/src/forge/users/GeneralView/ConcentrateProject.jsx
+++ b/src/forge/users/GeneralView/ConcentrateProject.jsx
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
 import axios from 'axios';
 import Box from './ConcentrateBox';
 
-function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfile,history}) {
+function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfile,history,checkIfLogin,showLoginDialog}) {
   const [ list , setList ] = useState(undefined);
   const [ visible , setVisible ] = useState(false);
   const [ value , setValue ] = useState([]);
@@ -54,6 +54,8 @@ function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfi
         completeProfile={completeProfile}
         showCompeleteDialog={showCompeleteDialog}
         history={history}
+        checkIfLogin={checkIfLogin}
+        showLoginDialog={showLoginDialog}
       />
       {
         list && list.length>0 &&