From 2bd6f9cb1ec9a63779c761ca7a120f14266034c9 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 26 Apr 2021 16:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87-=E6=96=B0=E5=A2=9E=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=92=8C=E7=BD=91=E5=9D=80=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Component/Cards.jsx |  3 ++-
 src/forge/Team/Sub/Detail.jsx | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/forge/Component/Cards.jsx b/src/forge/Component/Cards.jsx
index 498b375c..f9a3d52e 100644
--- a/src/forge/Component/Cards.jsx
+++ b/src/forge/Component/Cards.jsx
@@ -3,7 +3,7 @@ import { getImageUrl } from 'educoder';
 import { Link } from 'react-router-dom';
 import './Component.scss';
 
-function Cards({img , title, desc , rightBtn , src}){
+function Cards({img , title, desc , rightBtn , src , bottomInfos}){
   return(
     <div className="cards">
       {img &&<div className="img"><img src={getImageUrl(`/${img}`)} alt=""/></div>}
@@ -15,6 +15,7 @@ function Cards({img , title, desc , rightBtn , src}){
         <div className="desc">
           {desc}
         </div>
+        {bottomInfos}
       </div>
     </div>
   )
diff --git a/src/forge/Team/Sub/Detail.jsx b/src/forge/Team/Sub/Detail.jsx
index bba0b7de..f2df0dbd 100644
--- a/src/forge/Team/Sub/Detail.jsx
+++ b/src/forge/Team/Sub/Detail.jsx
@@ -83,10 +83,9 @@ function Detail(props){
           img={detail.avatar_url}
           rightBtn={
             <React.Fragment>
-              {flag && !buttonflag && detail.is_admin ? <AlignCenter className="color-blue">
-                <Link to={`/organize/${OIdentifier}/setting`} className="color-blue">设置</Link>
-                <i className="iconfont icon-shezhi2 ml3"></i>
-              </AlignCenter> :""}
+              {flag && !buttonflag && detail.is_admin ? 
+                <Link to={`/organize/${OIdentifier}/setting`} className="color-blue ml10 font-14">设置<i className="iconfont icon-shezhi2 ml3 fr"></i></Link>
+              :""}
               {buttonflag && 
                 <span className="subNavs">
                   <Link to={`/organize/${OIdentifier}/member`} className={pathname ===`/organize/${OIdentifier}/member` ? "active":""}><span>组织成员</span>{detail.num_users && <lable>{detail.num_users}</lable>}</Link>
@@ -95,6 +94,12 @@ function Detail(props){
               }
             </React.Fragment>
           }
+          bottomInfos={
+            !buttonflag && <div>
+              <span className="color-grey-6"><i className="iconfont icon-weizhi mr3 font-16 color-grey-6"></i>{detail.location}</span>
+              <a href={detail.website} target="_blank" className="ml20 color-grey-6"><i className="iconfont icon-lianjie mr3 font-14"></i>{detail.website}</a>
+            </div>
+          }
         />
       }
       <Switch {...props}>