diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js index c2f2c7ff4..99afce1d0 100644 --- a/public/react/src/modules/user/usersInfo/InfosBanner.js +++ b/public/react/src/modules/user/usersInfo/InfosBanner.js @@ -30,6 +30,11 @@ class InfosBanner extends Component{ 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) + // console.log(current_user.admin) return(
diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index 8f0c27a6b..c84f23d32 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -271,6 +271,10 @@ class InfosTopics extends Component{ visible, isshowprofes } = this.state; + let { + is_current, + current_user, + }=this.props; let categorylist=[ {val:"普通作业",type:"normal"}, @@ -291,6 +295,12 @@ class InfosTopics extends Component{ 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) + // console.log(current_user.admin) const menu = ( this.updatedlist("updated_at")}> @@ -456,8 +466,10 @@ class InfosTopics extends Component{ - {user_id===targetuserid&&user_type!="学生"?this.sendTopics()}>发送:""} - {types==="personal"?user_id===targetuserid&&user_type!="学生"?this.deletecheckBoxValues()}>删除:"":""} + {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) + &&this.sendTopics()}>发送} + {types==="personal"?((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) + &&this.deletecheckBoxValues()}>删除:""}

:""} @@ -471,10 +483,11 @@ class InfosTopics extends Component{
- {user_type!="学生"?:""} + {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) + &&} - 55?item.name:""} className="ml10 fl mt3 font-16 color-dark maxwidth900" href={ category==="normal"?`/banks/normal/${item.id}?tab=0`: category==="group"?`/banks/group/${item.id}?tab=0`: category==="poll"?`/banks/poll/${item.id}`: @@ -505,8 +518,8 @@ class InfosTopics extends Component{

- {types==="personal"?user_id===targetuserid&&user_type!="学生"? - 编辑 - :"":""} - {types==="personal"&&item.is_public===false?user_id===targetuserid&&user_type!="学生"?this.openTopics(item.id)}>设为公开:"":""} + :""} + {types==="personal"&&item.is_public===false?((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) + &&this.openTopics(item.id)}>设为公开:""}
diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css index c038fd4b8..0801e46e2 100644 --- a/public/react/src/modules/user/usersInfo/usersInfo.css +++ b/public/react/src/modules/user/usersInfo/usersInfo.css @@ -341,7 +341,7 @@ .pd1323{ padding: 10px 6px 25px 40px; - cursor: pointer; + /*cursor: pointer;*/ } .pd1323:hover { box-shadow: 0px 2px 6px rgba(51,51,51,0.09);