Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

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

@@ -192,7 +192,7 @@ class CoursesNew extends Component {
                     ).then((response) => {
                             // debugger
                         if (response.data.status === 0) {
-													this.goback
+													this.goback()
                         }
                     }).catch((error) => {
                         console.log(error)
@@ -235,9 +235,7 @@ class CoursesNew extends Component {
                         }
                     ).then((response) => {
                         if (response.status === 200) {
-                            if (response.data.course_id != undefined) {
+													this.goback()
-                                 window.location.href = "/courses/" + response.data.course_id+"/students";
-                            }
                         }
                     }).catch((error) => {
                         console.log(error)

public/react/src/modules/courses/poll/PollDetailIndex.js

@@ -107,16 +107,6 @@ class PollDetailIndex extends Component{
 			DownloadType:false,
 			DownloadMessageval:undefined
 		})
-  }
-	goback=()=>{
-
-		let courseId=this.props.match.params.coursesId;
-		if(courseId===undefined){
-			this.props.history.push("/courses");
-		}else{
-			this.props.history.push(this.props.current_user.first_category_url);
-		}
-
 	}
 	render(){
 		let {tab,pollDetail,user_permission}=this.state;
@@ -133,7 +123,7 @@ class PollDetailIndex extends Component{
 				/>
 				<div className="educontent mt10 mb50">
 					<p className="clearfix mb20">
-            <a style="grey" className="fl" onClick={()=>this.goback()}>{this.props.coursedata.name}</a>
+						<WordsBtn style="grey" className="fl" to={`/courses/${this.props.match.params.coursesId}/students`}>{this.props.coursedata.name}</WordsBtn>
 						<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 						<WordsBtn style="grey" className="fl" to={`/courses/${this.props.match.params.coursesId}/polls/${user_permission && user_permission.left_banner_id}`}>问卷</WordsBtn>
 						<span className="color-grey-9 fl ml3 mr3">&gt;</span>
@@ -144,7 +134,7 @@ class PollDetailIndex extends Component{
 						<span className="mt3 fl" style={{height:"25px"}}>
               <CoursesListType typelist={[`${map[pollDetail && pollDetail.polls_status]}`]} typesylename={""} />
             </span>
-            <WordsBtn className="fr font-16 mt2" style="grey" onClick={()=>this.goback()}>返回</WordsBtn>
+						<WordsBtn className="fr font-16 mt2" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn>
 					</p>
 					<div>
 						<div className="clearfix edu-back-white pl30 pr30 bor-bottom-greyE">

public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js

@@ -402,7 +402,7 @@ class DetailCardsEditAndAdd extends Component{
               <div className="df mb30">
                 <span className="mr30 color-orange pt10">*</span>
                 <div className="flex1 mr20">
-                  <input type="text" style={{width:'670px'}} className={stage_nametype===false?"input-100-45 greyInput":"input-100-45 greyInput bor-red"} name="stage_name" value={stage_names} onInput={this.updatastage_names} placeholder={"请输入第"+this.props.sum+"阶段名称"}/>
+                  <input maxLength="10"  type="text" style={{width:'670px'}} className={stage_nametype===false?"input-100-45 greyInput":"input-100-45 greyInput bor-red"} name="stage_name" value={stage_names} onInput={this.updatastage_names} placeholder={"请输入第"+this.props.sum+"阶段名称"}/>
                   <div className={stage_nametype===true?"red":'none'}>名称不能为空</div>
                 </div>
                 <div style={{"width":"60px"}}><span className="color-orange fl mt8 none" id="stage_name_notice"><i className="iconfont icon-tishi font-14 mr3"></i>必填项</span></div>