From dd55ea86c135f39962ad9da9f6da751ca313e1df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 19 Jul 2019 09:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/login/Trialapplication.js     | 27 +++++++++-----
 public/react/src/modules/tpm/NewHeader.js     | 37 ++++++++++---------
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js
index 7900a68bb..02116ce7d 100644
--- a/public/react/src/modules/login/Trialapplication.js
+++ b/public/react/src/modules/login/Trialapplication.js
@@ -33,6 +33,8 @@ class Trialapplication extends Component {
 			user_phone_binded: props.user_phone_binded,
 			showTrial: false,
 			user: undefined,
+			borredss:"bor-reds",
+			borredssz:"bor-reds fl mr5",
 		}
 		//user_phone_binded  判断是否手机号验证
 		// console.log("Trialapplication");
@@ -371,7 +373,7 @@ class Trialapplication extends Component {
 
 	//执行view
 	render() {
-		let {login, codes, reason, isRenders, user_phone_binded, Phonenumberisnotco, getverificationcodes, Phonenumberisnotcocodes, Phonenumberisnotcoreason, seconds} = this.state;
+		let {login, codes, reason, isRenders, user_phone_binded,borredss,borredssz, Phonenumberisnotco, getverificationcodes, Phonenumberisnotcocodes, Phonenumberisnotcoreason, seconds} = this.state;
 		// console.log("Trialapplication22222222");
 		// console.log(this.props);
 
@@ -600,12 +602,13 @@ class Trialapplication extends Component {
 																 onChange={this.loginInputonChange}
 																 onBlur={(e) => this.inputOnBlur(e)}
 																 style={{"height": "38px",}}
+																 className={Phonenumberisnotco && Phonenumberisnotco !== ""?borredss:""}
 																 name="myiphone"
 													></Input>
 													{
 														Phonenumberisnotco && Phonenumberisnotco != "" ?
-															<p className="color-red  mt5 mb5" style={{width: " 100%", height: "20px"}}>
-																<span style={{textAlign:"left"}}>{Phonenumberisnotco}</span>
+															<p className="color-red  mt5 mb5" style={{width: " 100%", height: "20px",textAlign:"left"}}>
+																<span >{Phonenumberisnotco}</span>
 															</p>
 															: <div style={{height: "20px"}}></div>
 													}
@@ -617,7 +620,9 @@ class Trialapplication extends Component {
 											user_phone_binded === true ? "" :
 												<div style={{"display": "flex", "justify-content": "center"}}>
 
-													<Input className="fl mr5" name="codes" type="text" autoComplete="off"
+													<Input
+																 className={Phonenumberisnotcocodes && Phonenumberisnotcocodes !== ""?borredssz:"fl mr5"}
+																 name="codes" type="text" autoComplete="off"
 																 readonly
 																 onfocus="this.removeAttribute('readonly')" style={{
 														"width": "316px",
@@ -644,7 +649,7 @@ class Trialapplication extends Component {
 																"height": "38px",
 															}} type="primary"
 																			onClick={() => this.getverificationcode()}
-																			size={"large"}>验证码</Button>
+																			size={"large"}>获取验证码</Button>
 															:
 															<Button className="fl ml5 " style={{
 																"background": "#4cacff!important",
@@ -661,8 +666,8 @@ class Trialapplication extends Component {
 
 										{
 											Phonenumberisnotcocodes && Phonenumberisnotcocodes != "" ?
-												<p className="color-red " style={{width: " 100%", height: "20px"}}>
-													<span style={{textAlign:"left"}}>{Phonenumberisnotcocodes}</span>
+												<p className="color-red " style={{width: " 100%", height: "20px",textAlign:"left"}}>
+													<span >{Phonenumberisnotcocodes}</span>
 												</p>
 												: <div  style={{height: "20px"}}></div>
 										}
@@ -672,12 +677,13 @@ class Trialapplication extends Component {
 										}}>
 											<Input placeholder="请在此输入推荐人信息或申请理由" value={reason}
 														 onChange={this.loginInputonChanges}
+														 className={Phonenumberisnotcoreason && Phonenumberisnotcoreason !== ""?borredss:""}
 														 style={{"height": "38px",}}
 														 name="mynames"></Input>
 											{
-												Phonenumberisnotcoreason && Phonenumberisnotcoreason != "" ?
-													<p className="color-red" style={{width: " 100%", height: "20px"}}>
-														<span style={{textAlign:"left"}}>{Phonenumberisnotcoreason}</span>
+												Phonenumberisnotcoreason && Phonenumberisnotcoreason !== "" ?
+													<p className="color-red" style={{width: " 100%", height: "20px",textAlign:"left"}}>
+														<span >{Phonenumberisnotcoreason}</span>
 													</p>
 													: <div style={{height: "20px"}}></div>
 											}
@@ -689,6 +695,7 @@ class Trialapplication extends Component {
 															"width": "120px",
 															"text-align": "center",
 															"height": "38px",
+															marginTop: "10px",
 														}}
 														size={"large"}>提交申请</Button>
 
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index c31d5d466..15360f6ec 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -169,8 +169,8 @@ class NewHeader extends Component {
       RadioGroupvalue:undefined,
       submitapplications:false,
       isRender:false,
-      isRenders:false,
-      showTrial:false,
+      // isRenders:false,
+      // showTrial:false,
     }
     // console.log("176")
     // console.log(props);
@@ -547,13 +547,13 @@ submittojoinclass=(value)=>{
   }
 }
 
-  trialapplications =()=>{
-    console.log("点击了")
-    this.setState({
-      isRenders: true,
-      showTrial:true,
-    })
-  }
+  // trialapplications =()=>{
+  //   console.log("点击了")
+  //   this.setState({
+  //     isRenders: true,
+  //     showTrial:true,
+  //   })
+  // }
 
   // 关闭
   cancelModulationModels = () => {
@@ -617,14 +617,15 @@ submittojoinclass=(value)=>{
               />
         {/*      :""*/}
         {/*}*/}
-        {
-          isRenders&&isRenders===true?
-              <Trialapplication
-                  {...this.state}
-                  Cancel={() => this.cancelModulationModels()}
-              />
-              :""
-        }
+
+        {/*{*/}
+        {/*  isRenders&&isRenders===true?*/}
+        {/*      <Trialapplication*/}
+        {/*          {...this.state}*/}
+        {/*          Cancel={() => this.cancelModulationModels()}*/}
+        {/*      />*/}
+        {/*      :""*/}
+        {/*}*/}
         <Trialapplication  {...this.state} Cancel={() => this.cancelModulationModels()} ></Trialapplication>
         <div className="educontent clearfix">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
@@ -756,7 +757,7 @@ submittojoinclass=(value)=>{
                 <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的项目</Link></li>
                 <li><a href={`/account/profile`}>账号管理</a></li>
                 {/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
-                <li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>
+                {/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
                 {/*<li><Link to={`/interest`}>兴趣页</Link></li>*/}
 
                 <li className="bor-top-greyE">