diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss index e0ae45ee..d27d4aae 100644 --- a/src/forge/Component/Component.scss +++ b/src/forge/Component/Component.scss @@ -20,6 +20,7 @@ li.ant-menu-item{ background-color: #fff; margin-bottom:18px; min-height: 130px; + border:1px solid #eee; .img{ margin-right: 20px; width: 190px; @@ -61,6 +62,7 @@ li.ant-menu-item{ } // Tabs .tabsStyle{ + border:1px solid #eee; .ant-tabs-bar.ant-tabs-top-bar{ padding-left: 35px; margin-bottom: 0px; diff --git a/src/forge/Team/Group/GroupDetailSetting.jsx b/src/forge/Team/Group/GroupDetailSetting.jsx index 8535f623..fa060ee3 100644 --- a/src/forge/Team/Group/GroupDetailSetting.jsx +++ b/src/forge/Team/Group/GroupDetailSetting.jsx @@ -48,7 +48,7 @@ export default (props)=>{ - + - + {groupId ? "基本设置" : "新建团队"}
diff --git a/src/forge/Team/Index.scss b/src/forge/Team/Index.scss index 99af33af..4de4adef 100644 --- a/src/forge/Team/Index.scss +++ b/src/forge/Team/Index.scss @@ -48,6 +48,7 @@ max-width: 860px; width: 72%; margin-bottom: 30px; + border:1px solid #eee; .head{ padding:16px 32px; border-bottom: 1px solid #eee; @@ -109,6 +110,9 @@ padding-left: 20px; box-sizing: border-box; margin-bottom: 30px; + & > div{ + border:1px solid #eee; + } } .box{ background:rgba(255,255,255,1); @@ -273,6 +277,9 @@ display: flex; align-items: flex-start; .g-sub-left{ + &>div{ + border:1px solid #eee; + } background-color: #fff; .g-desc{ padding:18px 20px; diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx index 004f2628..b43fb75d 100644 --- a/src/forge/Team/List.jsx +++ b/src/forge/Team/List.jsx @@ -68,7 +68,7 @@ function List(props){ return(
-
+
diff --git a/src/forge/Team/Setting/TeamSettingIndex.jsx b/src/forge/Team/Setting/TeamSettingIndex.jsx index 4717f2fe..718f5b5f 100644 --- a/src/forge/Team/Setting/TeamSettingIndex.jsx +++ b/src/forge/Team/Setting/TeamSettingIndex.jsx @@ -54,8 +54,9 @@ export default (( props )=>{ 组织设置} nav={array}> - - + +
+ ( @@ -81,6 +82,7 @@ export default (( props )=>{ )} > +
diff --git a/src/forge/Team/TeamGroup.jsx b/src/forge/Team/TeamGroup.jsx index cb52a7d1..38725e7d 100644 --- a/src/forge/Team/TeamGroup.jsx +++ b/src/forge/Team/TeamGroup.jsx @@ -5,7 +5,7 @@ import GroupItems from './TeamGroupItems'; const limit = 14; function TeamGroup({organizeDetail,history}){ return( -
+
组织团队
diff --git a/src/forge/Team/TeamMember.jsx b/src/forge/Team/TeamMember.jsx index 63aa515a..0a5abe1e 100644 --- a/src/forge/Team/TeamMember.jsx +++ b/src/forge/Team/TeamMember.jsx @@ -33,7 +33,7 @@ function TeamMember({organizeDetail,current_user}){ } return( - + 组织成员
diff --git a/src/forge/users/Index.scss b/src/forge/users/Index.scss index 1bdd0ec0..3ea86108 100644 --- a/src/forge/users/Index.scss +++ b/src/forge/users/Index.scss @@ -31,12 +31,20 @@ $flex:flex; display: $flex; align-items: flex-start; padding:20px 25px; - background-color:rgba(250,250,250,1) - } - & > div img{ - width: 190px; - height: 90px; - margin-right: 20px + background-color:rgba(250,250,250,1); + .imgBox{ + width: 190px; + height: 90px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 20px; + background-color: #fff; + img{ + max-width: 90%; + max-height: 90%; + } + } } .item-news{ display: $flex; diff --git a/src/forge/users/Team-item.jsx b/src/forge/users/Team-item.jsx index e521f181..d457ee26 100644 --- a/src/forge/users/Team-item.jsx +++ b/src/forge/users/Team-item.jsx @@ -4,7 +4,7 @@ import { getImageUrl } from 'educoder'; function TeamItem({item,history}){ return(
{history.push(`/organize/${item.name}`)}} style={{cursor:"pointer"}}> - +
{item.name}
diff --git a/src/forge/users/new_user.css b/src/forge/users/new_user.css index fc914e7d..27898ae0 100644 --- a/src/forge/users/new_user.css +++ b/src/forge/users/new_user.css @@ -22,6 +22,7 @@ width:74%; background: #fff; padding:0px !important; + border:1px solid #eee; } .text-center{text-align: center;} diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index daaefca9..cc054774 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -47,7 +47,7 @@ class NewHeader extends Component { mydisplay: false, headtypesonClickbool: false, headtypess: "/", - mygetHelmetapi2: null, + settings: null, goshowqqgtounp: false, visiblemyss: false, } @@ -497,7 +497,7 @@ class NewHeader extends Component { //获取数据为空的时候 gettablogourlnull = () => { this.setState({ - mygetHelmetapi2: undefined + settings: undefined }); var link = document.createElement('link'), oldLink = document.getElementById('dynamic-favicon'); @@ -535,7 +535,7 @@ class NewHeader extends Component { var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting')); var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse')); this.setState({ - mygetHelmetapi2: chromesettingArray + settings: chromesettingArray }); if (chromesettingArray.tab_logo_url) { this.gettablogourldata(chromesettingresponseArray); @@ -551,7 +551,7 @@ class NewHeader extends Component { let url = "/setting.json"; axios.get(url).then((response) => { if (response && response.data) { - this.setState({ mygetHelmetapi2: response.data.setting }); + this.setState({ settings: response.data.setting }); // localStorage.setItem('chromesetting', JSON.stringify(response.data.setting)); // localStorage.setItem('chromesettingresponse', JSON.stringify(response)); try { @@ -574,13 +574,9 @@ class NewHeader extends Component { matchpaths = (url) => { const { match } = this.props; if(url){ - if (url.indexOf('forums') > -1 && match.path.indexOf('forums') > -1) { + if (match.path.indexOf(url) > -1) { return true - } else if (url.indexOf('projects') > -1 && match.path.indexOf('projects') > -1) { - return true - } else if (url.indexOf('users') > -1 && match.path.indexOf('users') > -1) { - return true - } else { + }else { return false } } @@ -609,7 +605,7 @@ class NewHeader extends Component { showSearchOpentype, headtypesonClickbool, headtypess, - mygetHelmetapi2, + settings, goshowqqgtounp, } = this.state; /*用户名称 用户头像url*/ @@ -641,9 +637,9 @@ class NewHeader extends Component { } let headtypes = '/'; - if (mygetHelmetapi2) { - if (mygetHelmetapi2.navbar) { - if (mygetHelmetapi2.navbar.length > 0) { + if (settings) { + if (settings.navbar) { + if (settings.navbar.length > 0) { if (match.path === '/') { if (headtypesonClickbool === false) { headtypes = undefined; @@ -651,9 +647,9 @@ class NewHeader extends Component { headtypes = headtypess; } } else { - for (var i = 0; i < mygetHelmetapi2.navbar.length; i++) { - if (match.path === mygetHelmetapi2.navbar[i].link) { - headtypes = mygetHelmetapi2.navbar[i].link; + for (var i = 0; i < settings.navbar.length; i++) { + if (match.path === settings.navbar[i].link) { + headtypes = settings.navbar[i].link; break; } } @@ -708,20 +704,20 @@ class NewHeader extends Component { this.setgoshowqqgtounp(bool)}> :"" } - + { - mygetHelmetapi2 && mygetHelmetapi2.nav_logo_url ? - 可控开源社区 + settings && settings.nav_logo_url ? + 可控开源社区 : 可控开源社区 }
{ - mygetHelmetapi2 && mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.length > 0 ? + settings && settings.navbar && settings.navbar.length > 0 ?
    { - mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.map((item, key) => { + settings.navbar && settings.navbar.map((item, key) => { var new_link = item.link; var user_login = this.props.user && this.props.user.login; var is_hidden = item.hidden @@ -760,11 +756,15 @@ class NewHeader extends Component {
    { - coursestypes === true && this.props.user && this.props.user.main_site === false ? "" : + (coursestypes === true && this.props.user.main_site === false && (settings && !settings.add && (settings.add && settings.add.length === 0))) ? "" :
      -
    • 新建镜像项目
      • -
    • 新建托管项目
      • -
    • 新建组织
      • + { + settings && settings.add && settings.add.map((item,key)=>{ + return( +
    • {item.name}
      • + ) + }) + }
    }
    @@ -773,7 +773,7 @@ class NewHeader extends Component { {this.props.user && this.props.user.login &&
    {user && user.login && - + @@ -812,16 +812,16 @@ class NewHeader extends Component { this.educoderlogin()} className="mr5 color-grey-6">登录 { - mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url && - 注册 + settings && settings.new_course && settings.new_course.register_url && + 注册 } : user.login === "" ? this.educoderlogin()} className="mr5 color-grey-6">登录 { - mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url && - 注册 + settings && settings.new_course && settings.new_course.register_url && + 注册 } : @@ -833,16 +833,12 @@ class NewHeader extends Component {
    • {this.props.current_user.username}
      • -
    • - 个人中心 -
      • { - mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_courses && -
    • 我的课程
      • - } - { - mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_organ && -
    • 我的组织
      • + settings && settings.personal && settings.personal.length > 0 && settings.personal.map((item,key)=>{ + return( +
    • {item.name}
      • + ) + }) }
    • this.educoderloginysl()}>退出 diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 094e41f0..262996b3 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -31,6 +31,7 @@ body>.-task-title { z-index: 10000; background:rgba(255,255,255,1); position: fixed; + box-shadow: 0px 0px 14px rgb(0 0 0 / 10%); } .headerContent{ width:1200px;