From 2d8b2ef96f0fd45d519f9dce443a2723c919f910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 26 Jun 2019 11:35:00 +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

---
 .../courses/shixunHomework/Listofworks.js     | 16 ++++++----
 .../src/modules/login/Trialapplication.js     | 32 +++++++++----------
 public/react/src/modules/tpm/NewHeader.js     |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 6d19b13ef..98ba43e55 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -75,7 +75,7 @@ class Listofworks extends Component {
 			teacherlist: undefined,
 			searchtext: "",
 			course_groupysls: undefined,
-			course_groupyslstwo: undefined,
+			course_groupyslstwo: [],
 			visible: false,
 			userid: 0,
 			course_group: null,
@@ -1164,7 +1164,7 @@ class Listofworks extends Component {
 			// console.log(checkedValues);
 			this.setState({
 				unlimited: 0,
-				course_groupyslstwo: undefined,
+				course_groupyslstwo: [],
 				loadingstate: true,
 
 			})
@@ -1172,7 +1172,7 @@ class Listofworks extends Component {
 		} else if (checkedValues.length === data.length) {
 			this.setState({
 				unlimited: 0,
-				course_groupyslstwo: undefined,
+				course_groupyslstwo: [],
 				loadingstate: true,
 			})
 			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
@@ -1198,6 +1198,7 @@ class Listofworks extends Component {
 			this.setState({
 				unlimitedtwo: 1,
 				course_groupysls: undefined,
+				checkedValuesineinfo:[],
 				loadingstate: true,
 
 			})
@@ -1206,6 +1207,7 @@ class Listofworks extends Component {
 			this.setState({
 				unlimitedtwo: 1,
 				course_groupysls: undefined,
+				checkedValuesineinfo:[],
 				loadingstate: true,
 			})
 			this.Startsorting(this.state.order, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, this.state.page, this.state.limit);
@@ -1485,22 +1487,22 @@ class Listofworks extends Component {
 	notlimiteds = () => {
 		this.setState({
 			checkedValuesine: undefined,
-			course_groupyslstwo: undefined,
+			course_groupyslstwo: [],
 			unlimited: 0,
 			loadingstate: true,
 		})
-		this.Startsorting(this.state.order, null, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+		this.Startsorting(this.state.order, [], this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
 
 	}
 	notlimitedst = () => {
 		// console.log(this.state.course_group_info);
 		this.setState({
 			unlimitedtwo: 1,
-			checkedValuesineinfo: undefined,
+			checkedValuesineinfo: [],
 			course_groupysls: undefined,
 			loadingstate: true,
 		})
-		this.Startsorting(this.state.order, this.state.course_groupyslstwo, undefined, this.state.searchtext, this.state.page, this.state.limit);
+		this.Startsorting(this.state.order, this.state.course_groupyslstwo, [], this.state.searchtext, this.state.page, this.state.limit);
 	}
 	//立即截止确定按钮
 	coursetaskend = () => {
diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js
index e5bc75466..846971e82 100644
--- a/public/react/src/modules/login/Trialapplication.js
+++ b/public/react/src/modules/login/Trialapplication.js
@@ -30,7 +30,7 @@ class Trialapplication extends Component {
 			Phonenumberisnotco: undefined,
 			Phonenumberisnotcobool: false,
 			readonlyInput: true,
-			user_phone_binded: false,
+			user_phone_binded: props.user_phone_binded,
 			showTrial: false,
 			user: undefined,
 		}
@@ -383,7 +383,7 @@ class Trialapplication extends Component {
 				{
 					isRenders === false ? "" :
 
-						<div style={{"border-radius": "15px"}}>
+						<div style={{"border-radius": "10px"}}>
 							<style>
 								{
 									`
@@ -427,7 +427,7 @@ class Trialapplication extends Component {
 												#DialogIDysl div  {
 														overflow-y:visible !important;
 														box-shadow:none !important;
-														border-radius:15px !important;
+														border-radius:10px !important;
 												}
 												#wrapper{
 														position: relative;
@@ -541,19 +541,19 @@ class Trialapplication extends Component {
 										 style={{height: '0', width: '0', border: 'none', display: "none"}}/>
 
 							<Dialog open={true} id="DialogIDysl"
-											style={{display: isRenders == false ? 'none' : '', "border-radius": "15px"}}
+											style={{display: isRenders == false ? 'none' : '', "border-radius": "10px"}}
 							>
 								<div id="closeIcon" onClick={() => {
 									this.handleDialogClose()
 								}}>
 									<i className="iconfont icon-shanchudiao"></i>
 								</div>
-								<div className={"login_register_content"} style={{"border-radius": "15px", "width": "560px"}}>
+								<div className={"login_register_content"} style={{"border-radius": "10px", "width": "560px"}}>
 
 									<div className={"login_register_content"} style={
 										user_phone_binded === true ?
 											{
-												"width": "560px", "height": "280px",
+												"width": "560px", "height": "295px",
 												"border-radius": "15px",
 												"background": " #FFFFff",
 												"text-align": "center",
@@ -564,8 +564,8 @@ class Trialapplication extends Component {
 											}
 											:
 											{
-												"width": "560px", "height": "390px",
-												"border-radius": "15px",
+												"width": "560px", "height": "410px",
+												"border-radius": "10px",
 												"background": " #FFFFff",
 												"text-align": "center",
 												// "position": "absolute",
@@ -575,14 +575,12 @@ class Trialapplication extends Component {
 											}
 									}
 									>
-										<ul>
+										<ul style={{"margin-top": "10px","margin-bottom": "10px"}}>
                                 <span style={{
-																	"padding": "20px",
 																	"text-align": "center!important",
 																	"color": "#05101A",
 																	"font-weight": "bold",
 																	"font-size": "17px",
-																	"margin-top": "10px",
 																}}>试用申请</span>
 										</ul>
 
@@ -597,7 +595,7 @@ class Trialapplication extends Component {
 										{
 											user_phone_binded === true ? "" :
 												<div style={{
-													"margin-top": "15px", "padding-left": "50px",
+													"margin-top": "20px", "padding-left": "50px",
 													"padding-right": "50px"
 												}}>
 													<Input placeholder="请输入手机号码" value={login}
@@ -611,7 +609,7 @@ class Trialapplication extends Component {
 															<p className="color-red  mt5 mb5" style={{width: " 100%", height: "20px"}}>
 																<span>{Phonenumberisnotco}</span>
 															</p>
-															: <div className="mt5 mb5" style={{height: "20px"}}></div>
+															: <div style={{height: "20px"}}></div>
 													}
 												</div>
 										}
@@ -665,10 +663,10 @@ class Trialapplication extends Component {
 
 										{
 											Phonenumberisnotcocodes && Phonenumberisnotcocodes != "" ?
-												<p className="color-red  mt2 mb2" style={{width: " 100%", height: "23px"}}>
+												<p className="color-red " style={{width: " 100%", height: "20px"}}>
 													<span>{Phonenumberisnotcocodes}</span>
 												</p>
-												: <div className="mt2 mb2" style={{height: "23px"}}></div>
+												: <div  style={{height: "20px"}}></div>
 										}
 										<div style={{
 											"padding-left": "50px",
@@ -680,10 +678,10 @@ class Trialapplication extends Component {
 														 name="mynames"></Input>
 											{
 												Phonenumberisnotcoreason && Phonenumberisnotcoreason != "" ?
-													<p className="color-red  mt2 mb2" style={{width: " 100%", height: "23px"}}>
+													<p className="color-red" style={{width: " 100%", height: "20px"}}>
 														<span>{Phonenumberisnotcoreason}</span>
 													</p>
-													: <div className="mt2 mb2" style={{height: "23px"}}></div>
+													: <div style={{height: "20px"}}></div>
 											}
 										</div>
 
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 841687f20..294339b54 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -170,7 +170,7 @@ class NewHeader extends Component {
       submitapplications:false,
       isRender:false,
       isRenders:false,
-      showTrial:true,
+      showTrial:false,
     }
     // console.log("176")
     // console.log(props);