调整

public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js

@@ -197,17 +197,21 @@ class ShixunHomeworkPage extends Component {
 				</Modals>
 				<div className={"educontent mt10 mb20"} style={{width: "1200px"}}>
 					<Spin size="large" spinning={this.state.mylistisSpin}>
-					<div className="educontent mb20">
+						{
-						<p className="clearfix mb20 mt10">
+							jobsettingsdatapage === undefined?"":
-							<a className="btn colorgrey fl hovercolorblue " href={this.props.current_user&&this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</a>
+								<div className="educontent mb20">
-							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
+									<p className="clearfix mb20 mt10">
-							<a
+										<a className="btn colorgrey fl hovercolorblue " href={this.props.current_user&&this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</a>
-								className=" btn colorgrey fl hovercolorblue "
+										<span className="color-grey-9 fl ml3 mr3">&gt;</span>
-								href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main ===  1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
+										<a
-							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
+											className=" btn colorgrey fl hovercolorblue "
-							<WordsBtn className="fl">作业详情</WordsBtn>
+											href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main ===  1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
-						</p>
+										<span className="color-grey-9 fl ml3 mr3">&gt;</span>
-					</div>
+										<WordsBtn className="fl">作业详情</WordsBtn>
+									</p>
+								</div>
+						}
+
 					<div className="educontent mb20">
 						<p className=" fl color-black  summaryname" style={{heigth: "33px"}}>
 							{teacherdatapage === undefined ? "" : teacherdatapage.homework_name}

public/react/src/modules/login/LoginDialog.js

@@ -398,15 +398,19 @@ class LoginDialog extends Component {
         });
     }
     handleDialogClose = () => {
-
+      // https://www.trustie.net/issues/24441
-			if(this.props.match===undefined){
+       // console.log(JSON.stringify(this.props));
-				window.location.href="/";
+       // console.log("handleDialogClose");
-			}else{
+       // console.log(this.props.match);
+			// if(this.props.match===undefined){
+			// 	window.location.href="/";
+			// }else{
+      //   this.props.history.goBack();
         this.setState({
           isRender: false
-        })
+        });
 				this.props.Modifyloginvalue();
-      }
+      // }
 			// this.setState({
 			// 	isRender: false
 			// })