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

Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

Browse Source
dev_oauth
杨树明 6 years ago
parent 251f2a0bfa e41dbea3e0
commit 7985bd3896
8 changed files with 136 additions and 39 deletions
Show Stats Download Patch File Download Diff File

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

@ -19,6 +19,7 @@ import Trialapplicationysl from './modules/login/Trialapplicationysl';
import Trialapplicationreview from './modules/user/Trialapplicationreview';
import Addcourses from "./modules/courses/coursesPublic/Addcourses";
import AccountProfile from "./modules/user/AccountProfile";
import Certifiedprofessional from "./modules/modals/Certifiedprofessional"
import Trialapplication from './modules/login/Trialapplication'
import NotFoundPage from './NotFoundPage'
@ -305,7 +306,7 @@ class App extends Component {
<Trialapplicationreview {...this.props} {...this.state}></Trialapplicationreview>
<Addcourses {...this.props} {...this.state}/>
<AccountProfile {...this.props} {...this.state}/>
{/*<Certifiedprofessional {...this.props} {...this.state}/>*/}
<Router>
<Switch>

BIN
public/react/src/images/cert/shimingrenzheng.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
public/react/src/images/cert/zhiyerenzheng.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

12
public/react/src/modules/courses/coursesPublic/Addcourses.js
Unescape View File

@ -214,6 +214,10 @@ class Addcourses extends Component{
}
).then((response) => {
if(response === undefined){
this.setState({
// Addcoursestype:false,
isSpin:false
});
return
}
if(response.data.status===0){
@ -269,14 +273,16 @@ class Addcourses extends Component{
// })
}
this.setState({
this.setState({
Addcoursestype:false,
isSpin:false
})
});
}).catch((error) => {
console.log(error)
this.setState({
Addcoursestype:false,
isSpin:false
})
});
})
// if(value===0){

28
public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
Unescape View File

@ -2033,7 +2033,7 @@ class Studentshavecompletedthelist extends Component {
page:1,
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
}
// notlimiteds = () => {
// this.setState({
@ -2160,7 +2160,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
} else if (checkedValues.length === data.length) {
if (this.state.loadingstate === false) {
this.setState({
@ -2177,7 +2177,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
} else {
// console.log(checkedValues);
if (this.state.loadingstate === false) {
@ -2195,7 +2195,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
}
}
@ -2218,7 +2218,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, undefined, this.state.searchtext, 1, this.state.limit)
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, undefined, this.state.searchtext, 1, this.state.limit)
}
funtaskstatustwo = (checkedValues, data) => {
@ -2240,7 +2240,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
} else if (checkedValues.length === data.length) {
if (this.state.loadingstate === false) {
this.setState({
@ -2257,7 +2257,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
} else {
// console.log(checkedValues);
if (this.state.loadingstate === false) {
@ -2278,7 +2278,7 @@ class Studentshavecompletedthelist extends Component {
}
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
this.props.setcourse_groupysls(checkedValues)
}
@ -2299,7 +2299,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
}
};
//搜索学生按钮输入 老师
@ -2316,7 +2316,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, value, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, value, 1, this.state.limit);
// this.Startsorting(this.state.order,this.state.checkedValuesine,this.state.checkedValuesineinfo,value);
// console.log(value)
@ -2353,6 +2353,8 @@ class Studentshavecompletedthelist extends Component {
//排序
funordersy = (e) => {
console.log(this.state.course_groupyslstwo);
debugger
if (e === "end_at") {
// 时间
// 时间排序是从小到大
@ -2367,7 +2369,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page,this.state.limit)
this.Searchdatasys(e, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page,this.state.limit)
}
if (e === "score") {
@ -2385,7 +2387,7 @@ class Studentshavecompletedthelist extends Component {
}
this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
this.Searchdatasys(e, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
}
if (e === "student_id") {
@ -2402,7 +2404,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
this.Searchdatasys(e, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
}
}
setExerciseReviewAndAnswer = () => {

87
public/react/src/modules/modals/Certifiedprofessional.js
Unescape View File

@ -1,6 +1,9 @@
import React, { Component } from 'react';
import { Modal} from 'antd';
import axios from 'axios';
import shimingrenzheng from '../../../src/images/cert/shimingrenzheng.png';
import zhiyerenzheng from '../../../src/images/cert/zhiyerenzheng.png';
import './certfed.css';
//认证职业
class Certifiedprofessional extends Component {
@ -21,23 +24,23 @@ class Certifiedprofessional extends Component {
axios.interceptors.response.use((response) => {
if (response != undefined)
if (response && response.data.status === -1) {
if(response.data.message==="该课堂要求成员完成实名认证"){
this.setState({
mydisplay:true,
occupation:1,
})
if(response.data.message==="该课堂要求成员完成实名认证"){
this.setState({
mydisplay:true,
occupation:1,
})
}else if(response.data.message==="该课堂要求成员完成职业认证"){
this.setState({
mydisplay:true,
occupation:2,
})
}else if(response.data.message==="该课堂要求成员完成实名和职业认证"){
this.setState({
mydisplay:true,
occupation:3,
})
}
}else if(response.data.message==="该课堂要求成员完成职业认证"){
this.setState({
mydisplay:true,
occupation:2,
})
}else if(response.data.message==="该课堂要求成员完成实名和职业认证"){
this.setState({
mydisplay:true,
occupation:3,
})
}
}
return response;
}, (error) => {
@ -52,7 +55,7 @@ class Certifiedprofessional extends Component {
};
setDownload=()=>{
window.location.href="/account/certification"
}
@ -60,7 +63,8 @@ class Certifiedprofessional extends Component {
render() {
// console.log("加入金品课堂2");
// console.log(this.props);
return(
let{occupation} =this.state;
return(
<Modal
keyboard={false}
closable={false}
@ -70,12 +74,51 @@ class Certifiedprofessional extends Component {
centered={true}
visible={this.state.mydisplay}
width="600px"
heigth="307px"
>
<div className="educouddiv">
<div className={"tabeltext-alignleft"}><p style={{fontSize: "16px",marginTop:"46px"}}>请在完成条件后重试</p></div>
<div className="clearfix edu-txt-center" style={{marginTop:"98px"}}>
<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>确认</a>
<div className={"tabeltext-alignleft fontsizecoirlysl"}><p style={{fontSize: "16px"}}>请在完成条件后重试</p></div>
{
occupation=== 3?
<div className="yslcentercerlfed edu-txt-center mt30" >
<div className="mr55 imgysldivone">
<img className="yslimgwidthte"
src={shimingrenzheng}
/>
<span className="fontsizecoirlysltwo mt15">未实名认证</span>
</div>
<div className="imgysldivone">
<img className="yslimgwidthte"
src={zhiyerenzheng}
/>
<span className="fontsizecoirlysltwo mt15">未职业认证</span>
</div>
</div>
:occupation=== 2?
<div className="yslcentercerlfed edu-txt-center mt30" >
<div className="imgysldivone">
<img className="yslimgwidthte"
src={zhiyerenzheng}
/>
<span className="fontsizecoirlysltwo mt15">未职业认证</span>
</div>
</div>
:
<div className="yslcentercerlfed edu-txt-center mt30" >
<div className=" imgysldivone">
<img className="yslimgwidthte"
src={shimingrenzheng}
/>
<span className="fontsizecoirlysltwo mt15">未实名认证</span>
</div>
</div>
}
<div className="clearfix edu-txt-center mt28">
<a className="task-btn mr60 w90" onClick={()=>this.modalCancel()}>取消</a>
<a className="task-btn task-btn-orange w90" onClick={()=>this.setDownload()}>立即认证</a>
</div>
</div>
</Modal>

44
public/react/src/modules/modals/certfed.css
Unescape View File

@ -0,0 +1,44 @@
.yslcenter
{
display: flex;
justify-content:center;
display: flex;
flex-direction:column;
}
.yslcentercerlfed
{ display: flex;
justify-content:center;
display: flex;
flex-direction:row;
}
.fontsizecoirlysl{
color: #333333;
font-size: 16px;
}
.fontsizecoirlysltwo{
font-size: 14px;
color: #979797;
}
.imgysldivone{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.yslimgwidthte{
width: 40px;
height: 37px;
}
.mr55{
margin-right: 55px;
}
.mt28{
margin-top: 28px;
}
.w90{
width: 90px;
}
.mr60{
margin-right: 60px;
}

1
public/react/src/modules/user/usersInfo/video/VideoUploadList.js
Unescape View File

@ -70,6 +70,7 @@ function VideoUploadList (props) {
&& file.name.indexOf('.webm') == -1
) {
showNotification(`不支持的视频格式`)
clearInput()
return;
}
if (file.size > 200 * 1024 * 1024) {

Write Preview
Loading…
Cancel
Save