diff --git a/.idea/workspace.xml b/.idea/workspace.xml index fb351c06..efbb4f0a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,6 +4,10 @@ + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -719,16 +662,6 @@ - - - - - - - - - - @@ -835,16 +768,6 @@ - - - - - - - - - - @@ -852,20 +775,10 @@ - + - - - - - - - - - - - - + + @@ -907,10 +820,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 09ca7af0..55dd36a3 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -1173,10 +1173,15 @@ submittojoinclass=(value)=>{ mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_courses &&
  • 我的课程
    • } + {/*{*/} + {/*mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_projects &&*/} + {/*
  • 我的项目
    • */} + {/*}*/} { mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_projects && -
  • 我的项目
    • +
  • 我的项目
    • } + { mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_organ &&
  • 我的组织
    • diff --git a/src/modules/user/usersInfo/Infos.js b/src/modules/user/usersInfo/Infos.js index 9587cdf3..bda24aa7 100644 --- a/src/modules/user/usersInfo/Infos.js +++ b/src/modules/user/usersInfo/Infos.js @@ -64,7 +64,7 @@ class Infos extends Component{ type:0, login:undefined, isRenders:false, - moduleName:"courses", + moduleName:"projects", next_gold:undefined } } @@ -113,8 +113,8 @@ class Infos extends Component{ data:result.data, followed:result.data.followed, sign:result.data.brief_introduction, - id:result.data.id, - next_gold:result.data.tomorrow_attendance_gold + // id:result.data.id, + // next_gold:result.data.tomorrow_attendance_gold }) } } diff --git a/src/modules/user/usersInfo/InfosBanner.js b/src/modules/user/usersInfo/InfosBanner.js index 16b70895..dd057ce2 100644 --- a/src/modules/user/usersInfo/InfosBanner.js +++ b/src/modules/user/usersInfo/InfosBanner.js @@ -27,39 +27,48 @@ class InfosBanner extends Component{ let {pathname}=this.props.location; moduleName=pathname.split("/")[3]; - let user_id=this.props.current_user&&this.props.current_user.user_id; - let user_type=this.props.current_user&&this.props.current_user.user_identity; - let targetuserid=this.props.data&&this.props.data.id; + // let user_id=this.props.current_user&&this.props.current_user.user_id; + // let user_type=this.props.current_user&&this.props.current_user.user_identity; + // let targetuserid=this.props.data&&this.props.data.id; // console.log(is_current) // console.log(current_user) // console.log(current_user.is_teacher) - let shixuntype=false; - let pathstype=false; - let coursestypes=false; - if(this.props&&this.props.mygetHelmetapi!=null){ - let shixun="/shixuns"; - let paths="/paths"; - let courses="/courses"; - this.props.mygetHelmetapi.navbar.map((item,key)=>{ - var reg = RegExp(item.link); - if(shixun.match(reg)){ - if(item.hidden===true){ - shixuntype=true - } - } - if(paths.match(reg)){ - if(item.hidden===true){ - pathstype=true - } - } - if(courses.match(reg)){ - if(item.hidden===true){ - coursestypes=true - } - } - }) - } + // let shixuntype=false; + // let pathstype=false; + // let coursestypes=false; + // let projectstypes=false; + + // if(this.props&&this.props.mygetHelmetapi!=null){ + // console.log("this.props", this.props.mygetHelmetapi) + // let shixun="/shixuns"; + // let paths="/paths"; + // let courses="/courses"; + // let projects = "/projects"; + // this.props.mygetHelmetapi.navbar.map((item,key)=>{ + // var reg = RegExp(item.link); + // if(shixun.match(reg)){ + // if(item.hidden===true){ + // shixuntype=true + // } + // } + // if(paths.match(reg)){ + // if(item.hidden===true){ + // pathstype=true + // } + // } + // if(courses.match(reg)){ + // if(item.hidden===true){ + // coursestypes=true + // } + // } + // if(projects.match(reg)){ + // if(item.hidden===true){ + // projectstypes=true + // } + // } + // }) + // } return(
    @@ -68,94 +77,108 @@ class InfosBanner extends Component{

    头像

    - {data && data.name} - {/*{*/} - {/*data && is_current == false && data.identity =="学生" ? "" : */} - {/**/} - {/*}*/} -

    -

    - - - - - - + + {data && data.name} + + { + data && data.identity && + + }

    + { + data && data.brief_introduction && +

    {data.brief_introduction}

    + } + {/*

    */} + {/**/} + {/**/} + {/**/} + {/**/} + {/**/} + {/**/} + {/*

    */}
    -
    - {is_current ? "我":"TA"}的经验值 - {data && data.experience} -
    -
    - {is_current ? "我":"TA"}的金币 - {data && data.grade} -
    - { - is_current ? - - { - data && data.attendance_signed ? - 已签到 - : - 签到 - } - - : - - - 私信 - - - } +
    + {is_current ? "我" : "TA"}的粉丝 + {data && data.fan_count} +
    +
    + {is_current ? "我" : "TA"}的关注 + {data && data.follow_count} +
    + {/*
    */} + {/*{is_current ? "我":"TA"}的经验值*/} + {/*{data && data.experience}*/} + {/*
    */} + {/*
    */} + {/*{is_current ? "我":"TA"}的金币*/} + {/*{data && data.grade}*/} + {/*
    */} + {/*{*/} + {/*is_current ? */} + {/**/} + {/*{*/} + {/*data && data.attendance_signed ? */} + {/*已签到*/} + {/*:*/} + {/*签到*/} + {/*}*/} + {/* */} + {/*:*/} + {/**/} + {/**/} + {/*私信*/} + {/**/} + {/**/} + {/*}*/}
    - {coursestypes===true?"":
  • - this.setState({moduleName: 'courses'})} - to={`/users/${username}/courses`}>翻转课堂 -
    • } - {shixuntype===true?"":
  • - this.setState({moduleName: 'shixuns'})} - to={`/users/${username}/shixuns`}>实训项目 -
    • } - {pathstype===true?"":
  • - this.setState({moduleName: 'paths'})} - to={`/users/${username}/paths`}>实践课程 -
    • } - {this.props.user&&this.props.user.main_site===true?
  • + {/*{coursestypes===true?"":
  • */} + {/* this.setState({moduleName: 'courses'})}*/} + {/*to={`/users/${username}/courses`}>翻转课堂*/} + {/*
    • }*/} + {/*{shixuntype===true?"":
  • */} + {/* this.setState({moduleName: 'shixuns'})}*/} + {/*to={`/users/${username}/shixuns`}>实训项目*/} + {/*
    • }*/} + {/*{pathstype===true?"":
  • */} + {/* this.setState({moduleName: 'paths'})}*/} + {/*to={`/users/${username}/paths`}>实践课程*/} + {/*
    • }*/} +
  • this.setState({moduleName: 'projects'})} to={`/users/${username}/projects`}>开发项目 -
    • :""} + {/*
  • */} {/* this.setState({moduleName: 'package'})}*/} {/* to={`/users/${username}/package`}>众包*/} {/*
    • */} - {this.props.user&&this.props.user.main_site===true?((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) - &&
  • - this.setState({moduleName: 'videos'})} - to={`/users/${username}/videos`}>视频 -
    • :""} + {/*{this.props.user&&this.props.user.main_site===true?((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)*/} + {/*&&
  • */} + {/* this.setState({moduleName: 'videos'})}*/} + {/*to={`/users/${username}/videos`}>视频*/} + {/*
    • :""}*/} {/*自己的主页且不是学生显示题库按钮*/} - {this.props.user&&this.props.user.main_site===true?(is_current && current_user&& current_user.is_teacher ) - &&
  • - this.setState({moduleName: 'topics'})} - to={`/users/${username}/topics/personal`}>题库 -
    • :""} + {/*{this.props.user&&this.props.user.main_site===true?(is_current && current_user&& current_user.is_teacher )*/} + {/*&&
  • */} + {/* this.setState({moduleName: 'topics'})}*/} + {/*to={`/users/${username}/topics/personal`}>题库*/} + {/*
    • :""}*/}
    diff --git a/src/modules/user/usersInfo/Projects.js b/src/modules/user/usersInfo/Projects.js index 7ed67641..26d5e373 100644 --- a/src/modules/user/usersInfo/Projects.js +++ b/src/modules/user/usersInfo/Projects.js @@ -158,7 +158,6 @@ class Projects extends Component{ let isStudent = this.props.isStudent(); let is_current=this.props.is_current; const {current_user} = this.props - console.log("current_user", current_user) const menu = ( @@ -222,7 +221,7 @@ class Projects extends Component{ className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}管理的
  • this.changeCategory("study")} - className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}学习的
    • + className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}参与的