Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/public/css/edu-all.css

@@ -118,12 +118,13 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
     bottom: 90px;}
 .tag-green .tag-name{display: block;width: auto;
     /*background-image: url("/images/educoder/tag1.png");*/
-    background: #000000;
+    background: rgba(000,000,000,0.56);
     border: 1px solid #fff;
     border-radius: 3px;
     font-size: 12px;
-    opacity: 0.56;
+    /*opacity: 0.56;*/
-    background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;}
+    background-size: 100% 100%;
+    padding: 0px 8px;color: #fff;float: left;}
 .tag-orange{position: absolute;right: 0px;top:12px;}
 .tag-orange .tag-name{display: block;width: auto;background-color:#FF6800;
     background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;

public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js

@@ -13,15 +13,12 @@ class CreateGroupByImportModal extends Component{
   constructor(props){
     super(props);
     this.state={
+      errorTip:undefined
     }
   }
-  fetchMemberList = (arg_page) => {
+  
-  }
-  componentDidMount() {
-    
-    
-  }
   onSendOk = () => {
+
     const courseId = this.props.match.params.coursesId    
     
     let url = `/courses/${courseId}/create_group_by_importing_file.json`
@@ -112,7 +109,7 @@ class CreateGroupByImportModal extends Component{
 
   render(){
     const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names
-        , graduationGroup, graduation_groups, courseGroup, course_groups , fileList } = this.state
+        , graduationGroup, graduation_groups, courseGroup, course_groups , fileList , errorTip } = this.state
     const { moduleName } = this.props
     
     const props = {
@@ -132,17 +129,6 @@ class CreateGroupByImportModal extends Component{
         onOk={this.onOk}
         className="createGroupByImport"
       >
-      
-        <style>
-        {`
-        
-        `}
-        </style>
-        <div className="df">
-
-        
-        
-        </div>
         <Dragger {...props}>
             <p className="ant-upload-drag-icon">
                 <Icon type="inbox" />
@@ -152,6 +138,9 @@ class CreateGroupByImportModal extends Component{
                 单个文件最大150MB
             </p>
         </Dragger>
+      <p className="color-red lineh-25 edu-txt-left" style={{height:"25px"}}>
+        <span className={ errorTip ? "" : "none" }>{errorTip}</span>
+      </p>        
       </ModalWrapper>
     )
   }

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

@@ -30,38 +30,41 @@ class DetailTop extends Component{
     }
   }
 	componentDidMount(){
-		let courseslist=[]
+    this.getdatalist();
-
+	}
+  getdatalist=()=>{
+		let courseslist=[];
+    let keys=1;
 		if(this.props.courses!=undefined&&this.props.courses.length!=0){
-			this.props.courses.map((item,key)=>{
+			if(this.props.detailInfoList.has_start===true){
-				if(this.props.pathtopskey===key+1){
+				this.props.courses.map((item,key)=>{
-					return(
+					if(item.course_status.status===1){
-						courseslist.push(item)
+						keys=key+1
-					)
+						return(
-				}
+							courseslist.push(item)
-			})
+						)
+					}
+				})
+
+			}else{
+				this.props.courses.map((item,key)=>{
+					if(this.props.pathtopskey===key+1){
+						keys=key+1
+						return(
+							courseslist.push(item)
+						)
+					}
+				})
+			}
 		}
 		this.setState({
-			courseslist:courseslist
+			courseslist:courseslist,
+			MenuItemskey:keys,
 		})
 	}
-
 	componentDidUpdate=(prevProps)=> {
 			if(prevProps.courses!=this.props.courses){
-				let courseslist=[]
+				this.getdatalist();
-
-				if(this.props.courses!=undefined&&this.props.courses.length!=0){
-					this.props.courses.map((item,key)=>{
-						if(this.props.pathtopskey===key+1){
-							return(
-								courseslist.push(item)
-							)
-						}
-					})
-				}
-				this.setState({
-					courseslist:courseslist
-				})
 			}
 
 	}
@@ -451,7 +454,7 @@ class DetailTop extends Component{
 									onVisibleChange={this.onVisibleChanges}
 								>
 									<a className={"alist"}>
-									  第<span className={"color-orange"}>{this.state.MenuItemskey}</span>次开课 <Icon className="aIcons" type={!this.state.onVisibleChangestype?"down":"up"} />
+									  第<span className={"color-orange"}>  {this.state.MenuItemskey}  </span>次开课 <Icon className="aIcons" type={!this.state.onVisibleChangestype?"down":"up"} />
 									</a>
 								</Dropdown>
 							</li>
@@ -509,7 +512,7 @@ class DetailTop extends Component{
 														 报名人数：
 													 </div>
 													 <div className={"pathtimes"}>
-													  {item.student_count}人
+													  {item.student_count}   人
 													 </div>
 												 </div>
 											</span>

public/stylesheets/educoder/edu-all.css

@@ -120,12 +120,13 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
     bottom: 90px;}
 .tag-green .tag-name{display: block;width: auto;
     /*background-image: url("/images/educoder/tag1.png");*/
-    background: #000000;
+    background: rgba(000,000,000,0.56);
     border: 1px solid #fff;
     border-radius: 3px;
     font-size: 12px;
-    opacity: 0.56;
+    /*opacity: 0.56;*/
-    background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;}
+    background-size: 100% 100%;
+    padding: 0px 8px;color: #fff;float: left;}
 .tag-orange{position: absolute;right: 0px;top:12px;}
 .tag-orange .tag-name{display: block;width: auto;background-color:#FF6800;
     background-size: 100% 100%;padding: 0px 8px;color: #fff;float: left;