36 ? homework_name : ''}`}
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
index 4c5578d2c..f2b92b47d 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
@@ -481,6 +481,7 @@ render(){
course_name, homework_name,
memberNumMax, memberNumMin
} =this.state;
+ const { current_user } = this.props
let courseId=this.props.match.params.coursesId;
let workId=this.props.match.params.workId;
@@ -522,7 +523,6 @@ render(){
const moduleName = this.props.getModuleName()
const moduleCHName = this.props.getModuleName(true)
const isGroup = this.props.isGroup()
- const { current_user } = this.props;
return(
@@ -540,7 +540,7 @@ render(){
20){
this.setState({
NavmodalValuetype:true,
- NavmodalValues:"名称不能超过20个字"
+ NavmodalValues:"名称不能超过60个字"
})
return
}
diff --git a/public/react/src/modules/courses/coursesPublic/AddcoursesNav.js b/public/react/src/modules/courses/coursesPublic/AddcoursesNav.js
index 74c03808a..756ae62a6 100644
--- a/public/react/src/modules/courses/coursesPublic/AddcoursesNav.js
+++ b/public/react/src/modules/courses/coursesPublic/AddcoursesNav.js
@@ -1,74 +1,74 @@
-import React,{ Component } from "react";
-import { Modal,Checkbox,Input,Select} from "antd";
-const Option = Select.Option;
-
-class AddcoursesNav extends Component{
- constructor(props){
- super(props);
- this.state={
- StudentList_value:""
- }
- }
-
-
-
- render(){
- // let {StudentList_value}=this.state;
- // let {child}=this.props;
- //
- return(
-
-
-
-
-
- {this.props.addnametab===2?
-
- : this.props.addnametab===4?
-
- :""}
-
-
-
- )
- }
-}
-export default AddcoursesNav;
-
-
+import React,{ Component } from "react";
+import { Modal,Checkbox,Input,Select} from "antd";
+const Option = Select.Option;
+
+class AddcoursesNav extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ StudentList_value:""
+ }
+ }
+
+
+
+ render(){
+ // let {StudentList_value}=this.state;
+ // let {child}=this.props;
+ //
+ return(
+
+
+
+
+ {this.props.addnametab===2?
+
+ : this.props.addnametab===4?
+
+ :""}
+
+
+
+ )
+ }
+}
+export default AddcoursesNav;
+
+
diff --git a/public/react/src/modules/courses/coursesPublic/ModalsRename.js b/public/react/src/modules/courses/coursesPublic/ModalsRename.js
index 61d0c1cd7..1398c50ff 100644
--- a/public/react/src/modules/courses/coursesPublic/ModalsRename.js
+++ b/public/react/src/modules/courses/coursesPublic/ModalsRename.js
@@ -1,63 +1,63 @@
-import React,{ Component } from "react";
-import { Modal,Checkbox,Upload,Button,Icon,message,Input} from "antd";
-import axios from 'axios';
-
-class ModalsRename extends Component{
- constructor(props){
- super(props);
- this.state={
- name:this.props.NavmodalValue
- }
- }
-
- saveNavmoda=()=>{
- let{url}=this.props;
- let{name}=this.state;
-
- axios.post(url, {name:name}).then((result) => {
- if(result.data.status===0){
- this.props.showNotification(result.data.message);
- this.props.cannerNavmoda();
- this.props.coursupdata();
- }}
- )
- }
-
- setNavmodalValue=(e)=>{
- console.log(e.target.value)
- this.setState({
- name:e.target.value
- })
- }
-
- render(){
- return(
-
-
-
-
- )
- }
-}
+import React,{ Component } from "react";
+import { Modal,Checkbox,Upload,Button,Icon,message,Input} from "antd";
+import axios from 'axios';
+
+class ModalsRename extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ name:this.props.NavmodalValue
+ }
+ }
+
+ saveNavmoda=()=>{
+ let{url}=this.props;
+ let{name}=this.state;
+
+ axios.post(url, {name:name}).then((result) => {
+ if(result.data.status===0){
+ this.props.showNotification(result.data.message);
+ this.props.cannerNavmoda();
+ this.props.coursupdata();
+ }}
+ )
+ }
+
+ setNavmodalValue=(e)=>{
+ console.log(e.target.value)
+ this.setState({
+ name:e.target.value
+ })
+ }
+
+ render(){
+ return(
+ {this.props.Navname}名称：
-
-
-
+
+
+
+ )
+ }
+}
export default ModalsRename;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/exercise/ExerciseDisplay.js b/public/react/src/modules/courses/exercise/ExerciseDisplay.js
index 4da4768d2..bd70bece6 100644
--- a/public/react/src/modules/courses/exercise/ExerciseDisplay.js
+++ b/public/react/src/modules/courses/exercise/ExerciseDisplay.js
@@ -120,35 +120,35 @@ class ExerciseDisplay extends Component{
return {this.props.Navname}名称：
+
+
+
-
{this.isEdit ? "编辑" : "新建"}试卷 diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js index eb8143c03..cd3355082 100644 --- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js +++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js @@ -509,7 +509,7 @@ class ExerciseReviewAndAnswer extends Component{ }=this.state let isAdmin = this.props.isAdmin(); let isStudent =this.props.isStudent(); - + const { current_user } = this.props console.log(data&&data.exercise.user_name) return(
@@ -537,7 +537,7 @@ class ExerciseReviewAndAnswer extends Component{
/>
-
-
-
-
-
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index ec45b081c..b07392153 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -196,8 +196,8 @@ class Trainingjobsetting extends Component {
array.push({
course_group_id: result.data.group_settings[i].group_id,
course_group_name: result.data.group_settings[i].group_name,
- publish_time: result.data.group_settings[i].publish_time,
- end_time: result.data.group_settings[i].end_time,
+ publish_time: moment(result.data.group_settings[i].publish_time).format('YYYY-MM-DD HH:mm'),
+ end_time: moment(result.data.group_settings[i].end_time).format('YYYY-MM-DD HH:mm'),
publish_flag: "",
end_flag: "",
class_flag: "",
@@ -215,8 +215,8 @@ class Trainingjobsetting extends Component {
arrays.push({
course_group_id:result.data.group_settings[i].group_id,
course_group_name:result.data.group_settings[i].group_name,
- publish_time:result.data.group_settings[i].publish_time,
- end_time:result.data.group_settings[i].end_time,
+ publish_time:moment( result.data.group_settings[i].publish_time).format('YYYY-MM-DD HH:mm') ,
+ end_time:moment(result.data.group_settings[i].end_time ).format('YYYY-MM-DD HH:mm'),
course_choosed:0,
})
@@ -447,8 +447,8 @@ class Trainingjobsetting extends Component {
} else {
let rulesdata=this.state.rulesdata;
- // console.log("pustdate123131312321321321");
- // console.log(rulesdata);
+ console.log("pustdate123131312321321321");
+ console.log(rulesdata);
if(
rulesdata.length === 0){
this.props.showNotification(`分班发布设置不能为空`);
@@ -479,8 +479,8 @@ class Trainingjobsetting extends Component {
return;
}
- if (this.state.latededuction <= 0) {
- this.props.showNotification(`迟交扣分数不能小于等于零`);
+ if (this.state.latededuction <0) {
+ this.props.showNotification(`迟交扣分数不能小于零`);
return;
}
@@ -577,6 +577,8 @@ class Trainingjobsetting extends Component {
this.props.showNotification(`没有关卡不能更新设置`);
return;
}
+
+
if(this.state.unifiedsetting === true){
console.log("统一设置");
data = {
@@ -588,23 +590,37 @@ class Trainingjobsetting extends Component {
late_time: moment(this.state.late_time).format('YYYY-MM-DD HH:mm'), //结束时间
answer_open_evaluation: this.state.level === "满分" ? true : false, //扣分项
work_efficiency: this.state.completionefficiencyscore, //完成效率评分占比
- eff_score: this.state.completionefficiencyscore === true ? this.state.latedeductiontwo : 0,//占比分
+ eff_score: this.state.completionefficiencyscore === true ? this.state.latedeductiontwo : undefined,//占比分
shixun_evaluation: this.state.proportion === "均分比例" ? 0 : this.state.proportion === "经验值比例" ? 1 : this.state.proportion === "自定义分值" ? 2 : 0,
challenge_settings: array,
score_open: this.state.publicwork,
}
}else{
- //非统一配置
- console.log("非统一设置");
+ // //非统一配置
+ // console.log("非统一设置");
+ let rulesdata=this.state.rulesdata;
+
+ let newlist=[]
+
+ rulesdata.map((item,key)=>{
+
+ if(item.publish_time==="Invalid date"||item.end_time==="Invalid date"||item.publiend_timesh_time==="Invalid date"){
+
+ }else{
+ newlist.push(item)
+ }
+
+ })
+
data = {
unified_setting: this.state.unifiedsetting, //非统一配置
- group_settings: this.state.rulesdata,
+ group_settings: newlist,
allow_late: this.state.allowreplenishment, //补交
late_penalty: parseInt(this.state.latededuction), //迟交扣分
late_time: moment(this.state.late_time).format('YYYY-MM-DD HH:mm'), //结束时间
answer_open_evaluation: this.state.level === "满分" ? true : false, //扣分项
work_efficiency: this.state.completionefficiencyscore, //完成效率评分占比
- eff_score: this.state.completionefficiencyscore === true ? this.state.latedeductiontwo : 0,//占比分
+ eff_score: this.state.completionefficiencyscore === true ? this.state.latedeductiontwo : undefined,//占比分
shixun_evaluation: this.state.proportion === "均分比例" ? 0 : this.state.proportion === "经验值比例" ? 1 : this.state.proportion === "自定义分值" ? 2 : 0,
challenge_settings: array,
score_open: this.state.publicwork,
@@ -1710,8 +1726,8 @@ class Trainingjobsetting extends Component {
}
}
- console.log(rules)
- console.log(datas)
+ console.log(rules);
+ console.log(datas);
this.setState({
rules,
rulesdata:datas,
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index 713593100..eed3a9add 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -148,7 +148,7 @@ class EducoderLogin extends Component {
"align-items": "center",
"width": "100%"
}}>
-
+
![]()
this.gohome()} src={educodernet}/>
diff --git a/public/react/src/modules/paths/Index.js b/public/react/src/modules/paths/Index.js
index a26228ed5..a7efc43bc 100644
--- a/public/react/src/modules/paths/Index.js
+++ b/public/react/src/modules/paths/Index.js
@@ -1,52 +1,58 @@
-import React, { Component } from 'react';
-
-import { SnackbarHOC } from 'educoder';
-
-
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import Loadable from 'react-loadable';
-import Loading from '../../Loading';
-import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
-
-const PathsDetail = Loadable({
- loader: () => import('./PathDetail/PathDetailIndex'),
- loading:Loading,
-})
-const PathsNew = Loadable({
- loader: () => import('./PathNew'),
- loading:Loading,
-})
-const Statistics = Loadable({
- loader: () => import('./SchoolStatistics/Statistics'),
- loading:Loading
-})
-
-const ShixunPaths = Loadable({
- loader: () => import('./ShixunPaths'),
- loading:Loading,
-})
-
-
-class Index extends Component{
- constructor(props) {
- super(props)
- }
- render() {
- return (
-
+
-
- (
- (
-
-
- )
- }
-}
+import React, { Component } from 'react';
+
+import { SnackbarHOC } from 'educoder';
+
+
+import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
+import Loadable from 'react-loadable';
+import Loading from '../../Loading';
+import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
+
+const PathsDetail = Loadable({
+ loader: () => import('./PathDetail/PathDetailIndex'),
+ loading:Loading,
+})
+const PathsNew = Loadable({
+ loader: () => import('./PathNew'),
+ loading:Loading,
+})
+const Statistics = Loadable({
+ loader: () => import('./SchoolStatistics/Statistics'),
+ loading:Loading
+})
+
+const ShixunPaths = Loadable({
+ loader: () => import('./ShixunPaths'),
+ loading:Loading,
+})
+
+
+class Index extends Component{
+ constructor(props) {
+ super(props)
+ }
+ render() {
+ return (
+
+
+ (
+ (
+
+ (
+
+ {/*
+
+ )
+ }
+}
export default SnackbarHOC() ( TPMIndexHOC(Index) );
\ No newline at end of file
diff --git a/public/react/src/modules/paths/PathDetail/DetailCards.js b/public/react/src/modules/paths/PathDetail/DetailCards.js
index 115f7066c..fc75961ec 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCards.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCards.js
@@ -314,6 +314,7 @@ class DetailCards extends Component{
showparagraphindex
}=this.state;
const antIcon =
{
pathCardsList && pathCardsList.map((item,key)=>{
@@ -374,7 +388,7 @@ class DetailCards extends Component{
![]({getImageUrl("images/educoder/icon/charpter-white.svg")})
- {item.stage_name}
+ {item.stage_name}
{
idsum===key&&pathCardsedittype===true?'':
@@ -442,20 +456,20 @@ class DetailCards extends Component{
:
}
-
+
{key+1}-{index+1} {line.shixun_name}
{
- line.shixun_status==="暂未公开"?
+ this.props.current_user&&this.props.current_user.admin===false&&line.shixun_status==="暂未公开"?
暂未公开
:
{
showparagraphkey===key&&showparagraphindex===index?
-
+
}
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index cb0f08c0f..c15269c5a 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -2,7 +2,7 @@ import React, {Component} from 'react';
import {TPMIndexHOC} from '../TPMIndexHOC';
-import {SnackbarHOC,handleDateString} from 'educoder';
+import {SnackbarHOC} from 'educoder';
import {Input, Select, Radio, Checkbox, Modal, Icon, DatePicker,Upload,Button,message,Form,notification} from 'antd';
@@ -16,6 +16,8 @@ import './css/Newshixuns.css';
import {getUrl} from 'educoder'
+import moment from 'moment';
+
let path = getUrl("/editormd/lib/")
const $ = window.$;
@@ -28,6 +30,34 @@ const Option = Select.Option;
const RadioGroup = Radio.Group;
const confirm = Modal.confirm;
+
+
+// 处理整点 半点
+// 取传入时间往后的第一个半点
+export function handleDateStrings(dateString) {
+ if (!dateString) return dateString;
+ const ar = dateString.split(':')
+ if (ar[1] == '00' || ar[1] == '30') {
+ return dateString
+ }
+ const miniute = parseInt(ar[1]);
+ if (miniute < 30 || miniute == 60) {
+ return [ar[0], '30'].join(':')
+ }
+ if (miniute < 60) {
+ // 加一个小时
+ const tempStr = [ar[0], '00'].join(':');
+ const format = "YYYY-MM-DD HH:mm";
+ const _moment = moment(tempStr, format)
+ _moment.add(1, 'hours')
+ return _moment.format(format)
+ }
+
+ return dateString
+}
+
+
+
// 恢复数据
function md_rec_data(k, mdu, id, editor) {
if (window.sessionStorage.getItem(k + mdu) !== null) {
@@ -713,7 +743,7 @@ class Newshixuns extends Component {
onChangeTimePicker = (value, dateString) => {
this.setState({
- TimePickervalue: handleDateString(dateString)
+ TimePickervalue: handleDateStrings(dateString)
})
}
// 附件相关 START
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index f5d57ae21..65e95319e 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -293,11 +293,12 @@ class Challenges extends Component {
- {item.stage_name}
+ {item.stage_name}
{
idsum===key&&pathCardsedittype===true?'':
@@ -442,20 +456,20 @@ class DetailCards extends Component{
:
}
-
+
{key+1}-{index+1} {line.shixun_name}
{
- line.shixun_status==="暂未公开"?
+ this.props.current_user&&this.props.current_user.admin===false&&line.shixun_status==="暂未公开"?
查看详情
- this.startgameid(line.identifier)} className="btn_auto user_bluebg_btn fl" id="shixun_operation" >开始实战
+ {line.shixun_status==="暂未公开"?"":this.startgameid(line.identifier)} className="btn_auto user_bluebg_btn fl" id="shixun_operation" >开始实战}
:""
}
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
index 340505655..912302cb8 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
@@ -402,7 +402,7 @@ class DetailCardsEditAndAdd extends Component{
*
+
}
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index ed1249f0d..f6af871dd 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -31,6 +31,30 @@ const Option = Select.Option;
const RadioGroup = Radio.Group;
+// 处理整点 半点
+// 取传入时间往后的第一个半点
+export function handleDateStrings(dateString) {
+ if (!dateString) return dateString;
+ const ar = dateString.split(':')
+ if (ar[1] == '00' || ar[1] == '30') {
+ return dateString
+ }
+ const miniute = parseInt(ar[1]);
+ if (miniute < 30 || miniute == 60) {
+ return [ar[0], '30'].join(':')
+ }
+ if (miniute < 60) {
+ // 加一个小时
+ const tempStr = [ar[0], '00'].join(':');
+ const format = "YYYY-MM-DD HH:mm";
+ const _moment = moment(tempStr, format)
+ _moment.add(1, 'hours')
+ return _moment.format(format)
+ }
+
+ return dateString
+}
+
// 恢复数据
function md_rec_data(k,mdu,id, editor){
if(window.sessionStorage.getItem(k+mdu) !== null){
@@ -1120,7 +1144,7 @@ export default class TPMsettings extends Component {
}
onChangeTimePicker =(value, dateString)=> {
this.setState({
- opening_time:dateString
+ opening_time:moment(handleDateStrings(dateString))
})
}
diff --git a/public/react/src/modules/tpm/component/TPMRightSection.js b/public/react/src/modules/tpm/component/TPMRightSection.js
index 8479acd76..a3a7e9820 100644
--- a/public/react/src/modules/tpm/component/TPMRightSection.js
+++ b/public/react/src/modules/tpm/component/TPMRightSection.js
@@ -117,36 +117,6 @@ class TPMRightSection extends Component {
}
-
-
+
名称不能为空
必填项
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
index 1bf137016..f91cf0e96 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
@@ -435,7 +435,7 @@ class DetailCardsEditAndEdit extends Component{
*
+
{item.stage_name}
-
-
-
-
- ![]({getImageUrl("images/educoder/icon/movedown.svg")})
-
+
+
+
+
+
+
+
+
- ![]({getImageUrl("images/educoder/icon/moveup.svg")})
+
+
+
+
+
+
+
+
+
-
+
名称不能为空
必填项
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsTemp.js b/public/react/src/modules/paths/PathDetail/DetailCardsTemp.js
index 4acc28a48..5150d14da 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsTemp.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsTemp.js
@@ -1,5 +1,6 @@
import React, { Component } from 'react';
import {getImageUrl} from 'educoder';
+import { Tooltip } from 'antd';
import '../../paths/ShixunPaths.css';
import DetailCardsEditAndAdd from './DetailCardsEditAndAdd';
import axios from 'axios';
@@ -85,16 +86,26 @@ class DetailCards extends Component{
+
{item.stage_name}
-
-
-
-
-
-
+
+
+
+
+
+ {item.stage_description}
diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js index 50c5c2680..09425df92 100644 --- a/public/react/src/modules/paths/PathDetail/DetailTop.js +++ b/public/react/src/modules/paths/PathDetail/DetailTop.js @@ -1,238 +1,241 @@ -import React,{ Component } from "react"; -import { Modal,Radio,Input,Tooltip } from "antd"; -import { BrowserRouter as Router, Route, Link } from "react-router-dom"; -import SendPanel from "./sendPanel.js"; -import { getImageUrl } from 'educoder'; -import axios from 'axios'; -import Modals from '../../modals/Modals'; -import './DetailTop.css'; - -const Search = Input.Search; -const RadioGroup = Radio.Group; -class DetailTop extends Component{ - constructor(props){ - super(props) - this.state={ - cardsModalcancel:this.cardsModalcancel, - cardsModalsave:this.cardsModalsave, - Modalstype:false, - Modalstopval:"", - Modalsbottomval:'', - loadtype:false, - deletepathtype:false, - cardsModalsavetype:false - } - } - - allow_deletepath=()=>{ - this.setState({ - Modalstype:true, - Modalstopval:"是否删除路径?", - deletepathtype:true - }) - } - - applyissuePath=()=>{ - this.setState({ - Modalstype:true, - Modalstopval:"发布申请已提交，请等待管理员的审核", - Modalsbottomval:"• 我们将在1-2个工作日内完成审核", - loadtype:true - }) - } - - cancelissuePath=()=>{ - let pathId=this.props.match.params.pathId; - let url ="/paths/"+pathId+"/cancel_publish.json"; - axios.get(url).then((result)=>{ - if(result.status===200){ - if(result.data.status===0){ - - }else if(result.data.status===1){ - window.location.href = "/paths/" + result.data.subject_id - } - } - }).catch((error)=>{ - console.log(error); - }) - } - - reovkissuePath=()=>{ - - this.setState({ - Modalstype:true, - Modalstopval:"是否确认撤销发布", - Modalsbottomval:"确认后，回退到编辑状态", - cardsModalsavetype:true, - }) - - } - reovkissuePaths=()=>{ - let pathId=this.props.match.params.pathId; - let url ="/paths/"+pathId+"/cancel_has_publish.json"; - axios.get(url).then((result)=>{ - if(result.status===200){ - if(result.data.status===0){ - - }else if(result.data.status===1){ - this.setState({ - cardsModalsavetype:false, - loadtype:false, - deletepathtype:false - }) - window.location.href = "/paths/" + result.data.subject_id - } - } - }).catch((error)=>{ - console.log(error); - }) - } - - cardsModalcancel=()=>{ - this.setState({ - Modalstype:false, - Modalsbottomval:'', - loadtype:false, - deletepathtype:false - }) - } - - cardsModalsave=()=>{ - let {loadtype,deletepathtype}=this.state; - - //删除路径 - if(deletepathtype===true){ - let pathid=this.props.match.params.pathId; - const deleteUrl = `/paths/`+pathid+`.json`; - axios.delete(deleteUrl).then((response) => { - const status = response.data.status - if (status === 1) { - window.location.href = "/paths"; - } - }).catch((error) => { - console.log(error) - }) - } - - //申请发布 - if(loadtype===true){ - - let pathid=this.props.match.params.pathId; - let url ="/paths/"+pathid+"/publish.json"; - axios.get(url).then((result)=>{ - if(result.status===200){ - if(result.data.status===0){ - this.setState({ - Modalstype:true, - Modalstopval: result.data.message, - }) - }else if(result.data.status===1){ - window.location.reload(); - } - } - }).catch((error)=>{ - console.log(error); - }) - - } - this.setState({ - Modalstype:false, - Modalsbottomval:'' - }) - } - - render(){ - let{detailInfoList}=this.props; - let{Modalstype,Modalstopval,cardsModalcancel,cardsModalsave,Modalsbottomval,cardsModalsavetype,loadtype}=this.state; - const radioStyle = { - display: 'block', - height: '30px', - lineHeight: '30px', - }; - - return( -
-
-
- {
- detailInfoList &&
-
- )
- }
-}
+import React,{ Component } from "react";
+import { Modal,Radio,Input,Tooltip } from "antd";
+import { BrowserRouter as Router, Route, Link } from "react-router-dom";
+import SendPanel from "./sendPanel.js";
+import { getImageUrl } from 'educoder';
+import axios from 'axios';
+import Modals from '../../modals/Modals';
+import './DetailTop.css';
+
+const Search = Input.Search;
+const RadioGroup = Radio.Group;
+class DetailTop extends Component{
+ constructor(props){
+ super(props)
+ this.state={
+ cardsModalcancel:this.cardsModalcancel,
+ cardsModalsave:this.cardsModalsave,
+ Modalstype:false,
+ Modalstopval:"",
+ Modalsbottomval:'',
+ loadtype:false,
+ deletepathtype:false,
+ cardsModalsavetype:false
+ }
+ }
+
+ allow_deletepath=()=>{
+ this.setState({
+ Modalstype:true,
+ Modalstopval:"是否删除路径?",
+ deletepathtype:true
+ })
+ }
+
+ applyissuePath=()=>{
+ this.setState({
+ Modalstype:true,
+ Modalstopval:"发布申请已提交，请等待管理员的审核",
+ Modalsbottomval:"• 我们将在1-2个工作日内完成审核",
+ loadtype:true
+ })
+ }
+
+ cancelissuePath=()=>{
+ let pathId=this.props.match.params.pathId;
+ let url ="/paths/"+pathId+"/cancel_publish.json";
+ axios.get(url).then((result)=>{
+ if(result.status===200){
+ if(result.data.status===0){
+
+ }else if(result.data.status===1){
+ window.location.href = "/paths/" + result.data.subject_id
+ }
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+
+ reovkissuePath=()=>{
+
+ this.setState({
+ Modalstype:true,
+ Modalstopval:"是否确认撤销发布",
+ Modalsbottomval:"确认后，回退到编辑状态",
+ cardsModalsavetype:true,
+ })
+
+ }
+ reovkissuePaths=()=>{
+ let pathId=this.props.match.params.pathId;
+ let url ="/paths/"+pathId+"/cancel_has_publish.json";
+ axios.get(url).then((result)=>{
+ if(result.status===200){
+ if(result.data.status===0){
+
+ }else if(result.data.status===1){
+ this.setState({
+ cardsModalsavetype:false,
+ loadtype:false,
+ deletepathtype:false
+ })
+ window.location.href = "/paths/" + result.data.subject_id
+ }
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+
+ cardsModalcancel=()=>{
+ this.setState({
+ Modalstype:false,
+ Modalsbottomval:'',
+ loadtype:false,
+ deletepathtype:false
+ })
+ }
+
+ cardsModalsave=()=>{
+ let {loadtype,deletepathtype}=this.state;
+
+ //删除路径
+ if(deletepathtype===true){
+ let pathid=this.props.match.params.pathId;
+ const deleteUrl = `/paths/`+pathid+`.json`;
+ axios.delete(deleteUrl).then((response) => {
+ const status = response.data.status
+ if (status === 1) {
+ window.location.href = "/paths";
+ }
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+
+ //申请发布
+ if(loadtype===true){
+
+ let pathid=this.props.match.params.pathId;
+ let url ="/paths/"+pathid+"/publish.json";
+ axios.get(url).then((result)=>{
+ if(result.status===200){
+ if(result.data.status===0){
+ this.setState({
+ Modalstype:true,
+ Modalstopval: result.data.message,
+ })
+ }else if(result.data.status===1){
+ window.location.reload();
+ }
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+
+ }
+ this.setState({
+ Modalstype:false,
+ Modalsbottomval:''
+ })
+ }
+
+ render(){
+ let{detailInfoList}=this.props;
+ let{Modalstype,Modalstopval,cardsModalcancel,cardsModalsave,Modalsbottomval,cardsModalsavetype,loadtype}=this.state;
+ const radioStyle = {
+ display: 'block',
+ height: '30px',
+ lineHeight: '30px',
+ };
+
+ return(
+
-
- }
-
-
-
- {detailInfoList.name}
-
-
- {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
-
- ![]({getImageUrl("images/educoder/icon/edit.svg")})
- :""
- }
-
- {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
-
- 学习统计
- :""
- }
-
- { detailInfoList.allow_send === true &&
-
-
- :""
- }
-
- {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
-
- 学习统计
- :""
- }
-
- { detailInfoList.allow_send === true &&
-
- {
- detailInfoList &&
-
- -
- { detailInfoList.stages_count!=0 ?
- 章节{detailInfoList.stages_count} : ""} - { detailInfoList.stage_shixuns_count!=0 ?
- 实训{ detailInfoList.stage_shixuns_count} : ""} - { detailInfoList.challenge_choose_count!=0 ?
- 选择题任务{detailInfoList.challenge_choose_count} : ""} - { detailInfoList.challenges_count!=0 ?
- 实践任务{detailInfoList.challenges_count} : ""} - { detailInfoList.subject_score!=0 ?
- 经验值{detailInfoList.subject_score} : ""} - { detailInfoList.member_count!=0 ?
- 学习人数{detailInfoList.member_count} : ""} -
- {detailInfoList===undefined?"":detailInfoList.allow_delete===true?删除路径:""}
-
- {
- detailInfoList.publish_status===0&&detailInfoList.allow_statistics===true?
- 申请发布:""
- }
-
-
- {
- detailInfoList.publish_status===1 && detailInfoList.allow_statistics===true?
- 撤销申请:""
- }
-
- {
- detailInfoList.publish_status===2 && detailInfoList.allow_statistics===true?
- 撤销发布:""
- }
-
-
+
+
+ {
+ detailInfoList &&
+
+ )
+ }
+}
export default DetailTop;
\ No newline at end of file
diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
index 1731064c0..1ba1a3c13 100644
--- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
+++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
@@ -140,10 +140,13 @@ class PathDetailIndex extends Component{
let url="/paths/"+pathid+".json";
axios.get(url).then((result)=>{
if (result.data.status === 407 || result.data.status === 401) {
+ debugger
return;
}
if (result.data.status === 403) {
+ debugger
+ // window.location.href = "/403";
return;
}
@@ -165,9 +168,12 @@ class PathDetailIndex extends Component{
axios.get(url).then((result)=>{
// TODO 403 让后台返回status 403 比较好
if (result.data.status == 407 || result.data.status == 401) {
+ debugger
return;
}
if (result.data.status === 403 ) {
+ debugger
+ // window.location.href = "/403";
return;
}
@@ -337,9 +343,11 @@ class PathDetailIndex extends Component{
+
+ }
+
+
+
+ {detailInfoList.name}
+
+
+ {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
+
+
+
+
+
+ :""
+ }
+
+ {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
+
+ 学习统计
+ :""
+ }
+
+ { detailInfoList.allow_send === true &&
+
+
+
+
+ {
+ detailInfoList &&
+
+ -
+ { detailInfoList.stages_count!=0 ?
- 章节{detailInfoList.stages_count} : ""} + { detailInfoList.stage_shixuns_count!=0 ?
- 实训{ detailInfoList.stage_shixuns_count} : ""} + { detailInfoList.challenge_choose_count!=0 ?
- 选择题任务{detailInfoList.challenge_choose_count} : ""} + { detailInfoList.challenges_count!=0 ?
- 实践任务{detailInfoList.challenges_count} : ""} + { detailInfoList.subject_score!=0 ?
- 经验值{detailInfoList.subject_score} : ""} + { detailInfoList.member_count!=0 ?
- 学习人数{detailInfoList.member_count} : ""} +
+ {detailInfoList===undefined?"":detailInfoList.allow_delete===true?删除路径:""}
+
+ {
+ detailInfoList.publish_status===0&&detailInfoList.allow_statistics===true?
+ 申请发布:""
+ }
+
+
+ {
+ detailInfoList.publish_status===1 && detailInfoList.allow_statistics===true?
+ 撤销申请:""
+ }
+
+ {
+ detailInfoList.publish_status===2 && detailInfoList.allow_statistics===true?
+ 撤销发布:""
+ }
+
+
简介
{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
+
课程须知
{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
+
15&&clickdetailInfoListtype===false?"newsubscript mb9 color-grey-9 fr":"newsubscript mb9 color-grey-9 none"}
- data-tip-down="显示全部"
onClick={()=>this.clickNewsubscript(0)}
>...
+ this.clickNewsubscript(1)}>
+
-
推荐实训
-
- {
- TPMRightSectionData===undefined?"":TPMRightSectionData.recommands===undefined?"":TPMRightSectionData.recommands.map((item,key)=>{
- return(
-
-
-
- ![69?1526971094]({"/"+item.pic})
-
-
-
- )
- })
- }
-
+
推荐实训
+
+ {
+ TPMRightSectionData===undefined?"":TPMRightSectionData.recommands===undefined?"":TPMRightSectionData.recommands.map((item,key)=>{
+ return(
+
+
+
+
+
+
+
+ )
+ })
+ }
+
简介
+
+
{item.st === 0 ?
- ![]({getImageUrl("images/educoder/icon/code.svg")})
+
+
+
:
- ![]({getImageUrl("images/educoder/icon/choose.svg")})
+
+
+
}
第{key+1}关
diff --git a/public/react/src/modules/tpm/shixunchild/Propaedeutics/Propaedeu_tics.js b/public/react/src/modules/tpm/shixunchild/Propaedeutics/Propaedeu_tics.js
index a2b20415d..f40e9fa63 100644
--- a/public/react/src/modules/tpm/shixunchild/Propaedeutics/Propaedeu_tics.js
+++ b/public/react/src/modules/tpm/shixunchild/Propaedeutics/Propaedeu_tics.js
@@ -10,6 +10,8 @@ import classNames from 'classnames';
import { getImageUrl, toPath } from 'educoder';
+import { Tooltip } from 'antd';
+
import axios from 'axios';
import { CircularProgress } from 'material-ui/Progress';
@@ -76,8 +78,10 @@ class Propaedeutics extends Component {
return (
this.dragOkCallback()}
- className="ysllw100"
- >
+
+
:
""
}
{
Whethertoverify===true&&pciphone===true?
- this.dragOkCallback()}
- className="ysllw100"
- >
+
+
:
""
}
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index b27fe8cec..ec9778fc8 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -2,12 +2,13 @@ import React, {Component} from 'react';
import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
-import {getImageUrl, DragValidator,broadcastChannelPostMessage} from 'educoder';
+import {getImageUrl,broadcastChannelPostMessage} from 'educoder';
import {Tabs, Input, Checkbox, Button, notification,Menu} from 'antd';
import passopen from '../../../src/images/login/passopen.png';
import passoff from '../../../src/images/login/passoff.png';
import axios from 'axios';
-import DragValidatortwo from '../../../src/common/components/DragValidatortwo'
+import CheckInputysl1 from './CheckInputysl';
+import CheckInputysl2 from './CheckInputysl';
import './common.css'
import './commontwo.css'
const { TabPane } = Tabs;
@@ -205,7 +206,72 @@ class LoginRegisterComponent extends Component {
}
//是否验证通过
dragOkCallback = () => {
- console.log(this.state.logins);
+ this.setState({
+ Phonenumberisnotcosytdhk:undefined,
+ })
+ if (this.state.logins.length === 0) {
+ this.setState({
+ Phonenumberisnotcos:"账号不能为空",
+ Phonenumberisnotcobool: true,
+ dragOk:false,
+ Whethertoverify:this.state.Whethertoverify===true?false:true,
+ })
+ console.log("s0");
+
+ return;
+ }
+ // var telephone = $("#telephoneAdd.tianjia_phone").val();
+ var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+ // var email = $("#add_email.tianjia_email").val();
+ var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
+
+ // [1]手机号开头必须是1 [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。
+ var stringdata = undefined;
+ if (!regph.test(this.state.logins)) {
+ stringdata = "手机号格式不正确";
+ this.setState({
+ Phonenumberisnotcos: undefined,
+ Phonenumberisnotcobool: false,
+ dragOk:true,
+ })
+ console.log("s1");
+ } else {
+ this.setState({
+ Phonenumberisnotcos: undefined,
+ Phonenumberisnotcobool: false,
+ dragOk:true,
+ });
+ this.Emailphonenumberverification(this.state.logins, 2);
+ return
+ }
+
+ if (!regemail.test(this.state.logins)) {
+ if ((this.state.logins.indexOf("@") != -1) === true) {
+ stringdata = "邮箱格式不正确";
+ } else {
+ stringdata = "手机号格式不正确";
+
+ }
+ this.setState({
+ Phonenumberisnotcos: stringdata,
+ Phonenumberisnotcobool: true,
+ dragOk:false,
+ Whethertoverify:this.state.Whethertoverify===true?false:true,
+ });
+ console.log("s2");
+
+ return
+ } else {
+ console.log("s222222");
+ this.setState({
+ Phonenumberisnotcos: undefined,
+ Phonenumberisnotcobool: false,
+ dragOk:true,
+ })
+ this.Emailphonenumberverification(this.state.logins, 2);
+ return
+ }
+
this.setState({
Phonenumberisnotcosytdhk:undefined,
})
@@ -314,21 +380,28 @@ class LoginRegisterComponent extends Component {
// this.openNotification(`请同意服务协议条款`,2);
// return;
// }
+ if (this.state.logins === undefined || this.state.logins === ""||this.state.logins.length===0) {
+ this.setState({
+ Phonenumberisnotcos:"账号不能为空",
+ Phonenumberisnotcobool: true,
+ dragOk:false,
+ Whethertoverify:this.state.Whethertoverify===true?false:true,
+ })
+ return
+ }
if(this.state.pciphone===true){
if (this.state.dragOk === false) {
// this.openNotification(`请拖动滑块完成验证`,2);
this.setState({
Phonenumberisnotcosytdhk:"请拖动滑块完成验证",
+ dragOk:false,
+ Whethertoverify:this.state.Whethertoverify===true?false:true,
})
return
}
}
- if (this.state.logins === undefined || this.state.logins === ""||this.state.logins.length===0) {
- this.setState({
- Phonenumberisnotcos:"账号不能为空",
- })
- return
- } else if (this.state.codes === undefined || this.state.codes == ""||this.state.codes.length===0) {
+
+ if (this.state.codes === undefined || this.state.codes == ""||this.state.codes.length===0) {
// this.openNotification(`请输入验证码`,2);
this.setState({
Phonenumberisnotcosyzm:"验证码不能为空",
@@ -402,6 +475,7 @@ class LoginRegisterComponent extends Component {
type: 1,
}
}).then((result) => {
+
//验证有问题{"status":1,"message":"success"}
// console.log(result);
// this.setState({dragOk: true})
@@ -409,7 +483,6 @@ class LoginRegisterComponent extends Component {
if(result){
if(result.data.status===-2){
if (id === 1) {
- console.log(value.length);
if(result.data.message==="该手机号码或邮箱已被注册"){
this.setState({
Phonenumberisnotco: undefined,
@@ -423,8 +496,10 @@ class LoginRegisterComponent extends Component {
dragOk:false,
Whethertoverify:this.state.Whethertoverify===true?false:true,
})
+ console.log("s5");
+
}
- return;
+ return;
} else if (id === 2) {
this.setState({
Phonenumberisnotcos: result.data.message,
@@ -432,11 +507,12 @@ class LoginRegisterComponent extends Component {
dragOk:false,
Whethertoverify:this.state.Whethertoverify===true?false:true,
})
- return;
+ console.log("s6");
+
+ return;
}
}else {
if (id === 1) {
- console.log(value.length);
this.setState({
Phonenumberisnotco: undefined,
Phonenumberisnotcobool: false,
@@ -498,8 +574,9 @@ class LoginRegisterComponent extends Component {
//倒计时
getverificationcode = () => {
- console.log(this.state.Phonenumberisnotcobool);
- console.log(this.state.dragOk);
+ debugger
+ // console.log(this.state.Phonenumberisnotcobool);
+ // console.log(this.state.dragOk);
if(this.state.logins === undefined || this.state.logins.length===0){
this.openNotification("请输入手机号或邮箱");
return;
@@ -512,7 +589,7 @@ class LoginRegisterComponent extends Component {
})
return;
}
- if(this.state.dragOk===undefined||this.state.dragOk === false){
+ if(this.state.dragOk === false){
this.openNotification("拖动滑块验证");
return;
}
@@ -585,13 +662,118 @@ class LoginRegisterComponent extends Component {
}
//失去焦点判断
inputOnBlur = (e, id) => {
- this.isCorrectname(e.target.value, id);
+ // this.isCorrectname(e.target.value, id);
// this.Emailphonenumberverification(e.target.value, id);
+ if (e.target.value.length === 0) {
+ this.setState({
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcobool: false,
+ })
+ return;
+ }
+ // var telephone = $("#telephoneAdd.tianjia_phone").val();
+ var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+ // var email = $("#add_email.tianjia_email").val();
+ var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
+
+ // [1]手机号开头必须是1 [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。
+ var stringdata = undefined;
+ if (!regph.test(e.target.value)) {
+ stringdata = "手机号格式不正确";
+ this.setState({
+ Phonenumberisnotco: stringdata,
+ Phonenumberisnotcobool: true,
+ dragOk:false,
+ Whethertoverify:this.state.Whethertoverify===true?false:true,
+ })
+ } else {
+ this.setState({
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcobool: false,
+ })
+ return
+ }
+
+ if (!regemail.test(e.target.value)) {
+ if ((e.target.value.indexOf("@") != -1) === true) {
+ stringdata = "邮箱格式不正确";
+ } else {
+ stringdata = "手机号格式不正确";
+
+ }
+ this.setState({
+ Phonenumberisnotco: stringdata,
+ Phonenumberisnotcobool: true,
+ dragOk:false,
+ Whethertoverify:this.state.Whethertoverify===true?false:true,
+ })
+ return
+ } else {
+ this.setState({
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcobool: false,
+ })
+ this.Emailphonenumberverification(e.target.value, 1);
+ return
+ }
+ this.Emailphonenumberverification(e.target.value, 1);
}
inputOnBlurzhuche = (e, id) => {
- if(this.state.pciphone===false) {
+ if (e.target.value.length === 0) {
+ this.setState({
+ Phonenumberisnotcos: undefined,
+ Phonenumberisnotcobool: false,
+ })
+ return;
+ }
+ // var telephone = $("#telephoneAdd.tianjia_phone").val();
+ var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+ // var email = $("#add_email.tianjia_email").val();
+ var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
+
+ // [1]手机号开头必须是1 [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。
+ var stringdata = undefined;
+ if (!regph.test(e.target.value)) {
+ stringdata = "手机号格式不正确";
+ this.setState({
+ Phonenumberisnotcos: stringdata,
+ Phonenumberisnotcobool: true,
+ dragOk:false,
+ Whethertoverify:this.state.Whethertoverify===true?false:true,
+ })
+ } else {
+ this.setState({
+ Phonenumberisnotcos: undefined,
+ Phonenumberisnotcobool: false,
+
+ })
+ return
+ }
+
+ if (!regemail.test(e.target.value)) {
+ if ((e.target.value.indexOf("@") != -1) === true) {
+ stringdata = "邮箱格式不正确";
+ } else {
+ stringdata = "手机号格式不正确";
+
+ }
+ this.setState({
+ Phonenumberisnotcos: stringdata,
+ Phonenumberisnotcobool: true,
+ dragOk:false,
+ Whethertoverify:this.state.Whethertoverify===true?false:true,
+ })
+ return
+ } else {
+ this.setState({
+ Phonenumberisnotcos: undefined,
+ Phonenumberisnotcobool: false,
+
+ })
+ this.Emailphonenumberverification(e.target.value, id);
+ return
+ }
this.Emailphonenumberverification(e.target.value, id);
- }
}
//获取登入密码
passwordonChange = (e) => {
@@ -734,7 +916,7 @@ class LoginRegisterComponent extends Component {
+
+
+
+
-
+
+
{this.verifyDOM = dom}} style={{"color":this.state.clear ? "#fff" : "#252535"}}>
+
+ );
+ }
+}
+
+export default ( CheckInputysl );
\ No newline at end of file
diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index 19b5a7388..3263f7327 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -2,11 +2,11 @@ import React, {Component} from 'react';
import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
-import {getImageUrl, DragValidator} from 'educoder';
-
+import {getImageUrl} from 'educoder';
+import CheckInputysl1 from './CheckInputysl';
+import CheckInputysl2 from './CheckInputysl';
import {Tabs, Input, Checkbox, Button, notification} from 'antd';
-import DragValidatortwo from '../../../src/common/components/DragValidatortwo'
import ReadPassword from './ReadPassword';
@@ -31,7 +31,7 @@ class LoginRegisterComponent extends Component {
seconds: 60,
codes: "",
getverificationcodes: true,
- Phonenumberisnotcobool: false,
+ Phonenumberisnotcobool: true,
Phonenumberisnotco: undefined,
Phonenumberisnotcosytdhk:undefined,
Phonenumberisnotcosmmm: undefined,
@@ -94,14 +94,14 @@ class LoginRegisterComponent extends Component {
}
//倒计时
getverificationcode = () => {
-
+ debugger
if(this.state.login === undefined || this.state.login.length===0){
this.openNotification("请输入手机号或邮箱");
return;
}
//这是判断是否手机正确
- if(this.state.Phonenumberisnotcobool === true){
+ if(this.state.Phonenumberisnotcobool === false){
this.openNotification(this.state.Phonenumberisnotco);
this.setState({
Whethertoverify:this.state.Whethertoverify===true?false:true,
@@ -109,7 +109,7 @@ class LoginRegisterComponent extends Component {
return;
}
//拖动滑动验证
- if(this.state.dragOk===undefined||this.state.dragOk === false){
+ if(this.state.dragOk === false){
this.openNotification("拖动滑块验证");
return;
}
@@ -179,17 +179,19 @@ class LoginRegisterComponent extends Component {
}
//找回密码
Retrievepassword = () => {
- if (this.state.Phonenumberisnotcobool === false) {
- if (this.state.login.length === 0) {
- this.setState({
- Phonenumberisnotco:"请输入正确的邮箱或手机号",
- })
- return
- }
+ if (this.state.Phonenumberisnotcobool === false&&this.state.Phonenumberisnotco!==undefined) {
+ this.openNotification(this.state.Phonenumberisnotco);
+ this.setState({
+ Whethertoverify:this.state.Whethertoverify===true?false:true,
+ })
+ return;
}
if (this.state.login === undefined|| this.state.login.length ===0 || this.state.login === "") {
this.setState({
Phonenumberisnotco:"账号不能为空",
+ Phonenumberisnotcobool: false,
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
return
}
@@ -198,6 +200,8 @@ class LoginRegisterComponent extends Component {
// this.openNotification(`请拖动滑块完成验证`,2);
this.setState({
Phonenumberisnotcosytdhk:"请拖动滑块完成验证",
+ dragOk: false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
return
}
@@ -365,7 +369,7 @@ class LoginRegisterComponent extends Component {
if (value.length === 0) {
this.setState({
Phonenumberisnotco: undefined,
- Phonenumberisnotcobool: false,
+ Phonenumberisnotcobool: true,
})
return;
}
@@ -418,33 +422,134 @@ class LoginRegisterComponent extends Component {
if(this.state.login===""||this.state.login.length===0){
this.setState({
Phonenumberisnotco: "账号不能为空",
- Phonenumberisnotcobool: true,
+ Phonenumberisnotcobool: false,
dragOk:false,
Whethertoverify:this.state.Whethertoverify===true?false:true,
})
return
}
- this.setState({
- Phonenumberisnotcosytdhk:undefined,
- })
- this.Emailphonenumberverification(e.target.value)
+ // console.log(e.target.value.length);
+ // if (e.target.value.length === 0) {
+ // this.setState({
+ // Phonenumberisnotco: undefined,
+ // Phonenumberisnotcobool: false,
+ // })
+ // return;
+ // }
+ // var telephone = $("#telephoneAdd.tianjia_phone").val();
+ var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+ // var email = $("#add_email.tianjia_email").val();
+ var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
+
+ // [1]手机号开头必须是1 [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。
+ var stringdata = undefined;
+ if (!regph.test(e.target.value)) {
+ stringdata = "手机号格式不正确";
+ this.setState({
+ Phonenumberisnotco: stringdata,
+ Phonenumberisnotcobool: false,
+ })
+ } else {
+ this.setState({
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcobool: true,
+ })
+ return
+ }
+
+ if (!regemail.test(e.target.value)) {
+ if ((e.target.value.indexOf("@") != -1) === true) {
+ stringdata = "邮箱格式不正确";
+ } else {
+ stringdata = "手机号格式不正确";
+
+ }
+ this.setState({
+ Phonenumberisnotco: stringdata,
+ Phonenumberisnotcobool: false,
+ })
+ return
+ } else {
+ this.setState({
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcobool: true,
+ })
+ this.Emailphonenumberverification(e.target.value)
+ return
+ }
+ this.Emailphonenumberverification(e.target.value)
}
}
//是否验证通过
dragOkCallback = () => {
console.log(this.state.login);
-
+ this.setState({
+ Phonenumberisnotcosytdhk:undefined,
+ })
if (this.state.login === "" || this.state.login.length === 0) {
this.setState({
Phonenumberisnotco: "账号不能为空",
- Phonenumberisnotcobool: true,
+ Phonenumberisnotcobool: false,
+ Phonenumberisnotcosytdhk:undefined,
dragOk: false,
Whethertoverify: this.state.Whethertoverify === true ? false : true,
})
return
}
+ // var telephone = $("#telephoneAdd.tianjia_phone").val();
+ var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+ // var email = $("#add_email.tianjia_email").val();
+ var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
+
+ // [1]手机号开头必须是1 [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。
+ var stringdata = undefined;
+ if (!regph.test(this.state.login)) {
+ stringdata = "手机号格式不正确";
+ this.setState({
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcobool: true,
+ Phonenumberisnotcosytdhk:undefined,
+ dragOk: true,
+ })
+ } else {
+ this.setState({
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcobool: true,
+ Phonenumberisnotcosytdhk:undefined,
+ dragOk: true,
+
+ });
+ this.Emailphonenumberverification(this.state.login)
+
+ return
+ }
+
+ if (!regemail.test(this.state.login)) {
+ if ((this.state.login.indexOf("@") != -1) === true) {
+ stringdata = "邮箱格式不正确";
+ } else {
+ stringdata = "手机号格式不正确";
+
+ }
+ this.setState({
+ Phonenumberisnotco: stringdata,
+ Phonenumberisnotcobool: false,
+ dragOk:false,
+ Whethertoverify: this.state.Whethertoverify === true ? false : true,
+ })
+ return
+ } else {
+ this.setState({
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcobool: true,
+ dragOk: true,
+ })
+ this.Emailphonenumberverification(this.state.login)
+ return
+ }
+
this.setState({
Phonenumberisnotcosytdhk: undefined,
})
@@ -467,7 +572,7 @@ class LoginRegisterComponent extends Component {
console.log(value.length);
this.setState({
Phonenumberisnotco: result.data.message,
- Phonenumberisnotcobool: true,
+ Phonenumberisnotcobool: false,
dragOk:false,
Whethertoverify:this.state.Whethertoverify===true?false:true,
})
@@ -475,7 +580,7 @@ class LoginRegisterComponent extends Component {
}else {
this.setState({
Phonenumberisnotco: undefined,
- Phonenumberisnotcobool: false,
+ Phonenumberisnotcobool: true,
dragOk:true,
})
return;
@@ -597,24 +702,20 @@ class LoginRegisterComponent extends Component {
{
Whethertoverify===false&&pciphone===true?
- {this.bgDOM = dom}} style={{"width":this.state.width}}>
+ {this.state.clear ? "验证通过" : "拖动滑块验证"}
+ {this.handlerDOM = dom}}>
+
{
@@ -838,27 +1020,24 @@ class LoginRegisterComponent extends Component {
}
{
Whethertoverify===false&&pciphone===true?
-
+
:
""
}
+
{
pciphone===true?
diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index 1458862a1..38c8fd98c 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -274,6 +274,11 @@ class AccountBasic extends Component {
return item.name == e;
});
if (!arr[0]) {
+ if (!e) {
+ this.setState({
+ filterSchoolList: []
+ })
+ }
// 没找到学校，清空部门
this.setState({
departments: [],
@@ -464,7 +469,7 @@ class AccountBasic extends Component {
width:220px;
}
.basicForm .ant-input-suffix {
- line-height: 2.2;
+ line-height: 2.8;
background: transparent !important;
}
`}
diff --git a/public/react/src/modules/user/account/ChangeHeaderPicModal.js b/public/react/src/modules/user/account/ChangeHeaderPicModal.js
index abb3d0e12..cef643094 100644
--- a/public/react/src/modules/user/account/ChangeHeaderPicModal.js
+++ b/public/react/src/modules/user/account/ChangeHeaderPicModal.js
@@ -105,11 +105,16 @@ class ChangeHeaderPicModal extends Component{
.then((response) => {
// {"status":0,"message":"success","avatar_url":"avatars/User/15739"}
if (response.data.status == 0) {
- // this.props.getBasicInfo()
- this.props.fetchUser()
- // 头像更新后会触发AccountPage的DidUpdate，然后会调用getBasicInfo
- this.props.showNotification && this.props.showNotification("修改头像成功")
- this.setVisible(false)
+ // this.props.getBasicInfo()
+ // https://www.trustie.net/issues/22461
+ if ( this.props.current_user.image_url.indexOf('avatars/User/b') != -1
+ || this.props.current_user.image_url.indexOf('avatars/User/g') != -1 ) {
+ this.setTimeout(() => {
+ this.doAfterUpdated()
+ }, 1000)
+ } else {
+ this.doAfterUpdated();
+ }
}
})
.catch(function (error) {
@@ -117,6 +122,12 @@ class ChangeHeaderPicModal extends Component{
});
});
}
+ doAfterUpdated = () => {
+ this.props.fetchUser()
+ // 头像更新后会触发AccountPage的DidUpdate，然后会调用getBasicInfo
+ this.props.showNotification && this.props.showNotification("修改头像成功")
+ this.setVisible(false)
+ }
render(){
const { course_lists } = this.state
diff --git a/public/react/src/modules/user/secureCode.css b/public/react/src/modules/user/secureCode.css
new file mode 100644
index 000000000..e7f171711
--- /dev/null
+++ b/public/react/src/modules/user/secureCode.css
@@ -0,0 +1,42 @@
+#drag{
+ position: relative;
+ background-color: #e8e8e8;
+ min-width: 300px;
+ height: 38px;
+ line-height: 38px;
+ text-align: center;
+}
+#drag .handler{
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ width: 40px;
+ height: 38px;
+ border: 1px solid #ccc;
+ cursor: move;
+}
+.handler_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;}
+
+.handler_ok_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;}
+
+#drag .drag_bg{
+ background-color: #7ac23c;
+ height: 38px;
+ width: 0px;
+}
+#drag .drag_text{
+ position: absolute;
+ top: 0px;
+ font-size: 14px;
+ width: 100%;
+ -moz-user-select: none;
+ -webkit-user-select: none;
+ color: #fff;
+ user-select: none;
+ -o-user-select:none;
+ -ms-user-select:none;
+}
+
+/* }*/
+/*//.handler_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;}*/
+/*//.handler_ok_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;}*/
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 4006fb615..45aea81be 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -291,7 +291,7 @@ label.infolabel{display: block;float: left;width: 56px;text-align: right;margin-
.shaiTitle{display: block;padding-right: 20px;}
.shaiContent li.shaiItem.active{background-color: #4CACFF!important;color:#fff!important;}
.shaiContent li.shaiItem{padding:3px 15px;float: left;border-radius: 4px;color: #4C4C4C;cursor: pointer;margin-right: 15px;display: block}
-.shaiContent li.shaiItem:hover{background-color: #F5F5F5}
+.shaiContent li.shaiItem:hover{background-color: #4CACFF!important;color:#fff!important;}
.shaiAllItem{max-width: 1138px;}
.subshaicontent{display: none;box-sizing: border-box;position: absolute;width: 100%;top: 33px;left: 0px;background-color: #fff;box-shadow:0px 1px 4px rgba(76,76,76,0.2);padding:0px 20px;z-index: 99999;border-radius: 4px;max-height: 800px;overflow-y: auto}
.subshaicontent-part{border-bottom: 1px solid #eee;}