m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

课堂加入

Browse Source
dev_aliyun2
harry 5 years ago
parent 273b40f1a0
commit 5dcfad2d72
6 changed files with 308 additions and 227 deletions
Show Stats Download Patch File Download Diff File

46
public/react/src/common/mediator.js
Unescape View File

@ -0,0 +1,46 @@
function Mediator(obj) {
const channels = {}
const mediator = {
subscribe: function (channel, cb) {
if (!channels[channel]) {
channels[channel] = []
}
channels[channel].push(cb)
return this.unsubscribe.bind(null, channel, cb)
},
unsubscribe: function (channel, cb) {
let rs = channels[channel]
let index = -1
if (rs) {
for (let i = 0; i < rs.length; i++) {
if (rs[i].name === cb.name) {
index = i
break
}
}
if (index >= 0) {
channels[channel].splice(index, 1)
return true
}
}
return false
},
publish: function (channel) {
if (!channels[channel]) {
return false
}
const args = Array.prototype.slice.call(arguments, 1)
channels[channel].forEach(subscription => {
subscription.apply(null, args)
})
return this
},
}
return obj ? Object.assign(obj, mediator) : mediator
}
const mediator = new Mediator()
export default mediator

37
public/react/src/modules/courses/coursesHome/CoursesHome.js
Unescape View File

@ -1,11 +1,14 @@
import React, { Component } from 'react'; import React, { Component, Fragment } from 'react';
import { getImageUrl } from 'educoder'; import { getImageUrl } from 'educoder';
import CoursesHomeCard from "./CoursesHomeCard.js" import CoursesHomeCard from "./CoursesHomeCard.js"
import axios from 'axios'; import axios from 'axios';
import { Input, Pagination } from 'antd'; import { Pagination } from 'antd';
import LoadingSpin from '../../../common/LoadingSpin'; import LoadingSpin from '../../../common/LoadingSpin';
import UpgradeModals from '../../modals/UpgradeModals'; import UpgradeModals from '../../modals/UpgradeModals';
import './css/CoursesHome.css'; import './css/CoursesHome.css';
import '../../tpm/shixuns/shixun-keyword-list.scss';
import btnNew from './btn-new.png'
import btnJoin from './btn-join.png'
class CoursesHome extends Component { class CoursesHome extends Component {
constructor(props) { constructor(props) {
@ -51,7 +54,7 @@ class CoursesHome extends Component {
} }
componentDidMount() { componentDidMount() {
document.title = "翻转课堂"; document.title = "教学课堂";
const upsystem = `/users/system_update.json`; const upsystem = `/users/system_update.json`;
axios.get(upsystem).then((response) => { axios.get(upsystem).then((response) => {
let updata = response.data; let updata = response.data;
@ -116,7 +119,9 @@ class CoursesHome extends Component {
} }
render() { render() {
let { order, search, page, coursesHomelist } = this.state; const { order, page, coursesHomelist } = this.state;
const { user, tojoinclass } = this.props
console.log(tojoinclass, '--------------s')
return ( return (
<div> <div>
{this.state.updata === undefined ? "" : <UpgradeModals {this.state.updata === undefined ? "" : <UpgradeModals
@ -125,7 +130,9 @@ class CoursesHome extends Component {
<div className="newMain clearfix"> <div className="newMain clearfix">
<style> <style>
{ {
` ` ::-webkit-scrollbar {
width: 0px !important;
}
.courses-head{ .courses-head{
width: 100%; width: 100%;
height: 300px; height: 300px;
@ -145,13 +152,19 @@ class CoursesHome extends Component {
</div> </div>
</div> </div>
<div className="mt20 educontent mb20 clearfix"> <div className="wrapper">
<a className={order == "created_at" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} <div className="educontent search-keyword-container" style={{ padding: '20px 0 0 0' }}>
onClick={() => this.changeStatus("created_at")}>最新</a> <div className="btn-groups">
<a className={order == "visits" ? "fl mr20 font-16 bestChoose active" : "fl mr20 font-16 bestChoose"} <a id='new' className={order === 'created_at' ? 'active' : ''} onClick={() => this.changeStatus("created_at")} title='最新'>最新</a>
onClick={() => this.changeStatus("visits")}>最热</a> <a id='hot' className={order === 'visits' ? 'active' : ''} onClick={() => this.changeStatus("visits")} title='最热'>最热</a>
{this.props.user && this.props.user.user_identity === "学生" ? "" : <span className={"fr font-16 bestChoose color-blue"} onClick={(url) => this.getUser("/courses/new")}>+新建翻转课堂</span>} </div>
</div>
{user && user.user_identity !== '学生' ?
<Fragment>
<a className="btn-new" style={{ top: '67px' }} onClick={() => { this.getUser("/courses/new") }} > <img src={btnNew} width={40} alt="创建教学课堂" /> </a>
<a className="btn-join" style={{ top: '123px' }} onClick={() => { window._header_componentHandler.tojoinclass() }} > <img src={btnJoin} width={40} alt="加入教学课堂" /> </a>
</Fragment> : null
}
</div> </div>
{coursesHomelist === undefined ? <LoadingSpin /> : <CoursesHomeCard {...this.props} {...this.state} {coursesHomelist === undefined ? <LoadingSpin /> : <CoursesHomeCard {...this.props} {...this.state}

BIN
public/react/src/modules/courses/coursesHome/btn-join.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
public/react/src/modules/courses/coursesHome/btn-new.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

442
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -2,7 +2,9 @@ import React, { Component } from 'react';
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import AccountProfile from "../user/AccountProfile"; import AccountProfile from "../user/AccountProfile";
import Certifiedprofessional from "../../modules/modals/Certifiedprofessional" import Certifiedprofessional from "../../modules/modals/Certifiedprofessional"
import { getImageUrl } from 'educoder' import { getImageUrl } from 'educoder'
import axios from 'axios'; import axios from 'axios';
import { Modal, Radio, Input, message, notification } from 'antd'; import { Modal, Radio, Input, message, notification } from 'antd';
@ -100,9 +102,6 @@ class NewHeader extends Component {
} }
} }
componentDidUpdate = (prevProps) => {
}
openNotification = (messge) => { openNotification = (messge) => {
notification.open({ notification.open({
message: "提示", message: "提示",
@ -115,6 +114,9 @@ class NewHeader extends Component {
this.setState({ this.setState({
user: newProps.user user: newProps.user
}) })
if (newProps.Headertop != undefined) {
old_url = newProps.Headertop.old_url
}
} }
getCookie = (key) => { getCookie = (key) => {
@ -343,6 +345,14 @@ class NewHeader extends Component {
}) })
return return
} }
// }else if(value===0){
// if(tojoinclasstitle.length<5){
// this.setState({
// code_notice:true
// })
// return
// }
// }
if (tojoinclasstitle === "" || tojoinclasstitle === undefined) { if (tojoinclasstitle === "" || tojoinclasstitle === undefined) {
this.setState({ this.setState({
code_notice: true code_notice: true
@ -410,7 +420,6 @@ class NewHeader extends Component {
} }
this.hidetojoinclass() this.hidetojoinclass()
} }
// 关闭 // 关闭
cancelModulationModels = () => { cancelModulationModels = () => {
this.setState({ isRenders: false }) this.setState({ isRenders: false })
@ -568,6 +577,13 @@ class NewHeader extends Component {
document.head.appendChild(link); document.head.appendChild(link);
} }
getAppdata = () => {
try {
var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
// console.log("NewHeaderNewHeaderNewHeader");
// console.log(chromesettingArray);
// console.log(chromesettingresponseArray);
handleVisibleChanges = (boll) => { handleVisibleChanges = (boll) => {
this.setState({ this.setState({
@ -750,69 +766,69 @@ class NewHeader extends Component {
} }
// console.log(mygetHelmetapi2); // console.log(mygetHelmetapi2);
// console.log("NewHeadermygetHelmetapi123123123123"); // console.log("NewHeadermygetHelmetapi123123123123");
let shixuntype=false; let shixuntype = false;
let pathstype=false; let pathstype = false;
let coursestypes=false; let coursestypes = false;
if(this.props&&this.props.mygetHelmetapi!=null){ if (this.props && this.props.mygetHelmetapi != null) {
let shixun="/shixuns"; let shixun = "/shixuns";
let paths="/paths"; let paths = "/paths";
let courses="/courses"; let courses = "/courses";
this.props.mygetHelmetapi.navbar.map((item,key)=>{ this.props.mygetHelmetapi.navbar.map((item, key) => {
var reg = RegExp(item.link); var reg = RegExp(item.link);
if(shixun.match(reg)){ if (shixun.match(reg)) {
if(item.hidden===true){ if (item.hidden === true) {
shixuntype=true shixuntype = true
} }
} }
if(paths.match(reg)){ if (paths.match(reg)) {
if(item.hidden===true){ if (item.hidden === true) {
pathstype=true pathstype = true
} }
} }
if(courses.match(reg)){ if (courses.match(reg)) {
if(item.hidden===true){ if (item.hidden === true) {
coursestypes=true coursestypes = true
} }
} }
}) })
} }
const contents = ( const contents = (
<div className="questiontypes" style={{ <div className="questiontypes" style={{
width:'93px', width: '93px',
height:'80px', height: '80px',
}}> }}>
<Link to={'/question'} className={"popovertests"} ><p className="questiontype">试题库</p></Link> <Link to={'/question'} className={"popovertests"} ><p className="questiontype">试题库</p></Link>
<p className="questiontypeheng"></p> <p className="questiontypeheng"></p>
<Link to={'/paperlibrary'} className={"popovertests"} ><p className="questiontype">试卷库</p></Link> <Link to={'/paperlibrary'} className={"popovertests"} ><p className="questiontype">试卷库</p></Link>
</div> </div>
); );
// console.log("头部"); // console.log("头部");
// console.log(this.props); // console.log(this.props);
//判断平台身份 //判断平台身份
let Periofters=false; let Periofters = false;
if(this.props){ if (this.props) {
if(this.props.current_user){ if (this.props.current_user) {
if(this.props.current_user.admin){ if (this.props.current_user.admin) {
Periofters=true; Periofters = true;
} }
else if(this.props.current_user.business){ else if (this.props.current_user.business) {
Periofters=true; Periofters = true;
} }
else if(this.props.current_user.is_teacher){ else if (this.props.current_user.is_teacher) {
Periofters=true; Periofters = true;
}else if(this.props.current_user.user_identity !=="学生") { } else if (this.props.current_user.user_identity !== "学生") {
Periofters=true; Periofters = true;
} }
} }
} }
return ( return (
<div className="newHeaders" id="nHeader" > <div className="newHeaders" id="nHeader" >
<style>{ <style>{
@ -917,117 +933,117 @@ class NewHeader extends Component {
padding:0px !important; padding:0px !important;
} }
` `
} }
</style> </style>
{/*{*/} {/*{*/}
{/* Periofters===true?*/} {/* Periofters===true?*/}
{/* <li className={`pr questionbanks`} >*/} {/* <li className={`pr questionbanks`} >*/}
{/* <Popover className="queyppors" id={"yslpopovers"} placement="bottom" content={contents} trigger="click" >*/} {/* <Popover className="queyppors" id={"yslpopovers"} placement="bottom" content={contents} trigger="click" >*/}
{/* <div className=" sortinxdirection mr10">*/} {/* <div className=" sortinxdirection mr10">*/}
{/* <div style={{*/} {/* <div style={{*/}
{/* color:"#fff"*/} {/* color:"#fff"*/}
{/* }}>*/} {/* }}>*/}
{/* 题库*/} {/* 题库*/}
{/* </div>*/} {/* </div>*/}
{/* </div>*/} {/* </div>*/}
{/* </Popover>*/} {/* </Popover>*/}
{/* </li>*/} {/* </li>*/}
{/* :""*/} {/* :""*/}
{/*}*/} {/*}*/}
<li <li
style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth === null ? 'none' : 'block'}} style={{ display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth === null ? 'none' : 'block' }}
><a href={this.props.Headertop === undefined ? "" : this.props.Headertop.auth}>工程认证</a></li> ><a href={this.props.Headertop === undefined ? "" : this.props.Headertop.auth}>工程认证</a></li>
<li className="fl edu-menu-panel careershover " <li className="fl edu-menu-panel careershover "
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}> style={{ display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none' }}>
<a>职业路径</a> <a>职业路径</a>
<div <div
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}> style={{ display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none' }}>
<ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}> <ul className="edu-menu-list edu-menu-listnew " style={{ top: '60px' }}>
{this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => { {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
return( return (
<li key={key}><i className="iconfont icon-java left careersiconfont" <li key={key}><i className="iconfont icon-java left careersiconfont"
style={{color: '#000 important'}} style={{ color: '#000 important' }}
></i><a style={{width: '83%'}} ></i><a style={{ width: '83%' }}
href={item.url}>{item.name}</a></li> href={item.url}>{item.name}</a></li>
) )
}) })
} }
</ul> </ul>
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>
: :
<div className="head-nav pr" id={"head-navpre3"}> <div className="head-nav pr" id={"head-navpre3"}>
<ul id="header-nav"> <ul id="header-nav">
{/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/} {/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
{/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/} {/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
<li className={`${activePaths === true ? 'pr active' : 'pr'}`}> <li className={`${activePaths === true ? 'pr active' : 'pr'}`}>
<Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link> <Link to={this.props.Headertop === undefined ? "" : '/paths'}>实践课程</Link>
</li> </li>
{/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/} {/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
<li className={`${coursestype === true ? 'pr active' : 'pr'}`}> <li className={`${coursestype === true ? 'pr active' : 'pr'}`}>
{/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/} {/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/}
<Link to={this.props.Headertop===undefined?"":'/courses'}>教学课堂</Link> <Link to={this.props.Headertop === undefined ? "" : '/courses'}>教学课堂</Link>
</li> </li>
<li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}> <li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>
<Link to="/shixuns">实训项目</Link> <Link to="/shixuns">实训项目</Link>
{/*<img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img">*/} {/*<img src={getImageUrl("images/educoder/hot-h.png")} className="nav-img">*/}
{/*</img>*/} {/*</img>*/}
</li> </li>
<li className="fl edu-menu-panel careershover " <li className="fl edu-menu-panel careershover "
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}> style={{ display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none' }}>
<a>职业路径</a> <a>职业路径</a>
<div <div
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}> style={{ display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none' }}>
<ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}> <ul className="edu-menu-list edu-menu-listnew " style={{ top: '60px' }}>
{this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => { {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
return( return (
<li key={key}><i className="iconfont icon-java left careersiconfont" <li key={key}><i className="iconfont icon-java left careersiconfont"
style={{color: '#000 important'}} style={{ color: '#000 important' }}
></i><a style={{width: '83%'}} ></i><a style={{ width: '83%' }}
href={item.url}>{item.name}</a></li> href={item.url}>{item.name}</a></li>
) )
}) })
} }
</ul> </ul>
</div> </div>
</li> </li>
{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/} {/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
<li className={`${activeCompetitions === true ? 'pr active' : 'pr'}`}> <li className={`${activeCompetitions === true ? 'pr active' : 'pr'}`}>
<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a> <a href={this.props.Headertop === undefined ? "" : this.props.Headertop.competitions_url}>在线竞赛</a>
{/*<img className="roundedRectangles"*/} {/*<img className="roundedRectangles"*/}
{/* src={require('./roundedRectangle.png')}*/} {/* src={require('./roundedRectangle.png')}*/}
{/*/>*/} {/*/>*/}
</li> </li>
<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li> <li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>
{/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/} {/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/}
{/*<Link to={'/crowdsourcing'}>众包创新</Link>*/} {/*<Link to={'/crowdsourcing'}>众包创新</Link>*/}
{/*</li>*/} {/*</li>*/}
<li className={`${activeForums === true ? 'active' : ''}`}> <Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li> <li className={`${activeForums === true ? 'active' : ''}`}> <Link to={this.props.Headertop === undefined ? "" : this.props.Headertop.topic_url}>交流问答</Link></li>
<li <li
style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth===null? 'none' : 'block'}} style={{ display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth === null ? 'none' : 'block' }}
><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li> ><a href={this.props.Headertop === undefined ? "" : this.props.Headertop.auth}>工程认证</a></li>
</ul> </ul>
</div> </div>
} }
<style> <style>
{ {
` `
.posi-searchs{ .posi-searchs{
opacity: 1; opacity: 1;
position: absolute; position: absolute;
@ -1088,36 +1104,36 @@ class NewHeader extends Component {
<em className="vertical-line"></em> <em className="vertical-line"></em>
<%= link_to '注册', user_join_path, :className => "ml5" %> <%= link_to '注册', user_join_path, :className => "ml5" %>
</span>*/} </span>*/}
{ user===undefined? {user === undefined ?
<span className="font-15 fr mt17 ml5 mr25"> <span className="font-15 fr mt17 ml5 mr25">
<a onClick={()=>this.educoderlogin()} className="mr5 color-white">登录</a> <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
<em className="vertical-line"></em> <em className="vertical-line"></em>
<a href={"/register"} className="mr5 color-white">注册</a> <a href={"/register"} className="mr5 color-white">注册</a>
</span> :user.login===""?<span className="font-15 fr mt17 ml5 mr25"> </span> : user.login === "" ? <span className="font-15 fr mt17 ml5 mr25">
<a onClick={()=>this.educoderlogin()} className="mr5 color-white">登录</a> <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
<em className="vertical-line"></em> <em className="vertical-line"></em>
<a href={"/register"} className="mr5 color-white">注册</a> <a href={"/register"} className="mr5 color-white">注册</a>
</span>: </span> :
<div className="fr edu-menu-panel mr25" style={{height:'60px'}}> <div className="fr edu-menu-panel mr25" style={{ height: '60px' }}>
<a href={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/courses`} className="fl ml15"> <a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`} className="fl ml15">
<img alt="头像" className="radius mt13" height="34" id="nh_user_logo" name="avatar_image" <img alt="头像" className="radius mt13" height="34" id="nh_user_logo" name="avatar_image"
src={getImageUrl(`images/`+user.image_url)} width="34"> src={getImageUrl(`images/` + user.image_url)} width="34">
</img> </img>
</a> </a>
<ul className="edu-menu-list" style={{top:'60px'}}> <ul className="edu-menu-list" style={{ top: '60px' }}>
{/*<span className="bor-bottom-greyE currentName task-hide">{user.username}</span>*/} {/*<span className="bor-bottom-greyE currentName task-hide">{user.username}</span>*/}
<li><Link to={`/users/${this.props.current_user.login}/courses`}>我的个人主页</Link></li> <li><Link to={`/users/${this.props.current_user.login}/courses`}>我的个人主页</Link></li>
{coursestypes===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/courses`}>{this.props.user&&this.props.user.main_site===false?"我的课堂":"我的教学课堂"}</Link></li>} {coursestypes === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}>{this.props.user && this.props.user.main_site === false ? "我的课堂" : "我的教学课堂"}</Link></li>}
{/* p 老师 l 学生 */} {/* p 老师 l 学生 */}
{shixuntype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>} {shixuntype === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}
{pathstype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>{this.props.user&&this.props.user.main_site===false?"我的课程":"我的实践课程"}</Link></li>} {pathstype === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/paths`}>{this.props.user && this.props.user.main_site === false ? "我的课程" : "我的实践课程"}</Link></li>}
{this.props.user&&this.props.user.main_site===true?<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的开发项目</Link></li>:""} {this.props.user && this.props.user.main_site === true ? <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/projects`}>我的开发项目</Link></li> : ""}
{ Periofters === true &&<li><Link to ={`/problemset`}>我的试题库</Link></li> } {Periofters === true && <li><Link to={`/problemset`}>我的试题库</Link></li>}
{ Periofters === true &&<li><Link to ={`/paperlibrary`}>我的试卷库</Link></li> } {Periofters === true && <li><Link to={`/paperlibrary`}>我的试卷库</Link></li>}
{/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/} {/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/}
<li style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.customer_management_url===null || this.props.Headertop.customer_management_url===""? 'none' : 'block'}}> <li style={{ display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.customer_management_url === null || this.props.Headertop.customer_management_url === "" ? 'none' : 'block' }}>
<a href={this.props.Headertop === undefined ? '' : this.props.Headertop.customer_management_url}>客户管理</a> <a href={this.props.Headertop === undefined ? '' : this.props.Headertop.customer_management_url}>客户管理</a>
</li> </li>
{ {
this.props.Headertop && this.props.Headertop.college_identifier && this.props.Headertop && this.props.Headertop.college_identifier &&
<li><a href={`/colleges/${this.props.Headertop.college_identifier}/statistics`}>学院统计</a></li> <li><a href={`/colleges/${this.props.Headertop.college_identifier}/statistics`}>学院统计</a></li>
@ -1132,20 +1148,20 @@ class NewHeader extends Component {
{/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/} {/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
{/*<li><Link to={`/interest`}>兴趣页</Link></li>*/} {/*<li><Link to={`/interest`}>兴趣页</Link></li>*/}
<li className="bor-top-greyE"> <li className="bor-top-greyE">
{/*<a onClick={()=>this.educoderlogin()} >登录</a>*/} {/*<a onClick={()=>this.educoderlogin()} >登录</a>*/}
<a onClick={() => this.educoderloginysl()}>退出</a> <a onClick={() => this.educoderloginysl()}>退出</a>
</li> </li>
</ul> </ul>
</div> </div>
} }
{/*href="https://www.educoder.net/login"*/} {/*href="https://www.educoder.net/login"*/}
<div className="fr head-right"> <div className="fr head-right">
{/*{ loadHeader()}*/} {/*{ loadHeader()}*/}
{showSearchOpentype===true?"":this.props.user&&this.props.user.main_site===true?<a id="search-open" className="fl mr30 headIcon" onClick={(e)=>this.showSearchOpen(e)}> {showSearchOpentype === true ? "" : this.props.user && this.props.user.main_site === true ? <a id="search-open" className="fl mr30 headIcon" onClick={(e) => this.showSearchOpen(e)}>
{/*"/images/educoder/icon/search.svg" {/*"/images/educoder/icon/search.svg"
<img src={getImageUrl(`images/educoder/icon/search.svg`)} /> */} <img src={getImageUrl(`images/educoder/icon/search.svg`)} /> */}
<i className="iconfont icon-sousuo color-white"></i> <i className="iconfont icon-sousuo color-white"></i>
@ -1248,8 +1264,6 @@ class NewHeader extends Component {
> >
<i className="iconfont icon-xiaoxilingdang color-white"></i> <i className="iconfont icon-xiaoxilingdang color-white"></i>
<span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}> <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
{/*{this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count > 99 ? '99+'*/}
{/*: this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count}*/}
</span> </span>
</a> </a>
} }

10
public/react/src/modules/tpm/shixuns/shixun-keyword-list.scss
Unescape View File

@ -65,6 +65,14 @@
position: absolute; position: absolute;
width: 40px; width: 40px;
right: 39px; right: 39px;
top: 76px; top: 77px;
z-index: 10;
}
.btn-join {
position: absolute;
width: 40px;
right: 39px;
top: 133px;
z-index: 10; z-index: 10;
} }
Write Preview
Loading…
Cancel
Save