Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/new/CoursesNew.js

@@ -302,7 +302,7 @@ class CoursesNew extends Component {
 		if(value!=""){
 			this.props.form.setFieldsValue({
 				classroom:value,
-			  course:value
+			  // course:value
 			});
 			this.Searchvalue(value)
 		}
@@ -312,7 +312,7 @@ class CoursesNew extends Component {
     handleChange=(value)=>{
 
         this.props.form.setFieldsValue({
-					  course:value,
+					  // course:value,
             classroom:value
         })
     };
@@ -460,7 +460,7 @@ class CoursesNew extends Component {
 
 																					<AutoComplete style={{ width: 280 }}
 																					onSearch={this.handleSearch}
-																					// onChange={this.handleChange}
+																					onChange={this.handleChange}
 																					className={"fl construction "}
 																					placeholder="例如：数据结构"
 																					>

public/react/src/modules/user/Notcompletedysl.js

@@ -33,7 +33,11 @@ class Notcompletedysl extends Component {
 	}
 
 	modalCancel=()=>{
-		window.location.href = "/";
+		var weekArray = JSON.parse(window.sessionStorage.getItem('yslgeturls'));
+		if(weekArray===undefined){
+			weekArray="/";
+		}
+		window.location.href = weekArray;
 	}
 
 	setDownload=()=>{
@@ -55,11 +59,10 @@ class Notcompletedysl extends Component {
 				width="530px"
 			>
 				<div className="educouddiv">
-					<div className={"tabeltext-alignleft mt10"}><p>您尚未完善个人资料</p></div>
+					<div className={"tabeltext-alignleft mt20"}><p>完善您的资料，将获得更多的使用权限</p></div>
-					<div className={"tabeltext-alignleft mt10"}><p>请在完成资料后，提交试用申请</p></div>
 					<div className="clearfix mt30 edu-txt-center">
 						<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
-						<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>立即完善资料</a>
+						<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>立即完善</a>
 					</div>
 				</div>
 			</Modal>