Merge branch 'dev_Ysl' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm

public/react/src/modules/courses/coursesDetail/CoursesBanner.js

@@ -445,7 +445,7 @@ class CoursesBanner extends Component {
                     <style>
                       {
                         `
-                        .tag-orange .tag-name{
+                        .tag-orangces  .tag-name{
                         display: block;
                         width: auto;
                         background-color: #FF6800;
@@ -462,7 +462,7 @@ class CoursesBanner extends Component {
                       }
                     </style>
                     {excellent===true?
-                      <span className="tag-orange fl"><span className="tag-name mt10 ml10">国家精品</span></span>
+                      <span className="tag-orangces fl"><span className="tag-name mt10 ml10">国家精品</span></span>
                       :""}
                     <span className={"TabsWarp"}>
                       <CoursesListType

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

@@ -1,5 +1,5 @@
 import React, {Component} from "React";
-import {Form, Select, Input, Button, Checkbox, DatePicker,Spin,Icon,AutoComplete,InputNumber} from "antd";
+import {Form, Select, Input, Button, Checkbox, DatePicker,Spin,Icon,AutoComplete,InputNumber,Breadcrumb} from "antd";
 import ApplyForAddOrgModal from '../../user/modal/ApplyForAddOrgModal';
 import axios from 'axios';
 import "../css/Courses.css";
@@ -49,6 +49,8 @@ class Goldsubject extends Component {
 			fetching:false,
 			subject_id:"",
 			start_date:"",
+			Whethertocreateanewclassroom:true,
+
 		}
 	}
 	// disabledEndDate= endValue => {
@@ -136,6 +138,7 @@ class Goldsubject extends Component {
 					credit: parseFloat(data.credit),
 					course_module_types: data.course_module_types,
 					school:data.school,
+					Whethertocreateanewclassroom:false,
 				});
 				this.handleSearchschool(data.school);
 			}).catch((error) => {
@@ -154,6 +157,7 @@ class Goldsubject extends Component {
 			});
 			this.setState({
 				school:user_school,
+				Whethertocreateanewclassroom:true,
 			});
 
 			this.handleSearchschool(user_school);
@@ -412,7 +416,12 @@ class Goldsubject extends Component {
 		//  this.props.history.push(this.props.current_user.first_category_url);
 		// }
 		// window.history.go(-1)
-		this.props.history.goBack()
+		if(this.state.Whethertocreateanewclassroom===true){
+			var subjectids=this.props.match.params.subjectid;
+			window.location.href=`/paths/${subjectids}`
+		}else{
+			this.props.history.goBack();
+		}
 	}
 
 	onCheckAllChange = (e) => {
@@ -543,7 +552,7 @@ class Goldsubject extends Component {
 		this.applyForAddOrgForm.setVisible(true)
 	}
 	render() {
-		let {datatime,datatimetwo,school,searchlistscholl} = this.state;
+		let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom} = this.state;
 		const {getFieldDecorator} = this.props.form;
 		const propsWithoutForm = Object.assign({}, this.props)
 		delete propsWithoutForm.form
@@ -581,11 +590,19 @@ class Goldsubject extends Component {
 						modalsBottomval={this.state.ModalsBottomval}
 						loadtype={this.state.Loadtype}
 					/>
+
 					<div className="newMain clearfix">
+
 						<div className={"educontent mb20"}>
+							<Breadcrumb className="mt10" separator=">">
+								<Breadcrumb.Item>
+									<a href="/">首页</a>
+								</Breadcrumb.Item>
+								<Breadcrumb.Item>{Whethertocreateanewclassroom===true?"新建课堂":"编辑课堂"}</Breadcrumb.Item>
+							</Breadcrumb>
 							<div style={{width: '100%', height: '70px'}}>
-								<p className="ml15 fl color-black mt30 summaryname">{this.props.match.params.coursesId === undefined ? "新建课堂" : "编辑课堂"}</p>
+								<p className=" fl color-black mt18 summaryname">{Whethertocreateanewclassroom===true ? "新建课堂" : "编辑课堂"}</p>
-								<a onClick={this.goback} className="color-grey-6 fr font-16 ml30 mt18 mr20">返回</a>
+								<a onClick={this.goback} className="color-grey-6 fr font-16 ml30 mt18 mr20"></a>
 							</div>
 							<style>
 								{`