From daa5cc212c5299f4624fa7435c920df9136d42fc Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 3 Feb 2021 17:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=20url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Component/MemberCards.jsx          | 7 ++++---
 src/forge/Team/RightBox.jsx                  | 4 ++--
 src/forge/Team/Setting/TeamSettingGroup.jsx  | 2 +-
 src/forge/Team/Setting/TeamSettingMember.jsx | 7 ++++---
 src/forge/Team/TeamGroup.jsx                 | 2 +-
 src/forge/Team/TeamMember.jsx                | 3 ++-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx
index 8370a936..b4afe333 100644
--- a/src/forge/Component/MemberCards.jsx
+++ b/src/forge/Component/MemberCards.jsx
@@ -4,6 +4,7 @@ import { Button } from 'antd';
 import styled from 'styled-components';
 import FocusButton from "../UsersList/focus_button";
 import { getImageUrl } from 'educoder';
+import { Link } from 'react-router-dom';
 
 const Img = styled.img`{
   border-radius:50%;
@@ -39,12 +40,12 @@ const Div = styled.div`{
   align-items: center;
   border:1px solid #eee;
 }`
-export default (({ img, name, time, focusStatus, is_current_user, login , successFunc }) => {
+export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
   return (
     <Div>
-      <Img src={getImageUrl(`images/${img}`)} />
+      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`images/${img}`)} /></Link>
       <div className="m-infos">
-        <Name>{name}</Name>
+        <Link to={`/users/${user && user.login}`}><Name>{name}</Name></Link>
         <Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>
         {
           is_current_user ?
diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx
index 9d81ba34..fea7526a 100644
--- a/src/forge/Team/RightBox.jsx
+++ b/src/forge/Team/RightBox.jsx
@@ -72,9 +72,9 @@ function RightBox({ OIdentifier , history }) {
             memberData.organization_users.map((item,key)=>{
               return(
                 <div className="teammembers" key={key}>
-                  <Img src={getImageUrl(`images/${item.user && item.user.image_url}`)} alt="" className="m-img"/>
+                  <Link to={`/users/${item.user && item.user.login}`}><Img src={getImageUrl(`images/${item.user && item.user.image_url}`)} alt="" className="m-img"/></Link>
                   <div>
-                    <ListName>{item.user && item.user.name}</ListName>
+                    <Link to={`/users/${item.user && item.user.login}`}><ListName>{item.user && item.user.name}</ListName></Link>
                     <Align><i className="iconfont icon-shijian color-green mr3 font-13"></i><Span>加入时间：{item.created_at}</Span></Align>
                   </div>
                 </div>
diff --git a/src/forge/Team/Setting/TeamSettingGroup.jsx b/src/forge/Team/Setting/TeamSettingGroup.jsx
index 0fed8019..1adec2e6 100644
--- a/src/forge/Team/Setting/TeamSettingGroup.jsx
+++ b/src/forge/Team/Setting/TeamSettingGroup.jsx
@@ -85,7 +85,7 @@ function TeamSettingGroup({organizeDetail,history}){
                     {
                       item.users && item.users.map((i,k)=>{
                         return(
-                          <ImgContent key={k} src={getImageUrl(`images/${i.image_url}`)}/>
+                          <Link to={`/users/${i.login}`}><ImgContent title={i.name} key={k} src={getImageUrl(`images/${i.image_url}`)}/></Link>
                         )
                       })
                     }
diff --git a/src/forge/Team/Setting/TeamSettingMember.jsx b/src/forge/Team/Setting/TeamSettingMember.jsx
index 3a1f08df..657acdb5 100644
--- a/src/forge/Team/Setting/TeamSettingMember.jsx
+++ b/src/forge/Team/Setting/TeamSettingMember.jsx
@@ -1,11 +1,12 @@
 import React, { useEffect, useState } from 'react';
 import { WhiteBack ,  FlexAJ } from '../../Component/layout';
-import { Menu , Table , Pagination , Icon , Tooltip , Popconfirm } from 'antd';
+import { Table , Pagination , Popconfirm } from 'antd';
 import Title from '../../Component/Title';
 import Search from '../../Component/Search';
 import styled from 'styled-components';
 import { getImageUrl } from 'educoder';
 import axios from 'axios';
+import { Link } from 'react-router-dom';
 
 const Img = styled.img`{
   width:30px;
@@ -63,7 +64,7 @@ export default (({organizeDetail})=>{
       width:"5%",
       render:(value)=>{
         return(
-          value && <Img src={getImageUrl('images/'+value.image_url)}></Img> 
+          value && <Link to={`/users/${value && value.login}`}><Img src={getImageUrl('images/'+value.image_url)}></Img> </Link>
         )
       }
     },
@@ -72,7 +73,7 @@ export default (({organizeDetail})=>{
       dataIndex: 'user',
       width:"15%",
       render:(value,item)=>{
-        return value && value.name
+        return <Link to={`/users/${value && value.login}`}>{value && value.name}</Link>
       }
     },
     {
diff --git a/src/forge/Team/TeamGroup.jsx b/src/forge/Team/TeamGroup.jsx
index 59edf426..b3d8cd22 100644
--- a/src/forge/Team/TeamGroup.jsx
+++ b/src/forge/Team/TeamGroup.jsx
@@ -76,7 +76,7 @@ function TeamGroup({organizeDetail,current_user}){
                   {
                     item.users && item.users.map((i,k)=>{
                       return( 
-                        <ImgContent src={getImageUrl(`images/${i.image_url}`)}/>
+                        <Link to={`/users/${i.login}`}><ImgContent src={getImageUrl(`images/${i.image_url}`)} title={i.name}/></Link>
                       )
                     })
                   }
diff --git a/src/forge/Team/TeamMember.jsx b/src/forge/Team/TeamMember.jsx
index dcc4a206..74555d2b 100644
--- a/src/forge/Team/TeamMember.jsx
+++ b/src/forge/Team/TeamMember.jsx
@@ -38,7 +38,8 @@ function TeamMember({organizeDetail,current_user}){
           {
             list.map((item,key)=>{
               return(
-                item.user && <Cards 
+                item.user && <Cards
+                  user={item.user} 
                   img={item.user.image_url}
                   name={item.user.name}
                   time={item.created_at}