From 49dd7dcde0cf5a1979feed19cadab44fb15f8a56 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 11 Jun 2020 15:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9D=97-=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/edu-purge.css | 4 - src/forge/Component/Cards.jsx | 19 ++ src/forge/Component/Component.scss | 72 ++++- src/forge/Component/ListCount.jsx | 41 +++ src/forge/Component/MemberCards.jsx | 74 ++++++ src/forge/Component/Tabs.jsx | 20 ++ src/forge/Component/layout.jsx | 44 ++++ src/forge/Main/Detail.js | 4 +- src/forge/Team/Box.jsx | 23 ++ src/forge/Team/Detail.jsx | 33 +++ src/forge/Team/GroupDetailMember.jsx | 35 +++ src/forge/Team/GroupDetailProject.jsx | 35 +++ src/forge/Team/GroupDetails.jsx | 50 ++++ src/forge/Team/Index.jsx | 42 ++- src/forge/Team/Index.scss | 248 +++++++++++++++++- src/forge/Team/List.jsx | 124 +++++++++ src/forge/Team/New.jsx | 22 +- src/forge/Team/SubDetail.jsx | 57 ++++ src/forge/Team/TeamGroup.jsx | 49 ++++ src/forge/Team/TeamMember.jsx | 25 ++ src/forge/Version/New.jsx | 6 +- src/modules/courses/css/Courses.css | 9 - .../recruitment/routePage/EditResumePage.js | 1 - 23 files changed, 991 insertions(+), 46 deletions(-) create mode 100644 src/forge/Component/Cards.jsx create mode 100644 src/forge/Component/ListCount.jsx create mode 100644 src/forge/Component/MemberCards.jsx create mode 100644 src/forge/Component/Tabs.jsx create mode 100644 src/forge/Component/layout.jsx create mode 100644 src/forge/Team/Box.jsx create mode 100644 src/forge/Team/Detail.jsx create mode 100644 src/forge/Team/GroupDetailMember.jsx create mode 100644 src/forge/Team/GroupDetailProject.jsx create mode 100644 src/forge/Team/GroupDetails.jsx create mode 100644 src/forge/Team/List.jsx create mode 100644 src/forge/Team/SubDetail.jsx create mode 100644 src/forge/Team/TeamGroup.jsx create mode 100644 src/forge/Team/TeamMember.jsx diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 8ade015d..1e03b3e0 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -538,10 +538,6 @@ a:hover.leftnav-box-inner .btn-cir { /*右侧头部*/ -/*右侧内容*/ -.content { - min-width: 1000px; -} /* tab */ diff --git a/src/forge/Component/Cards.jsx b/src/forge/Component/Cards.jsx new file mode 100644 index 00000000..f35d890a --- /dev/null +++ b/src/forge/Component/Cards.jsx @@ -0,0 +1,19 @@ +import React from 'react'; +import './Component.scss'; + +export default (({img , title, desc , rightBtn})=>{ + return( +
+
+
+

+ {title} + {rightBtn} +

+
+ {desc} +
+
+
+ ) +}) \ No newline at end of file diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss index 99e9f7fc..1040f54d 100644 --- a/src/forge/Component/Component.scss +++ b/src/forge/Component/Component.scss @@ -1,10 +1,66 @@ - ul.ant-menu{ - border-right: none; +ul.ant-menu{ + border-right: none; +} +ul.ant-menu li:last-child{ + border-bottom: none; +} +li.ant-menu-item{ + margin:0px!important; + border-bottom: 1px solid #eee; +} +// Cards +.cards{ + display: flex; + align-items: center; + padding:20px 34px; + background-color: #fff; + margin:18px 0px; + .img{ + margin-right: 20px; + width: 190px; + height: 90px; + border:1px solid rgba(238,238,238,1); + display: flex; + justify-content: center; + align-items: center; + img{ + max-width: 100%; + } } - ul.ant-menu li:last-child{ - border-bottom: none; + .content{ + flex:1; + width: 0; + .titles{ + display: flex; + justify-content: space-between; + margin-bottom: 10px!important; + align-items: center; + &>span{ + font-size:18px ; + color: #333; + } + } + .desc{ + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + } } - li.ant-menu-item{ - margin:0px!important; - border-bottom: 1px solid #eee; - } \ No newline at end of file +} +// Tabs +.tabsStyle{ + .ant-tabs-bar.ant-tabs-top-bar{ + padding-left: 35px; + margin-bottom: 0px; + } + .ant-tabs-nav .ant-tabs-tab{ + padding:19px 0px; + margin-right: 40px; + } + .ant-tabs-ink-bar{ + width:25px!important; + bottom: 10px; + } +} \ No newline at end of file diff --git a/src/forge/Component/ListCount.jsx b/src/forge/Component/ListCount.jsx new file mode 100644 index 00000000..5a88dd43 --- /dev/null +++ b/src/forge/Component/ListCount.jsx @@ -0,0 +1,41 @@ +import React from 'react'; +import styled from 'styled-components'; + +export default (({fork,parise})=>{ + const DivStyle = styled.div`{ + display:flex; + align-item:center; + }`; + const SpanStylefork = styled.span`{ + display:flex; + align-item:center; + margin-left:30px; + padding:0px 12px; + border-radius:13px; + background-color:#EBF4FE; + height:24px; + line-height:24px; + font-size:12px; + }`; + const SpanStyleparise = styled.span`{ + display:flex; + align-item:center; + margin-left:30px; + padding:0px 12px; + border-radius:13px; + background-color:#FFF3DC; + height:24px; + line-height:24px; + font-size:12px; + }`; + return( + + { + fork || fork ===0 ? fork({fork}):"" + } + { + parise || parise ===0?点赞({parise}):"" + } + + ) +}) \ No newline at end of file diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx new file mode 100644 index 00000000..78dd78d0 --- /dev/null +++ b/src/forge/Component/MemberCards.jsx @@ -0,0 +1,74 @@ +import React from 'react'; +import './Component.scss'; +import styled from 'styled-components'; + +const Img = styled.img`{ + border-radius:50%; + width:50px; + height:50px; + margin-right:14px; +}` +const Name = styled.div`{ + color:#5091FF; + font-size:16px; + height:22px; + line-height:22px; + margin-bottom:7px; +}` +const Time = styled.div`{ + color:#888; + font-size:12px; + height:16px; + line-height:16px; + margin-bottom:9px; + display:flex; + align-item:center; +}` +const I = styled.i`{ + font-size:13px!important; + color:#60B25E; + margin-right:2px; +}` +const FocusBtn = styled.a`{ + display:inline-block; + height:30px; + line-height:26px; + padding:0px 12px; + background-color:#fafafa; + border:1px solid #eee; + border-radius:2px; + color:#888!important; +}` +const Ifocused = styled.i`{ + font-size:16px!important; + color:#FFA802; + margin-right:4px; +}` +const Ifocus = styled.i`{ + font-size:16px!important; + color:#BBBBBB; + margin-right:4px; +}` +const Div = styled.div`{ + margin-bottom: 18px; + padding:20px 16px; + display: flex; + align-items: center; + border:1px solid #eee; +}` +export default (({img,name,time, focusStatus})=>{ + return( +
+ +
+ {name} + + { + focusStatus ? + 已关注 : + 关注 + } +
+
+ ) +}) \ No newline at end of file diff --git a/src/forge/Component/Tabs.jsx b/src/forge/Component/Tabs.jsx new file mode 100644 index 00000000..c3dd18d1 --- /dev/null +++ b/src/forge/Component/Tabs.jsx @@ -0,0 +1,20 @@ +import React from 'react'; +import { Tabs } from 'antd'; +import './Component.scss'; + +const { TabPane } = Tabs; + +export default (({ nav, index , onChange , children })=>{ + return( + nav && nav.length > 0 ? + + { + nav.map((item,key)=>{ + return( + {children} + ) + }) + } + :"" + ) +}) \ No newline at end of file diff --git a/src/forge/Component/layout.jsx b/src/forge/Component/layout.jsx new file mode 100644 index 00000000..821071fc --- /dev/null +++ b/src/forge/Component/layout.jsx @@ -0,0 +1,44 @@ +import styled from 'styled-components'; + +export const Banner = styled.div`{ + padding:20px 25px; + color:#333; + font-size:18px; + border-bottom:1px solid #eee; + background-color:#fff; + border-radius:5px 5px 0px 0px; +}` +export const AlignCenterBetween = styled.div`{ + display:flex; + align-items: center; + padding: 14px 14px 14px 20px; + justify-content: space-between; + border-bottom:1px solid #eee; +}` +export const AlignCenter = styled.div`{ + display:flex; + align-items: center; +}` +// 左右结构 +export const Box = styled.div`{ + display:flex; + align-item:flex-start; +}` +export const Long = styled.div`{ + width:72%; + border-radius:5px; + margin-bottom:30px; +}` +export const Short = styled.div`{ + width:28%; + border-radius:5px; + margin-bottom:30px; +}` +export const Gap = styled.div`{ + padding-left:20px; + box-sizing:border-box; +}` +export const WhiteBack = styled.div`{ + background-color:#fff; + border-radius:5px; +}` diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index c37b1d92..74375372 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Spin, Tooltip } from 'antd'; -import { Link, Route, Switch, withRouter } from 'react-router-dom'; +import { Link, Route, Switch } from 'react-router-dom'; import '../css/index.css' import './list.css'; @@ -605,4 +605,4 @@ class Detail extends Component { } } -export default withRouter(Detail); +export default Detail; diff --git a/src/forge/Team/Box.jsx b/src/forge/Team/Box.jsx new file mode 100644 index 00000000..7b4e2092 --- /dev/null +++ b/src/forge/Team/Box.jsx @@ -0,0 +1,23 @@ +import React from 'react'; + + +export default (({ name , count , bottom , children })=>{ + return( +
+
+ {name} + {count} +
+
+ {children} +
+ { + bottom ? +
+ {bottom} +
+ :"" + } +
+ ) +}) diff --git a/src/forge/Team/Detail.jsx b/src/forge/Team/Detail.jsx new file mode 100644 index 00000000..80d24b90 --- /dev/null +++ b/src/forge/Team/Detail.jsx @@ -0,0 +1,33 @@ +import React , { useEffect , useState } from 'react'; +import { Route, Switch } from "react-router-dom"; +import Loadable from "react-loadable"; +import Loading from "../../Loading"; + +import Cards from '../Component/Cards'; + +import './Index.scss'; + +const DetailIndex = Loadable({ + loader: () => import("./List"), + loading: Loading, +}); +export default ((props)=>{ + return( +
+ 设置} + img={`https://dss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=4193840146,2109186388&fm=26&gp=0.jpg`} + /> + + { + return + }} + > + +
+ ) +}) \ No newline at end of file diff --git a/src/forge/Team/GroupDetailMember.jsx b/src/forge/Team/GroupDetailMember.jsx new file mode 100644 index 00000000..aab6d50e --- /dev/null +++ b/src/forge/Team/GroupDetailMember.jsx @@ -0,0 +1,35 @@ +import React from 'react'; +import Cards from '../Component/MemberCards'; + +export default (()=>{ + return( +
+
+ + + + +
+
+ ) +}) \ No newline at end of file diff --git a/src/forge/Team/GroupDetailProject.jsx b/src/forge/Team/GroupDetailProject.jsx new file mode 100644 index 00000000..01d3bade --- /dev/null +++ b/src/forge/Team/GroupDetailProject.jsx @@ -0,0 +1,35 @@ +import React from 'react'; +import styled from 'styled-components'; +import { Link } from 'react-router-dom'; + +const Box=styled.div`{ + padding:0px 38px; +}` +const Div = styled.div`{ + display:flex; + align-items: center; + margin-left:10px; + padding:25px 0px; + border-bottom:1px solid #eee; +}` +const Imgs = styled.img`{ + width:30px; + height:30px; + margin-right:12px; + border-radius:50%; +}` + +export default (()=>{ + return( + +
+ + ajdfwkerijwirjklsf +
+
+ + ajdfwkerijwirjklsf +
+ + ) +}) \ No newline at end of file diff --git a/src/forge/Team/GroupDetails.jsx b/src/forge/Team/GroupDetails.jsx new file mode 100644 index 00000000..a540392f --- /dev/null +++ b/src/forge/Team/GroupDetails.jsx @@ -0,0 +1,50 @@ +import React , {useState} from 'react'; +import { Button } from 'antd'; +import styled from 'styled-components'; +import { Box , Short , Long , Gap , WhiteBack , AlignCenterBetween } from '../Component/layout'; +import Tabs from '../Component/Tabs'; + +import Memberlist from './GroupDetailMember'; +import Grouplist from './GroupDetailProject'; + +const Leave = styled.a`{ + display:block; + border-radius:5px; + border:1px solid rgba(40,189,108,1); + color:rgba(40,189,108,1); + padding:0px 14px; + height:30px; + line-height:30px; +}` +export default ((props)=>{ + const [ nav , setNav ] = useState('0'); + + return( + + + + Owndsknamename + 离开团队 + +
该团队暂无描述
+
+

管理员团队对 所有仓库 具有操作权限，且对组织具有 管理员权限。

+

此外，该团队拥有了 创建仓库 的权限：成员可以在组织中创建新的仓库。

+ +
+ + + + + + { + nav === "0" ? + : + } + + + + + + ) +}) \ No newline at end of file diff --git a/src/forge/Team/Index.jsx b/src/forge/Team/Index.jsx index ff63045a..398ac744 100644 --- a/src/forge/Team/Index.jsx +++ b/src/forge/Team/Index.jsx @@ -1,13 +1,13 @@ import React from 'react'; import { Route, Switch } from "react-router-dom"; +import Loadable from "react-loadable"; +import Loading from "../../Loading"; import { SnackbarHOC } from "educoder"; import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC"; import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC"; -import Loadable from "react-loadable"; -import Loading from "../../Loading"; import '../css/index.css'; @@ -15,17 +15,39 @@ const New = Loadable({ loader: () => import("./New"), loading: Loading, }); +const DetailIndex = Loadable({ + loader: () => import("./Detail"), + loading: Loading, +}); +const SubDetail = Loadable({ + loader: () => import("./SubDetail"), + loading: Loading, +}); export default CNotificationHOC()(SnackbarHOC()(TPMIndexHOC( ((props)=>{ return ( - - { - return ; - }} - > - +
+ + { + return + }} + > + { + return + }} + > + { + return + }} + > + +
) }) ))) \ No newline at end of file diff --git a/src/forge/Team/Index.scss b/src/forge/Team/Index.scss index d36cbe37..7d05a430 100644 --- a/src/forge/Team/Index.scss +++ b/src/forge/Team/Index.scss @@ -12,13 +12,14 @@ font-size: 18px; } .teamBox-form{ - padding:24px 40px; + padding:24px 40px 0px 40px; } .lables{ position: relative; color:#333; margin-bottom: 5px; display: block; + font-size: 16px; } .lables.must::before{ content: "*"; @@ -28,4 +29,247 @@ left: -15px; height: 100%; } -} \ No newline at end of file +} +.ant-btn.grey{ + background: #bbb; + color: #fff; + border: 1px solid #bbb; +} +.teamDetail{ + width: 1200px; + margin:0px auto; +} +.list{ + display: flex; + align-items: flex-start; + .list-l{ + background-color: #fff; + max-width: 860px; + width: 72%; + .head{ + padding:16px 32px; + border-bottom: 1px solid #eee; + display: flex; + justify-content: space-between; + align-items: center; + .addBtn{ + display: inline-block; + border-radius: 5px; + border:1px solid #5091FF; + color: #5091FF; + height: 30px; + line-height: 30px; + padding:0px 10px; + } + } + .team{ + padding:0px 32px; + .team_project{ + padding:22px 0px; + border-bottom: 1px solid #eee; + .t_p_title{ + display: flex; + align-items: center; + justify-content: space-between; + .name{ + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-size: 18px; + max-width: 500px; + float: left; + } + } + .desc{ + color: #333; + margin-top: 6px; + margin-bottom: 3px; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + } + &:last-child{ + border-bottom: none;; + } + } + } + } + .list-r{ + width: 28%; + max-width: 340px; + padding-left: 20px; + box-sizing: border-box; + } + .box{ + background:rgba(255,255,255,1); + border-radius:5px; + margin-bottom: 20px; + .head{ + padding:25px 20px; + display: flex; + border-bottom: 1px solid #eee; + justify-content: space-between; + color: #333; + } + .content{ + padding:13px 0px; + .teammembers{ + display: flex; + align-items: center; + padding:13px 20px; + .m-img{ + border-radius: 50%; + width:45px; + height: 45px; + margin-right: 12px; + } + } + } + .foot{ + padding:15px 20px; + border-top: 1px solid #eee; + } + } +} +.subNavs{ + display: flex; + a{ + display: block; + margin-left: 14px; + height: 40px; + padding:0px 22px; + border-radius: 2px; + border:1px solid #eee; + background-color: #fafafa; + color:#333; + display: flex; + align-items: center; + font-size: 14px; + span{ + display: block; + height: 18px; + line-height: 18px; + } + lable{ + display: block; + padding:0px 7px; + background-color:#eee; + height: 18px; + line-height: 18px; + font-size: 12px; + border-radius: 10px; + margin-left: 5px; + } + &.active{ + border:1px solid #5091FF; + color: #5091FF; + lable{ + background-color: #F1F8FF; + color: #5091FF; + } + } + } +} +// 组织团队 +.groupBox{ + display: flex; + flex-wrap: wrap; + align-items: flex-start; + background-color: #fff; + padding:30px 35px; + margin-bottom: 30px; + &>div{ + border:1px solid #eee; + background-color: #fff; + width: 48.5%; + margin-right: 3%; + margin-bottom: 30px; + .g-head,.g-foot{ + display: flex; + justify-content: space-between; + background-color: #F1F8FF; + padding:10px 10px 10px 25px; + align-items: center; + } + .g-foot{ + background-color: #fafafa; + justify-content: left; + } + .g-body{ + padding:15px 25px; + } + } + &>div:nth-child(2n){ + margin-right: 0px; + } +} +// 组织成员-一行四个 +.memberBox{ + display: flex; + align-items: flex-start; + flex-wrap: wrap; + background-color: #fff; + padding:24px 35px; + margin-bottom: 30px; + min-height: 400px; + align-content: flex-start; + &>div{ + width:22.75% ; + margin-right: 3%; + .m-infos{ + flex:1; + } + } + &>div:nth-child(4n){ + margin-right: 0px; + } +} +// 团队成员-一行三个 +.MemberBoxThree{ + display: flex; + align-items: flex-start; + flex-wrap: wrap; + background-color: #fff; + padding:24px 35px; + margin-bottom: 30px; + min-height: 400px; + align-content: flex-start; + &>div{ + width:31% ; + margin-right: 3.5%; + .m-infos{ + flex:1; + } + } + &>div:nth-child(3n){ + margin-right: 0px; + } +} +// 团队详情（成员、项目） +.GroupSubLevel{ + display: flex; + align-items: flex-start; + .g-sub-left{ + background-color: #fff; + .g-desc{ + padding:18px 20px; + color:#333; + min-height: 100px; + } + .g-tip{ + padding:28px 20px; + border-top: 1px solid #eee; + &>p{ + margin-bottom: 10px!important; + } + &>p>span{ + color:#333; + } + &>button{ + margin-top: 10px; + } + } + } +} diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx new file mode 100644 index 00000000..0dfcea9f --- /dev/null +++ b/src/forge/Team/List.jsx @@ -0,0 +1,124 @@ +import React from 'react'; +import { Button } from 'antd'; +import Search from '../Component/Search'; +import Sort from '../Component/Sort'; +import ListCount from '../Component/ListCount'; +import Box from './Box'; +import './Index.scss'; +import styled from 'styled-components'; + +import { Menu } from 'antd'; + +const Span = styled.span`{ + color:#888; + font-size:12px; + margin-right:10px; +}` +const Align = styled.div`{ + display:flex; + aligin:center; +}` +const ListName = styled.div`{ + font-size:14px; + color:#333; + margin-bottom:8px; + height:18px; + line-height:18px; +}`; +const ColorListName = styled.div`{ + color:#5091FF; + font-size:14px; + margin-bottom:8px; + height:18px; + line-height:18px; +}` +const Img = styled.img`{ + border-radius:50%; + width:45px; + height:45px; + margin-right:12px; +}` +export default (()=>{ + function onSearch(value){ + + } + const menu=( + + 更新时间排序 + 项目数排序 + + ) + const menu_new=( + + 新建托管项目 + 新建镜像项目 + + ) + const leftList = ( +
+

+ + react项目react项目react项目react项目 + + + + + +

+
+ 用于构建用户界面的 JavaScript 库 +
+
+ 更新于1天前 +
+
+ ) + return( +
+
+
+
+ +
+

+ + + 新建项目 + + + 排序 + +

+
+
+ {leftList} +
+
+
+ +
+ +
+ 陈Professer + 加入时间：2020-04-28 +
+
+ + 新建团队} + > +
+
+ 陈Professer + + 2名成员 + 1个仓库 + +
+
+ +
+
+ ) +}) \ No newline at end of file diff --git a/src/forge/Team/New.jsx b/src/forge/Team/New.jsx index 0f2f9ae0..c8b2202c 100644 --- a/src/forge/Team/New.jsx +++ b/src/forge/Team/New.jsx @@ -1,13 +1,17 @@ import React,{ forwardRef , useCallback } from 'react'; import './Index.scss'; -import { Form , Input , Cascader , Checkbox , Upload } from "antd"; +import { Form , Input , Cascader , Radio , Checkbox , Upload , Button } from "antd"; import { locData } from "../Utils/locData"; export default Form.create()( forwardRef(({form})=>{ const { getFieldDecorator, validateFields, setFieldsValue } = form; - + const radioStyle = { + display: 'block', + height: '30px', + lineHeight: '30px', + } const helper = useCallback( (label, name, rules, widget, isRequired = true) => ( @@ -52,11 +56,11 @@ export default Form.create()( '可见性', "exposure", [{ required: true, message: "请选择可见性" }], - - 公开 - 受限（仅对登录用户可见） - 公开（仅对组织成员可见） - + + 公开 + 受限（仅对登录用户可见） + 公开（仅对组织成员可见） + )} {helper( '选择头像', @@ -72,6 +76,10 @@ export default Form.create()( )} +

+ + +

) diff --git a/src/forge/Team/SubDetail.jsx b/src/forge/Team/SubDetail.jsx new file mode 100644 index 00000000..cb8bcb77 --- /dev/null +++ b/src/forge/Team/SubDetail.jsx @@ -0,0 +1,57 @@ +import React from 'react'; +import { Route, Switch , Link } from "react-router-dom"; +import Loadable from "react-loadable"; +import Loading from "../../Loading"; +import './Index.scss'; + +import Cards from '../Component/Cards'; + +const Group = Loadable({ + loader: () => import("./TeamGroup"), + loading: Loading, +}); +const Member = Loadable({ + loader: () => import("./TeamMember"), + loading: Loading, +}); +const GroupDetails = Loadable({ + loader: () => import("./GroupDetails"), + loading: Loading, +}); + +export default ((props)=>{ + return( +
+ + 组织成员13 + 组织团队13 + + } + img={`https://dss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=4193840146,2109186388&fm=26&gp=0.jpg`} + /> + + { + return + }} + > + { + return + }} + > + { + return + }} + > + +
+ ) +}) \ No newline at end of file diff --git a/src/forge/Team/TeamGroup.jsx b/src/forge/Team/TeamGroup.jsx new file mode 100644 index 00000000..8815fe57 --- /dev/null +++ b/src/forge/Team/TeamGroup.jsx @@ -0,0 +1,49 @@ +import React from 'react'; +import { Banner } from '../Component/layout'; +import styled from 'styled-components'; + +const SpanName = styled.span`{ + font-size:16px; + color:#333; +}` +const SpanFoot = styled.span`{ + margin-right:5px; + color:#333 +}` +const ALink = styled.a`{ + border:1px solid #F73030; + color:#F73030!important; + height:30px; + line-height:30px; + padding:0px 15px; + border-radius:5px; +}` +const ImgContent = styled.img`{ + height:44px; + width:44px; + border-radius:50%; + margin:5px 20px 5px 0px; +}` +export default (()=>{ + return( +
+ 组织团队 +
+
+

+ oweners + 离开团队 +

+
+ + +
+

+ 2 名成员 + 1 个项目 +

+
+
+
+ ) +}) \ No newline at end of file diff --git a/src/forge/Team/TeamMember.jsx b/src/forge/Team/TeamMember.jsx new file mode 100644 index 00000000..e2223c4f --- /dev/null +++ b/src/forge/Team/TeamMember.jsx @@ -0,0 +1,25 @@ +import React from 'react'; +import { Banner } from '../Component/layout'; +import Cards from '../Component/MemberCards'; + +export default (()=>{ + return( +
+ 组织成员 +
+ + +
+
+ ) +}) \ No newline at end of file diff --git a/src/forge/Version/New.jsx b/src/forge/Version/New.jsx index 6353bdc8..18e481ea 100644 --- a/src/forge/Version/New.jsx +++ b/src/forge/Version/New.jsx @@ -26,6 +26,9 @@ export default Form.create()( const [attachment, setAttachment] = useState(undefined); const [options , setOptions] = useState(undefined); + + const repo_id = projectDetail && projectDetail.repo_id; + const { projectsId, versionId } = match.params; useEffect(()=>{ getBranchs(projectsId); },[projectsId]) @@ -41,9 +44,6 @@ export default Form.create()( line-height: 35px; `; - const repo_id = projectDetail && projectDetail.repo_id; - const { projectsId, versionId } = match.params; - useEffect(() => { if (versionId) { diff --git a/src/modules/courses/css/Courses.css b/src/modules/courses/css/Courses.css index 59628c31..425f5879 100644 --- a/src/modules/courses/css/Courses.css +++ b/src/modules/courses/css/Courses.css @@ -1338,15 +1338,6 @@ samp { padding: 16px 0px; } -/* FORM START */ -.ant-form label { - /* 为了覆盖antd的样式，这里使用了important，TODO */ - font-size: 16px !important; -} - -.ant-form label.font-18 { - font-size: 18px !important; -} .ant-form label.font-14 { font-size: 14px !important; diff --git a/src/modules/recruitment/routePage/EditResumePage.js b/src/modules/recruitment/routePage/EditResumePage.js index c26b2682..4331ef8e 100644 --- a/src/modules/recruitment/routePage/EditResumePage.js +++ b/src/modules/recruitment/routePage/EditResumePage.js @@ -7,7 +7,6 @@ import { CenterBtnGrp, SaveBtn, CancelBtn } from "../util/GeneralButton"; import { useLoaded } from "../util/hooks"; import { updateResume } from "../data/updateResume"; import { getResume } from "../data/getResume"; -import Nav from "../util/Nav"; const Backgroud = styled(FullScreen)` background: rgba(245, 246, 249, 1);