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

Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

Browse Source 
# Conflicts:
#	public/react/src/search/SearchPage.js
dev_forum
hjm 5 years ago
parent cfddbc2899 055f000f67
commit 07853ba374
20 changed files with 200 additions and 114 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/App.js
Unescape View File

@ -15,6 +15,7 @@ import '@icedesign/base/index.scss';
import LoginDialog from './modules/login/LoginDialog' import LoginDialog from './modules/login/LoginDialog'
import Notcompletedysl from './modules/user/Notcompletedysl' import Notcompletedysl from './modules/user/Notcompletedysl'
import Trialapplicationysl from './modules/login/Trialapplicationysl'
import Trialapplication from './modules/login/Trialapplication' import Trialapplication from './modules/login/Trialapplication'
import NotFoundPage from './NotFoundPage' import NotFoundPage from './NotFoundPage'
@ -266,6 +267,7 @@ class App extends Component {
<MuiThemeProvider theme={theme}> <MuiThemeProvider theme={theme}>
<LoginDialog {...this.props} {...this.state}></LoginDialog> <LoginDialog {...this.props} {...this.state}></LoginDialog>
<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl> <Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
<Trialapplicationysl {...this.props} {...this.state}></Trialapplicationysl>
{/*{*/} {/*{*/}
{/* isRender === true?*/} {/* isRender === true?*/}
{/* <LoginDialog></LoginDialog> : ""*/} {/* <LoginDialog></LoginDialog> : ""*/}

26
public/react/src/AppConfig.js
Unescape View File

@ -13,21 +13,13 @@ function locationurl(list){
if (window.location.port === "3007") { if (window.location.port === "3007") {
} else { } else {
if(list===402){
SetAppModel(402)
}else if(list===407){
}else{
window.location.replace(list) window.location.replace(list)
}
} }
} }
// TODO 开发期多个身份切换 // TODO 开发期多个身份切换
const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' : const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin' window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
window._debugType = debugType; window._debugType = debugType;
export function initAxiosInterceptors(props) { export function initAxiosInterceptors(props) {
@ -153,16 +145,16 @@ export function initAxiosInterceptors(props) {
locationurl('/500'); locationurl('/500');
} }
if (response.data.status === 402) { // if (response.data.status === 402) {
console.log(response.data.status); // console.log(response.data.status);
console.log(response.data); // console.log(response.data);
// locationurl(402); // // locationurl(402);
} // }
if (response.data.status === 401) { if (response.data.status === 401) {
return config; return config;
} }
// if (response.data.status === 407) { // if (response.data.status === 407) {
// 在app js 中解决 Trialapplication // 在app js 中解决 Trialapplication
// // </Trialapplication> // // </Trialapplication>

22
public/react/src/modules/courses/coursesPublic/ShixunModal.js
Unescape View File

@ -146,12 +146,22 @@ class ShixunModal extends Component{
} }
savecouseShixunModal=()=>{ savecouseShixunModal=()=>{
this.setState({ this.setState({
hometypepvisible:true hometypepvisible:true
}) })
let {coursesId,patheditarry,datas}=this.props; let {coursesId,patheditarry,datas}=this.props;
let{category_id}=this.state; if(patheditarry.length===0){
this.setState({
shixunmodelchke:true,
chekicmessage:"请先选择实训",
hometypepvisible:false
})
return
}
if (this.props.chooseShixun) { if (this.props.chooseShixun) {
this.props.chooseShixun(patheditarry) this.props.chooseShixun(patheditarry)
this.setState({ this.setState({
@ -159,15 +169,7 @@ class ShixunModal extends Component{
}) })
return; return;
} }
if(patheditarry.length===0){
this.setState({
shixunmodelchke:true,
chekicmessage:"请先选择实训",
hometypepvisible:false
})
return
}
let url="/courses/"+coursesId+"/homework_commons/create_shixun_homework.json"; let url="/courses/"+coursesId+"/homework_commons/create_shixun_homework.json";
axios.post(url, { axios.post(url, {
category_id:this.props.category_id===null||this.props.category_id===undefined?undefined:parseInt(this.props.category_id), category_id:this.props.category_id===null||this.props.category_id===undefined?undefined:parseInt(this.props.category_id),
@ -378,7 +380,7 @@ class ShixunModal extends Component{
</div> </div>
</div> </div>
</Spin> </Spin>
<span className={this.state.shixunmodelchke===true?"none":"color-red"}>{this.state.chekicmessage}</span> <span className={this.state.shixunmodelchke===true?"color-red":"none"}>{this.state.chekicmessage}</span>
<div className="mt20 marginauto clearfix edu-txt-center"> <div className="mt20 marginauto clearfix edu-txt-center">
<a className="pop_close task-btn mr30 margin-tp26" onClick={this.hidecouseShixunModal}>取消</a> <a className="pop_close task-btn mr30 margin-tp26" onClick={this.hidecouseShixunModal}>取消</a>
<a className="task-btn task-btn-orange margin-tp26" id="submit_send_shixun" onClick={this.savecouseShixunModal}>确定</a> <a className="task-btn task-btn-orange margin-tp26" id="submit_send_shixun" onClick={this.savecouseShixunModal}>确定</a>

8
public/react/src/modules/courses/new/CoursesNew.js
Unescape View File

@ -257,7 +257,13 @@ class CoursesNew extends Component {
} }
goback = () => { goback = () => {
window.history.go(-1)
if(this.props.match.params.coursesId===undefined){
this.props.history.push("/courses");
}else{
this.props.history.push(`/courses/${this.props.match.params.coursesId}`);
}
// window.history.go(-1)
} }
onCheckAllChange = (e) => { onCheckAllChange = (e) => {

51
public/react/src/modules/courses/shixunHomework/Challenges.css
Unescape View File

@ -1,24 +1,29 @@
.editormd-html-preview, .editormd-preview-container { .editormd-html-preview, .editormd-preview-container {
width: 95% !important; width: 95% !important;
} }
.Finish_button{ .Finish_button{
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
margin-top: -8px; margin-top: -8px;
} }
.startbtnModal .ant-modal-content{ .startbtnModal .ant-modal-content{
background: transparent; background: transparent;
box-shadow: 0 4px 12px transparent; box-shadow: 0 4px 12px transparent;
} }
.startbtnModal .ant-modal-content .ant-modal-body .ant-spin-spinning{ .startbtnModal .ant-modal-content .ant-modal-body .ant-spin-spinning{
margin-left: 45%; margin-left: 45%;
} }
.color05101a{ .color05101a{
color:#05101a; color:#05101a;
} }
.mtf3{ .mtf3{
margin-top: -3px; margin-top: -3px;
}
.ysltable{
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap
} }

42
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -24,6 +24,7 @@ import moment from 'moment';
import '../css/members.css' import '../css/members.css'
import '../css/busyWork.css' import '../css/busyWork.css'
import '../poll/pollStyle.css' import '../poll/pollStyle.css'
import './Challenges.css'
import {getImageUrl} from 'educoder'; import {getImageUrl} from 'educoder';
import TraineetraininginformationModal from "./TraineetraininginformationModal"; import TraineetraininginformationModal from "./TraineetraininginformationModal";
import DownloadMessageysl from '../../modals/DownloadMessageysl'; import DownloadMessageysl from '../../modals/DownloadMessageysl';
@ -182,7 +183,7 @@ class Listofworksstudentone extends Component {
className:'font-14', className:'font-14',
render: (text, record) => ( render: (text, record) => (
<span> <span>
<span style={{ <span className="ysltable" style={{
"color": '#9A9A9A', "color": '#9A9A9A',
"text-align": "center" "text-align": "center"
}}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</span> }}>{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}</span>
@ -418,7 +419,7 @@ class Listofworksstudentone extends Component {
align: 'center', align: 'center',
className:'font-14', className:'font-14',
render: (text, record) => ( render: (text, record) => (
<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span> <span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
) )
}, },
{ {
@ -680,7 +681,7 @@ class Listofworksstudentone extends Component {
align: 'center', align: 'center',
className:'font-14', className:'font-14',
render: (text, record) => ( render: (text, record) => (
<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span> <span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
) )
}, },
{ {
@ -899,9 +900,23 @@ class Listofworksstudentone extends Component {
}, },
], ],
} }
// console.log("902");
console.log("902");
console.log(this.props);
} }
componentDidCatch(error, info){
console.log("-----------------------------905错误信息");
console.log(error);
console.log(info);
}
componentWillReceiveProps(nextProps) {
console.log("+++++++++913");
console.log("+++++++++915");
console.log("+++++++++916");
console.log(nextProps);
}
componentDidMount() { componentDidMount() {
console.log("componentDidMount"); console.log("componentDidMount");
if(this.props.isAdmin() === true){ if(this.props.isAdmin() === true){
@ -954,7 +969,6 @@ class Listofworksstudentone extends Component {
// console.log("951"); // console.log("951");
// console.log(result); // console.log(result);
// debugger // debugger
if (result.status === 200) {
this.setState({ this.setState({
teacherdata: result.data, teacherdata: result.data,
task_status: result.data.task_status, task_status: result.data.task_status,
@ -976,7 +990,6 @@ class Listofworksstudentone extends Component {
this.seacthdatas(result.data, result.data.student_works); this.seacthdatas(result.data, result.data.student_works);
} }
}
}).catch((error) => { }).catch((error) => {
console.log(error); console.log(error);
}) })
@ -1008,7 +1021,7 @@ class Listofworksstudentone extends Component {
limit: limit, limit: limit,
} }
axios.post(urll, data).then((result) => { axios.post(urll, data).then((result) => {
if (result.status === 200) { if (result) {
// console.log("学生未截至未公开的作品列表") // console.log("学生未截至未公开的作品列表")
// console.log(JSON.stringify(result)) // console.log(JSON.stringify(result))
this.setState({ this.setState({
@ -1268,7 +1281,7 @@ class Listofworksstudentone extends Component {
// console.log(JSON.stringify(this.props.user)) // console.log(JSON.stringify(this.props.user))
var url = `/student_works/${userids}/shixun_work.json`; var url = `/student_works/${userids}/shixun_work.json`;
axios.get(url).then((result) => { axios.get(url).then((result) => {
if (result.status === 200) { if (result) {
// console.log("Listofworksstudentone.js") // console.log("Listofworksstudentone.js")
// console.log(JSON.stringify(result)) // console.log(JSON.stringify(result))
let datalist = []; let datalist = [];
@ -1484,7 +1497,6 @@ class Listofworksstudentone extends Component {
limit:20, limit:20,
} }
axios.post(urll, data).then((result) => { axios.post(urll, data).then((result) => {
debugger
if (result) { if (result) {
// console.log(url) // console.log(url)
// console.log("作品列表6789077") // console.log("作品列表6789077")
@ -1916,7 +1928,7 @@ class Listofworksstudentone extends Component {
// console.log(JSON.stringify(this.props.user)) // console.log(JSON.stringify(this.props.user))
var url = `/student_works/${userids}/shixun_work.json`; var url = `/student_works/${userids}/shixun_work.json`;
axios.get(url).then((result) => { axios.get(url).then((result) => {
if (result.status === 200) { if (result) {
// console.log("TraineetraininginformationModal.js") // console.log("TraineetraininginformationModal.js")
// console.log(JSON.stringify(result)) // console.log(JSON.stringify(result))
let datalist = []; let datalist = [];
@ -2033,7 +2045,7 @@ class Listofworksstudentone extends Component {
group_ids: course_groupslist, group_ids: course_groupslist,
end_time:endtime, end_time:endtime,
}).then((result) => { }).then((result) => {
if (result.status === 200) { if (result) {
if (result.data.status === 0) { if (result.data.status === 0) {
notification.open({ notification.open({
message: "提示", message: "提示",
@ -2337,7 +2349,7 @@ class Listofworksstudentone extends Component {
(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTimet}> (this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
计算成绩 计算成绩
</div>:""): </div>:""):
teacherdata&&teacherdata.homework_status[0]!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
(this.props.isNotMember()===false?<div className={"computeTimes font-13"}> (this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
计算成绩 计算成绩
</div>:"") </div>:"")
@ -2456,7 +2468,7 @@ class Listofworksstudentone extends Component {
<div className="mh650 edu-back-white"> <div className="mh650 edu-back-white">
<div className="edu-tab-con-box clearfix edu-txt-center"> <div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/> <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb30">没有数据可以显示！</p> <p className="edu-nodata-p mb30">没有数据可以显示.！</p>
</div> </div>
</div> </div>
@ -2628,7 +2640,7 @@ class Listofworksstudentone extends Component {
</div> </div>
:"") :"")
: :
(teacherdata&&teacherdata.homework_status[0]!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": (teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
this.props.isNotMember()===false? this.props.isNotMember()===false?
<div className={"computeTimes font-13"}> <div className={"computeTimes font-13"}>
计算成绩 计算成绩
@ -2793,7 +2805,7 @@ class Listofworksstudentone extends Component {
(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}> (this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
计算成绩 计算成绩
</div>:""): </div>:""):
teacherdata&&teacherdata.homework_status[0]!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
(this.props.isNotMember()===false?<div className={"computeTimes font-13"}> (this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
计算成绩 计算成绩
</div>:"") </div>:"")

2
public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
Unescape View File

@ -24,7 +24,7 @@ class ShixunHomeworkPage extends Component {
super(props); super(props);
// this.answerMdRef = React.createRef(); // this.answerMdRef = React.createRef();
this.state = { this.state = {
tab: ["0"], tab: 0,
jobsettingsdata: undefined, jobsettingsdata: undefined,
teacherdata: undefined, teacherdata: undefined,
code_review: false, code_review: false,

16
public/react/src/modules/home/shixunsHome.js
Unescape View File

@ -361,7 +361,7 @@ class ShixunsHome extends Component {
<img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" /> <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} /> <img src={'images/'+item.image_url} />
<span className="task-hide rankName">{item.name}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
) )
@ -375,7 +375,7 @@ class ShixunsHome extends Component {
<img src={getImageUrl("images/educoder/huangguan.png")} className="huangguan" /> <img src={getImageUrl("images/educoder/huangguan.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} /> <img src={'images/'+item.image_url} />
<span className="task-hide rankName">{item.name}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
) )
@ -389,7 +389,7 @@ class ShixunsHome extends Component {
<img src={getImageUrl("images/educoder/huangguan-three.png")} className="huangguan" /> <img src={getImageUrl("images/educoder/huangguan-three.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} /> <img src={'images/'+item.image_url} />
<span className="task-hide rankName">{item.name}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
) )
@ -405,7 +405,7 @@ class ShixunsHome extends Component {
<li key={key}> <li key={key}>
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url}/> <img src={'images/'+item.image_url}/>
<span className="task-hide rankName">{item.name}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
) )
@ -437,7 +437,7 @@ class ShixunsHome extends Component {
<img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" /> <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} /> <img src={'images/'+item.image_url} />
<span className="task-hide rankName">{item.name}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
) )
@ -451,7 +451,7 @@ class ShixunsHome extends Component {
<img src={getImageUrl("images/educoder/huangguan.png")} className="huangguan" /> <img src={getImageUrl("images/educoder/huangguan.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} /> <img src={'images/'+item.image_url} />
<span className="task-hide rankName">{item.name}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
) )
@ -465,7 +465,7 @@ class ShixunsHome extends Component {
<img src={getImageUrl("images/educoder/huangguan-three.png")} className="huangguan" /> <img src={getImageUrl("images/educoder/huangguan-three.png")} className="huangguan" />
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url} /> <img src={'images/'+item.image_url} />
<span className="task-hide rankName">{item.name}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
) )
@ -481,7 +481,7 @@ class ShixunsHome extends Component {
<li key={key}> <li key={key}>
<a href={"/users/"+item.login} className="color-dark"> <a href={"/users/"+item.login} className="color-dark">
<img src={'images/'+item.image_url}/> <img src={'images/'+item.image_url}/>
<span className="task-hide rankName">{item.name}</span> <span className="task-hide rankName">{item.username}</span>
</a> </a>
</li> </li>
) )

50
public/react/src/modules/login/Trialapplicationysl.js
Unescape View File

@ -30,7 +30,7 @@ class Trialapplicationysl extends Component {
Phonenumberisnotco: undefined, Phonenumberisnotco: undefined,
Phonenumberisnotcobool: false, Phonenumberisnotcobool: false,
readonlyInput: true, readonlyInput: true,
user_phone_binded: props.user_phone_binded, user_phone_binded: undefined,
showTrial: false, showTrial: false,
user: undefined, user: undefined,
borredss:"bor-reds", borredss:"bor-reds",
@ -42,37 +42,51 @@ class Trialapplicationysl extends Component {
} }
Cancel = () => { Cancel = () => {
this.props.Cancel() // this.props.Cancel()
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
// console.log("46"); // console.log("46");
// console.log(nextProps); // console.log(nextProps);
// console.log(this.props); // console.log(this.props);
if (nextProps.user != this.props.user) { // if (nextProps.user != this.props.user) {
// console.log("50"); // // console.log("50");
// console.log(nextProps.user); // // console.log(nextProps.user);
if (nextProps.user !== undefined) { // if (nextProps.user !== undefined) {
// console.log("53"); // // console.log("53");
// console.log(nextProps.user); // // console.log(nextProps.user);
this.setState({ // this.setState({
user_phone_binded: nextProps.user.user_phone_binded, // user_phone_binded: nextProps.user.user_phone_binded,
}) // })
} // }
//
//
} // }
} }
getipthon=()=>{
// console.log("Trialapplicationysl");
// console.log("70");
let url = `/users/get_user_info.json`
axios.get(url).then((result)=> {
console.log(result);
if(result){
this.setState({
user_phone_binded:result.data.user_phone_binded,
})
}
}).catch((error)=>{
console.log(error)
})
}
//初始化数据 //初始化数据
componentDidMount() { componentDidMount() {
// console.log("53"); // console.log("53");
// //
// console.log(this.props.isRenders); // console.log(this.props.isRenders);
this.getipthon();
if (this.props.isRenders != undefined) { if (this.props.isRenders != undefined) {
this.setState({ this.setState({
isRenders: this.props.isRenders isRenders: this.props.isRenders
@ -88,9 +102,11 @@ class Trialapplicationysl extends Component {
axios.interceptors.response.use((response) => { axios.interceptors.response.use((response) => {
if (response != undefined) if (response != undefined)
if (response && response.data.status === 407) { if (response && response.data.status === 407) {
this.getipthon();
this.setState({ this.setState({
isRenders: true isRenders: true
}) })
} }
return response; return response;
}, (error) => { }, (error) => {

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

@ -562,7 +562,13 @@ submittojoinclass=(value)=>{
cancelModulationModels = () => { cancelModulationModels = () => {
this.setState({isRenders: false}) this.setState({isRenders: false})
} }
inputjoinclassvalue=(e)=>{
this.setState({
tojoinclasstitle:e.target.value
})
}
render() { render() {
const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。 const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
const {match ,} = this.props; const {match ,} = this.props;
@ -609,6 +615,7 @@ submittojoinclass=(value)=>{
// rolearr:["",""], // rolearr:["",""],
// console.log("618"); // console.log("618");
// console.log(user_phone_binded); // console.log(user_phone_binded);
return ( return (
<div className="newHeader" id="nHeader"> <div className="newHeader" id="nHeader">
@ -629,7 +636,7 @@ submittojoinclass=(value)=>{
{/* />*/} {/* />*/}
{/* :""*/} {/* :""*/}
{/*}*/} {/*}*/}
<Trialapplicationysl {...this.state} {...this.props} Cancel={() => this.cancelModulationModels()} ></Trialapplicationysl> {/*<Trialapplicationysl {...this.state} {...this.props} Cancel={() => this.cancelModulationModels()} ></Trialapplicationysl>*/}
<div className="educontent clearfix"> <div className="educontent clearfix">
{/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/} {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
<a href="/"> <a href="/">
@ -676,9 +683,14 @@ submittojoinclass=(value)=>{
</li> </li>
{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/} {/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a></li> <li className="">
<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>
<img className="roundedRectangles"
src={require('./roundedRectangle.png')}
/>
</li>
<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.moop_cases_url}>教学案例</a></li> <li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.moop_cases_url}>教学案例</a></li>
<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.crowdsourcing_url}>众包社区</a></li> <li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.crowdsourcing_url}>众包创新</a></li>
<li className={`${activeForums === true ? 'active' : ''}`}><a href={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</a></li> <li className={`${activeForums === true ? 'active' : ''}`}><a href={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</a></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'}}
@ -710,7 +722,7 @@ submittojoinclass=(value)=>{
// onSearch={value => console.log(value)} // onSearch={value => console.log(value)}
onPressEnter={this.onKeywordSearchKeyDown} onPressEnter={this.onKeywordSearchKeyDown}
style={{ width: 295 }} style={{ width: 300 }}
/> />
</div> </div>
@ -736,11 +748,11 @@ submittojoinclass=(value)=>{
<%= 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"> <span className="font-15 fr mt17 ml20">
<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"> </span> :user.login===""?<span className="font-15 fr mt17 ml20">
<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>
@ -773,7 +785,7 @@ submittojoinclass=(value)=>{
</div> </div>
} }
{/*href="https://www.educoder.net/login"*/} {/*href="https://www.educoder.net/login"*/}
{ user===undefined?"":user.login===""?"":<div className="fr head-right"> <div className="fr head-right ">
{ loadHeader()} { loadHeader()}
<a id="search-open" className="fl mr30 headIcon"> <a id="search-open" className="fl mr30 headIcon">
{/*"/images/educoder/icon/search.svg" {/*"/images/educoder/icon/search.svg"
@ -861,7 +873,7 @@ submittojoinclass=(value)=>{
</div> </div>
</div> </div>
<div className="fl mr30 edu-menu-panel headIcon"> <div className="fl mr30 edu-menu-panel headIcon">
{ user===undefined?"":user.login===""?"": <a { user===undefined?"":user.login===""?"": <a
href={this.props.Headertop===undefined?"":this.props.Headertop.message_url} href={this.props.Headertop===undefined?"":this.props.Headertop.message_url}
style={{position:'relative'}} style={{position:'relative'}}
@ -904,7 +916,7 @@ submittojoinclass=(value)=>{
</div> </div>
</Modal> </Modal>
</div>} </div>
</div> </div>
</div> </div>

19
public/react/src/modules/tpm/TPMBanner.js
Unescape View File

@ -39,7 +39,7 @@ class TPMBanner extends Component {
this.state={ this.state={
Forkvisible: false, Forkvisible: false,
Senttothetype:false, Senttothetype:false,
Senttothevcalue:1, Senttothevcalue:undefined,
courses_count:1, courses_count:1,
course_list:[], course_list:[],
pagenum:1, pagenum:1,
@ -62,6 +62,7 @@ class TPMBanner extends Component {
isIE:false, isIE:false,
Forkvisibletype: false, Forkvisibletype: false,
isSpin:false, isSpin:false,
Senttothevcaluetype:false
} }
} }
@ -233,12 +234,21 @@ class TPMBanner extends Component {
}); });
} }
sendeSenttothevcalue=()=>{ sendeSenttothevcalue=()=>{
let {Senttothevcalue}=this.state; let {Senttothevcalue}=this.state;
if(Senttothevcalue===undefined){
this.setState({
Senttothevcaluetype:true
})
return
}
let id = this.props.match.params.shixunId; let id = this.props.match.params.shixunId;
let url="/shixuns/" + id +"/send_to_course.json"; let url="/shixuns/" + id +"/send_to_course.json";
axios.post(url,{ axios.post(url,{
course_id:Senttothevcalue course_id:Senttothevcalue
}).then((response) => { }).then((response) => {
this.props.showSnackbar(response.data.message); this.props.showSnackbar(response.data.message);
this.setState({ this.setState({
Senttothetype:false, Senttothetype:false,
@ -466,6 +476,7 @@ class TPMBanner extends Component {
shixunsreplace, shixunsreplace,
hidestartshixunsreplacevalue, hidestartshixunsreplacevalue,
Forkvisibletype, Forkvisibletype,
Senttothevcaluetype,
isIE} = this.state; isIE} = this.state;
let {shixunsDetails, shixunId, star_info, star_infos} = this.props; let {shixunsDetails, shixunId, star_info, star_infos} = this.props;
let challengeBtnTipText = ''; let challengeBtnTipText = '';
@ -839,7 +850,7 @@ class TPMBanner extends Component {
/> />
</div> </div>
<div id="search_course_list" className={courses_count > 12?"cdefault mb20":"cdefault mb50"}> <div id="search_course_list" className={courses_count > 12?"cdefault ":"cdefault "}>
<div className="clearfix mb5 edu-bg-light-blue edu-h315"> <div className="clearfix mb5 edu-bg-light-blue edu-h315">
<ul> <ul>
<RadioGroup onChange={this.onChangeSenttothevcalue} value={Senttothevcalue}> <RadioGroup onChange={this.onChangeSenttothevcalue} value={Senttothevcalue}>
@ -855,8 +866,8 @@ class TPMBanner extends Component {
</ul> </ul>
</div> </div>
</div> </div>
{this.state.Senttothevcaluetype===true?<div className={"color-red"}>请选择你要发送的课堂</div>:""}
<div className="mt40 marginauto"> <div className="mt10 marginauto">
<Pagination size="small" style={{display: courses_count > 12 ? "block" : "none"}} <Pagination size="small" style={{display: courses_count > 12 ? "block" : "none"}}
showQuickJumper defaultCurrent={1} current={pages} pageSize={12} showQuickJumper defaultCurrent={1} current={pages} pageSize={12}
total={courses_count} onChange={this.onChangesendeSenttothe}/> total={courses_count} onChange={this.onChangesendeSenttothe}/>

6
public/react/src/modules/tpm/TPMIndex.css
Unescape View File

@ -191,4 +191,10 @@ body>.-task-title {
.HeaderSearch .ant-input-search .ant-input-suffix{ .HeaderSearch .ant-input-search .ant-input-suffix{
background: transparent !important; background: transparent !important;
}
.roundedRectangles{
position: absolute;
top: 10px;
right: -22px;
} }

BIN
public/react/src/modules/tpm/roundedRectangle.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 720 B

6
public/react/src/modules/user/FindPasswordComponent.js
Unescape View File

@ -505,7 +505,7 @@ class LoginRegisterComponent extends Component {
// height: 346px; // height: 346px;
return ( return (
<div className="login_register_content" style={{height: "520px"}}> <div className="login_register_content" style={{height: "470px"}}>
<ReadPassword <ReadPassword
modalsType={this.state.modalsType} modalsType={this.state.modalsType}
StudyMakeMoney={()=>this.StudyMakeMoney()} StudyMakeMoney={()=>this.StudyMakeMoney()}
@ -537,8 +537,8 @@ class LoginRegisterComponent extends Component {
`}</style> `}</style>
<div className="login_section"> <div className="login_sectionysl">
<div className="section_header font-18" style={{color:"#05101A"}}> <div className="section_header font-18" style={{color:"#05101A",marginTop:"10px"}}>
找回密码 找回密码
</div> </div>
<div style={{width: '340px'}}> <div style={{width: '340px'}}>

3
public/react/src/modules/user/LoginRegisterComponent.js
Unescape View File

@ -205,6 +205,9 @@ class LoginRegisterComponent extends Component {
//是否验证通过 //是否验证通过
dragOkCallback = () => { dragOkCallback = () => {
console.log(this.state.logins); console.log(this.state.logins);
this.setState({
Phonenumberisnotcosytdhk:undefined,
})
this.Emailphonenumberverification(this.state.logins, 2) this.Emailphonenumberverification(this.state.logins, 2)
} }

6
public/react/src/modules/user/common.css
Unescape View File

@ -32,6 +32,12 @@
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
} }
.login_sectionysl{
width: 100%;
display:flex;
align-items: center;
flex-direction: column;
}
.loginInput { .loginInput {
width: 100%; width: 100%;
margin-bottom: 16px; margin-bottom: 16px;

16
public/react/src/modules/user/usersInfo/Infos.js
Unescape View File

@ -225,24 +225,32 @@ class Infos extends Component{
<div className="inline"> <div className="inline">
<div className="fl headtab"> <div className="fl headtab">
<span>{is_current ? "我":"TA"}的经验值</span> <span>{is_current ? "我":"TA"}的经验值</span>
<a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_experience`}>{data && data.experience}</a> <a
// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_experience`}
>{data && data.experience}</a>
</div> </div>
<em className="v-h-line fl"></em> <em className="v-h-line fl"></em>
<div className="fl headtab"> <div className="fl headtab">
<span>{is_current ? "我":"TA"}的金币</span> <span>{is_current ? "我":"TA"}的金币</span>
<a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_grade`} id="user_code">{data && data.grade}</a> <a
// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_grade`}
id="user_code">{data && data.grade}</a>
</div> </div>
<div className="headphoto mt14"> <div className="headphoto mt14">
<img alt="头像" id="user_avatar_show" nhname="avatar_image" src={data && `${getImageUrl('images/'+data.avatar_url)}`}/> <img alt="头像" id="user_avatar_show" nhname="avatar_image" src={data && `${getImageUrl('images/'+data.avatar_url)}`}/>
</div> </div>
<div className="fl headtab"> <div className="fl headtab">
<span>{is_current ? "我":"TA"}的粉丝</span> <span>{is_current ? "我":"TA"}的粉丝</span>
<a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_fanslist`} id="user_h_fan_count">{data && data.fan_count}</a> <a
// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_fanslist`}
id="user_h_fan_count">{data && data.fan_count}</a>
</div> </div>
<em className="v-h-line fl"></em> <em className="v-h-line fl"></em>
<div className="fl headtab"> <div className="fl headtab">
<span>{is_current ? "我":"TA"}的关注</span> <span>{is_current ? "我":"TA"}的关注</span>
<a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_watchlist`}>{data && data.follow_count}</a> <a
// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_watchlist`}
>{data && data.follow_count}</a>
</div> </div>
<span className="clearfix"></span> <span className="clearfix"></span>
<span className="myName">{data && data.name}</span> <span className="myName">{data && data.name}</span>

2
public/react/src/modules/user/usersInfo/InfosProject.js
Unescape View File

@ -84,7 +84,7 @@ class InfosProject extends Component{
// 进入项目 // 进入项目
turnToCourses=(url,flag)=>{ turnToCourses=(url,flag)=>{
if(flag){ if(flag){
this.props.history.push(url); window.location.href=url;
} }
} }

2
public/react/src/search/SearchPage.js
Unescape View File

@ -305,8 +305,8 @@ class SearchPage extends Component{
<i className="iconfont icon-chengyuan ziticor"></i> <i className="iconfont icon-chengyuan ziticor"></i>
<span> <span>
学习人数:<span className="ml10 ziticor">{item.study_count===undefined?0:item.study_count}</span></span></span> */} 学习人数:<span className="ml10 ziticor">{item.study_count===undefined?0:item.study_count}</span></span></span> */}
</div>
</div>
</div> </div>
</div> </div>

5
public/react/src/search/searchc.css
Unescape View File

@ -126,4 +126,9 @@
.ziticor{ .ziticor{
color: #777777; color: #777777;
font-size: 13px; font-size: 13px;
}
.foohter{
margin-top: 20px;
display: flex;
flex-direction:row;
} }
Write Preview
Loading…
Cancel
Save