diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 1c9b22602..704e4995b 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1591,7 +1591,7 @@ class Listofworksstudentone extends Component {
// 设置数据
seacthdatat = (teacherdata,student_works,work_efficiency,course_group_info) => {
- debugger
+
let {page, limit} = this.state;
let datalist = [];
let columns = this.state.columns;
diff --git a/public/react/src/modules/login/LoginDialog.css b/public/react/src/modules/login/LoginDialog.css
index b36533154..34a711154 100644
--- a/public/react/src/modules/login/LoginDialog.css
+++ b/public/react/src/modules/login/LoginDialog.css
@@ -122,4 +122,8 @@
border-radius: 4px;
letter-spacing: 2px;
cursor: pointer;
+}
+.myinput{
+ display: flex;
+ justify-content: center;
}
\ No newline at end of file
diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js
index 02116ce7d..3f375eb18 100644
--- a/public/react/src/modules/login/Trialapplication.js
+++ b/public/react/src/modules/login/Trialapplication.js
@@ -7,7 +7,7 @@ import Dialog, {
DialogTitle,
} from 'material-ui/Dialog';
import axios from 'axios';
-
+import './LoginDialog.css'
import {broadcastChannelPostMessage} from 'educoder'
import {Tabs, Input, Checkbox, Button, notification, Menu} from 'antd';
diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js
index f38804810..c6458e16f 100644
--- a/public/react/src/modules/login/Trialapplicationysl.js
+++ b/public/react/src/modules/login/Trialapplicationysl.js
@@ -24,7 +24,7 @@ class Trialapplicationysl extends Component {
codes: "",
reason: "",
Phonenumberisnotcoreason: undefined,
- isRenders: false,
+ isRenders: true,
seconds: 60,
getverificationcodes: true,
Phonenumberisnotco: undefined,
@@ -44,37 +44,37 @@ class Trialapplicationysl extends Component {
Cancel = () => {
// this.props.Cancel()
}
-
- componentWillReceiveProps(nextProps) {
- // console.log("46");
- // console.log(nextProps);
- // console.log(this.props);
- // if (nextProps.user != this.props.user) {
- // // console.log("50");
- // // console.log(nextProps.user);
- // if (nextProps.user !== undefined) {
- // // console.log("53");
- // // console.log(nextProps.user);
- // this.setState({
- // user_phone_binded: nextProps.user.user_phone_binded,
- // })
- // }
- //
- //
- // }
-
-
- }
- getipthon=()=>{
+ //
+ // componentWillReceiveProps(nextProps) {
+ // // console.log("46");
+ // // console.log(nextProps);
+ // // console.log(this.props);
+ // // if (nextProps.user != this.props.user) {
+ // // // console.log("50");
+ // // // console.log(nextProps.user);
+ // // if (nextProps.user !== undefined) {
+ // // // console.log("53");
+ // // // console.log(nextProps.user);
+ // // this.setState({
+ // // 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,
- })
+ this.setState({
+ user_phone_binded:result.data.user_phone_binded,
+ })
}
}).catch((error)=>{
console.log(error)
@@ -86,7 +86,7 @@ class Trialapplicationysl extends Component {
// console.log("53");
//
// console.log(this.props.isRenders);
- this.getipthon();
+ this.getipthon();
if (this.props.isRenders != undefined) {
this.setState({
isRenders: this.props.isRenders
@@ -289,11 +289,11 @@ class Trialapplicationysl extends Component {
if(result !== undefined){
this.props.showNotification(`试用申请已提交，我们将尽快完成审核`);
// if (this.state.showTrial === false) {
- window.location.href = "/";
- this.setState({
- isRenders: false
- })
- this.Cancel();
+ window.location.href = "/";
+ this.setState({
+ isRenders: false
+ })
+ this.Cancel();
// } else {
// this.setState({
// isRenders: false
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 125a96e85..4e61101e3 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -18,7 +18,7 @@ import Addcourses from '../courses/coursesPublic/Addcourses';
import LoginDialog from '../login/LoginDialog';
-import Trialapplicationysl from '../login/Trialapplicationysl'
+import Trialapplication from '../login/Trialapplication'
import 'antd/lib/modal/style/index.css';
@@ -636,7 +636,7 @@ submittojoinclass=(value)=>{
{/* />*/}
{/* :""*/}
{/*}*/}
- {/* this.cancelModulationModels()} >*/}
+ {/* this.cancelModulationModels()} >*/}
{/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index cba049041..7df2d82c5 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -43,6 +43,7 @@ class LoginRegisterComponent extends Component {
Whethertoverify:false,
modalsType:false,
pciphone:true,
+ boolyzm:false,
}
}
@@ -213,7 +214,10 @@ class LoginRegisterComponent extends Component {
})
return
}
-
+ if (this.state.password !== this.state.passwords==="") {
+ this.openNotification(`两次输入的密码不一致`);
+ return
+ }
else if (this.state.password !==undefined&&this.state.password.length>0&&this.state.password.length<8){
this.setState({
Phonenumberisnotcosmmm:"密码不能少于8位",
@@ -236,13 +240,6 @@ class LoginRegisterComponent extends Component {
})
return
}
- if (this.state.password !== this.state.passwords) {
- this.setState({
- Phonenumberisnotcosmmm:"两次输入的密码不一致",
- Phonenumberisnotcosymmmm:"两次输入的密码不一致",
- })
- return
- }
if (this.state.codes === undefined|| this.state.codes.length ===0 || this.state.codes === "") {
this.setState({
Phonenumberisnotcosyzm:"验证码不能为空"
@@ -271,6 +268,12 @@ class LoginRegisterComponent extends Component {
Phonenumberisnotcosyzm:"验证码不正确",
})
+ return;
+ }else if(result.data.message==="1小时内同一手机号发送次数超过限制"){
+ this.setState({
+ boolyzm:true,
+ })
+ this.openNotification(result.data.message);
return;
}else {
this.openNotification(result.data.message);
@@ -311,6 +314,7 @@ class LoginRegisterComponent extends Component {
login: stirngt,
Phonenumberisnotco:undefined,
dragOk:false,
+ boolyzm:false,
Whethertoverify:this.state.Whethertoverify===true?false:true,
})
}
@@ -505,6 +509,7 @@ class LoginRegisterComponent extends Component {
codes,
Whethertoverify,
pciphone,
+ boolyzm,
} = this.state
// height: 346px;
return (
@@ -667,11 +672,13 @@ class LoginRegisterComponent extends Component {
:
}
diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css
index f88bde127..4549fdfe9 100644
--- a/public/react/src/modules/user/common.css
+++ b/public/react/src/modules/user/common.css
@@ -1,7 +1,7 @@
-.login_register_content, .login_register_content .ant-tabs-tabpane {
- display: flex;
- justify-content: center;
-}
+/*.login_register_content, .login_register_content .ant-tabs-tabpane {*/
+/* display: flex;*/
+/* justify-content: center; */
+/*}*/
.login_register_content .ant-input {
background:rgb(244,244,244);
}