修复

public/react/src/App.js

@@ -241,6 +241,7 @@ class App extends Component {
 
 	render() {
 	 // let {isRenders} = this.state;
+
 		return (
 			<LocaleProvider locale={zhCN}>
 
@@ -254,7 +255,7 @@ class App extends Component {
 
 					{/*{*/}
 					{/*	isRenders === true?*/}
-						<Trialapplication></Trialapplication>
+					{/*<Trialapplication></Trialapplication>*/}
 					{/*:""*/}
 					{/*}*/}
 

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -1551,6 +1551,7 @@ class GraduationTaskssettinglist extends Component{
 													return(
 														<span key={key}>
 														  	{item==="提交作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/new"}>提交作品</a>:""}
+														  	{item==="补交作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/new"}>补交作品</a>:""}
 																{item==="修改作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+taskslistdata.work_id+"/works/edit"}>修改作品</a>:""}
 																{item==="查看作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+taskslistdata.work_id+"/works/edit"}>查看作品</a> :""}
 													  		{item==="创建项目"?<a className={"fr color-blue font-16"} href={'/projects/new'}>创建项目</a>:""}

public/react/src/modules/login/Trialapplication.js

@@ -30,12 +30,17 @@ class Trialapplication extends Component {
 			Phonenumberisnotco: undefined,
 			Phonenumberisnotcobool: false,
 			readonlyInput: true,
+			user_phone_binded: false,
+			showTrial: false,
 		}
-        //
+		//user_phone_binded  判断是否手机号验证
 		console.log("Trialapplication");
 		console.log(props);
 	}
 
+	Cancel = () => {
+		this.props.Cancel()
+	}
 
 	componentWillReceiveProps(nextProps) {
 
@@ -45,15 +50,25 @@ class Trialapplication extends Component {
 		// console.log("componentWillReceiveProps");
 		// console.log(nextProps);
 	}
+
 	//初始化数据
 	componentDidMount() {
+		console.log("53");
+
+		console.log(this.props.isRenders);
 
 		if (this.props.isRenders != undefined) {
 			this.setState({
 				isRenders: this.props.isRenders
 			})
 		}
+		if (this.props.showTrial != undefined) {
+			// 判断是否返回主页的参数
+			this.setState({
+				showTrial: this.props.showTrial
+			})
 
+		}
 		axios.interceptors.response.use((response) => {
 			if (response != undefined)
 				if (response && response.data.status === 407) {
@@ -85,6 +100,20 @@ class Trialapplication extends Component {
 			//     // }
 			//     // return Promise.reject(error);
 		});
+		console.log("89");
+		try {
+			console.log(this.state.props.user && this.state.props.user.user_phone_binded);
+			if (this.state.props.user !== undefined) {
+				this.setState({
+					user_phone_binded: this.state.props.user.user_phone_binded,
+				})
+			}
+
+		} catch (e) {
+			console.log(e);
+
+		}
+
 	}
 
 	//获取登入
@@ -199,31 +228,38 @@ class Trialapplication extends Component {
 	}
 
 	handleDialogClose() {
+		if (this.state.showTrial === false) {
 			this.setState({
 				isRenders: false
 			})
+			this.Cancel();
 			window.location.href = "/";
+		} else {
+			this.setState({
+				isRenders: false
+			})
+			this.Cancel();
+		}
+
 	}
 
 	postregistered = () => {
 		//提交按钮
+		debugger
+		if (this.state.user_phone_binded === false) {
+
 			if (this.state.Phonenumberisnotcobool === false) {
-            // if (this.state.login.length === 0) {
+				var iphones = "";
-            //     this.setState({
+				if (this.state.Phonenumberisnotco === undefined || this.state.Phonenumberisnotco === null || this.state.Phonenumberisnotco === "") {
-            //         Phonenumberisnotco: "请输入手机号或邮箱",
+					iphones = "请输入手机号";
-            //     })
+				} else {
-            //     console.log("postregistered");
+					iphones = this.state.Phonenumberisnotco;
-            //     console.log("123456");
+				}
-            //
+
-            //     return
-            // } else {
 				this.setState({
-                    Phonenumberisnotco: this.state.Phonenumberisnotco,
+					Phonenumberisnotco: iphones,
 				})
-            //     console.log("postregistered");
+
-            //     console.log("1234567");
-            //
-            // }
 				return;
 			}
 			if (this.state.codes.length === 0) {
@@ -232,6 +268,9 @@ class Trialapplication extends Component {
 				})
 				return;
 			}
+
+		}
+
 		if (this.state.reason.length === 0) {
 			this.setState({
 				Phonenumberisnotcoreason: "请输入推荐人信息或申请理由",
@@ -239,7 +278,7 @@ class Trialapplication extends Component {
 			return;
 		}
 
-
+		var thiss = this;
 		var url = "/users/trial_apply.json";
 		axios.post(url, {
 			phone: this.state.login,
@@ -249,7 +288,21 @@ class Trialapplication extends Component {
 			// console.log(result);
 			try {
 				// this.onTabChange("1");
+				thiss.props.showNotification(`试用申请已提交，我们将尽快完成审核`);
+				if (thiss.state.showTrial === false) {
 					window.location.href = "/";
+					thiss.setState({
+						isRenders: false
+					})
+					thiss.Cancel();
+
+				} else {
+					thiss.setState({
+						isRenders: false
+					})
+					thiss.Cancel();
+
+				}
 			} catch (e) {
 
 			}
@@ -339,9 +392,10 @@ class Trialapplication extends Component {
 
 	//执行view
 	render() {
-        let {login, codes, reason, isRenders, Phonenumberisnotco, getverificationcodes,Phonenumberisnotcocodes,Phonenumberisnotcoreason, seconds} = this.state;
+		let {login, codes, reason, isRenders, user_phone_binded, Phonenumberisnotco, getverificationcodes, Phonenumberisnotcocodes, Phonenumberisnotcoreason, seconds} = this.state;
 		// console.log("Trialapplication22222222");
 		// console.log(this.props);
+
 		return (
 			<div>
 				{
@@ -516,7 +570,21 @@ class Trialapplication extends Component {
 									<i className="iconfont icon-shanchudiao"></i>
 								</div>
 								<div className={"login_register_content"} style={{"border-radius": "15px", "width": "560px"}}>
-                                <div className={"login_register_content"} style={{
+
+									<div className={"login_register_content"} style={
+										user_phone_binded === true ?
+											{
+												"width": "560px", "height": "304px",
+												"border-radius": "15px",
+												"background": " #FFFFff",
+												"text-align": "center",
+												// "position": "absolute",
+												"left": " 0px",
+												"box-sizing": "border-box",
+												"padding": "10px",
+											}
+											:
+											{
 												"width": "560px", "height": "390px",
 												"border-radius": "15px",
 												"background": " #FFFFff",
@@ -525,7 +593,9 @@ class Trialapplication extends Component {
 												"left": " 0px",
 												"box-sizing": "border-box",
 												"padding": "10px",
-                                }}>
+											}
+									}
+									>
 										<ul>
                                 <span style={{
 																	"padding": "20px",
@@ -544,6 +614,9 @@ class Trialapplication extends Component {
 										<div>
 											<span style={{"color": "#4D4D4D"}}>管理员审核批准后，即可继续访问网站</span>
 										</div>
+
+										{
+											user_phone_binded === true ? "" :
 												<div style={{
 													"margin-top": "15px", "padding-left": "50px",
 													"padding-right": "50px"
@@ -562,11 +635,15 @@ class Trialapplication extends Component {
 															: <div className="mt5 mb5" style={{height: "20px"}}></div>
 													}
 												</div>
+										}
 
 
+										{
+											user_phone_binded === true ? "" :
 												<div style={{"display": "flex", "justify-content": "center"}}>
 
-                                        <Input className="fl mr5" name="codes" type="text" autoComplete="off" readonly
+													<Input className="fl mr5" name="codes" type="text" autoComplete="off"
+																 readonly
 																 onfocus="this.removeAttribute('readonly')" style={{
 														"width": "316px",
 														"height": "38px",
@@ -591,7 +668,8 @@ class Trialapplication extends Component {
 																"text-align": "center",
 																"height": "38px",
 															}} type="primary"
-                                                      onClick={() => this.getverificationcode()} size={"large"}>验证码</Button>
+																			onClick={() => this.getverificationcode()}
+																			size={"large"}>验证码</Button>
 															:
 															<Button className="fl ml5 " style={{
 																"background": "#4cacff!important",
@@ -599,9 +677,13 @@ class Trialapplication extends Component {
 																"text-align": "center",
 																"height": "38px",
 															}} type="primary"
-                                                      onClick={() => this.getverificationcode()} size={"large"}>重新发送</Button>
+																			onClick={() => this.getverificationcode()}
+																			size={"large"}>重新发送</Button>
 													}
 												</div>
+										}
+
+
 										{
 											Phonenumberisnotcocodes && Phonenumberisnotcocodes != "" ?
 												<p className="color-red  mt2 mb2" style={{width: " 100%", height: "23px"}}>
@@ -637,6 +719,8 @@ class Trialapplication extends Component {
 
 
 									</div>
+
+
 								</div>
 
 							</Dialog>
@@ -646,7 +730,6 @@ class Trialapplication extends Component {
 			</div>
 
 
-
 		)
 
 

public/react/src/modules/tpm/NewHeader.js

@@ -18,7 +18,7 @@ import Addcourses from '../courses/coursesPublic/Addcourses';
 
 import LoginDialog from '../login/LoginDialog';
 
-// import Trialapplication from '../login/Trialapplication'
+import Trialapplication from '../login/Trialapplication'
 
 import 'antd/lib/modal/style/index.css';
 
@@ -170,6 +170,7 @@ class NewHeader extends Component {
       submitapplications:false,
       isRender:false,
       isRenders:false,
+      showTrial:false,
       user:undefined,
     }
   }
@@ -512,12 +513,17 @@ submittojoinclass=(value)=>{
 }
 
   // trialapplications =()=>{
+  //   console.log("点击了")
   //   this.setState({
   //     isRenders: true,
+  //     showTrial:true,
   //   })
   // }
 
-
+  // 关闭
+  cancelModulationModels = () => {
+    this.setState({isRenders: false})
+  }
 
   render() {
     const isLogin = true;   // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
@@ -538,6 +544,7 @@ submittojoinclass=(value)=>{
       submitapplicationsvalue,
       user,
       isRender,
+      isRenders,
     }=this.state;
     /*
         用户名称  用户头像url
@@ -574,11 +581,13 @@ submittojoinclass=(value)=>{
               />
         {/*      :""*/}
         {/*}*/}
+        <Trialapplication></Trialapplication>
 
         {/*{*/}
         {/*  isRenders&&isRenders===true?*/}
         {/*      <Trialapplication*/}
         {/*          {...this.state}*/}
+        {/*          Cancel={() => this.cancelModulationModels()}*/}
         {/*      />*/}
         {/*      :""*/}
         {/*}*/}