diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx
index 8370a9368..b4afe3337 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 (
-
})
+
-
{name}
+
{name}
{
is_current_user ?
diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx
index 9d81ba349..fea7526a3 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(
-

+
-
{item.user && item.user.name}
+
{item.user && item.user.name}
加入时间:{item.created_at}
diff --git a/src/forge/Team/Setting/TeamSettingGroup.jsx b/src/forge/Team/Setting/TeamSettingGroup.jsx
index 0fed80194..1adec2e6e 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(
-
+
)
})
}
diff --git a/src/forge/Team/Setting/TeamSettingMember.jsx b/src/forge/Team/Setting/TeamSettingMember.jsx
index 3a1f08dfb..657acdb5f 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 &&
+ value &&
)
}
},
@@ -72,7 +73,7 @@ export default (({organizeDetail})=>{
dataIndex: 'user',
width:"15%",
render:(value,item)=>{
- return value && value.name
+ return {value && value.name}
}
},
{
diff --git a/src/forge/Team/TeamGroup.jsx b/src/forge/Team/TeamGroup.jsx
index 59edf4264..b3d8cd225 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(
-
+
)
})
}
diff --git a/src/forge/Team/TeamMember.jsx b/src/forge/Team/TeamMember.jsx
index dcc4a206f..74555d2b3 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 &&