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

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -569,20 +569,7 @@ class Challengesjupyter extends Component {
 											}
 										</p>}
 								</p>
-								{
-									booljupyterurls===true?
-										(
-											this.state.jupyter_url === null?
-												<div className="mt50 intermediatecenter juplbool">
-													<span className="icon iconfontysl icon-jiazaishibai1"></span>
-													<p className="intermediatecenter sortinxdirection mt5 juplboolp"><p className="colorbluetest">加载实训失败，</p><p className="colorbluetwo" onClick={()=>this.updatamakedowns()}>重新加载</p></p>
-
-												</div>
 
-												:""
-										)
-										:""
-								}
 							</div>
 
 							{this.state.isopentitletype==="Less"?"":this.state.opentitletype===true?<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
@@ -750,7 +737,13 @@ class Challengesjupyter extends Component {
 														<div className={enlarge?"fangdatwo edu-back-white fangdatwoswidth":""}>
 															<LoadingSpin ></LoadingSpin>
 														</div>
-														:<div className={enlarge?"fangdatwo edu-back-white fangdatwoswidth":""}>
+														:
+														<div className={enlarge?"fangdatwo edu-back-white fangdatwoswidth":""}>
+															<div className="mt50 intermediatecenter juplbool">
+																<span className="icon iconfontysl icon-jiazaishibai1"></span>
+																<p className="intermediatecenter sortinxdirection mt5 juplboolp"><p className="colorbluetest">加载实训失败，</p><p className="colorbluetwo" onClick={()=>this.updatamakedowns()}>重新加载</p></p>
+
+															</div>
 														</div>
 												)
 												:
@@ -776,4 +769,17 @@ class Challengesjupyter extends Component {
 }
 
 export default Challengesjupyter;
-
+{/*{*/}
+{/*	booljupyterurls===true?*/}
+{/*		(*/}
+{/*			this.state.jupyter_url === null?*/}
+{/*				<div className="mt50 intermediatecenter juplbool">*/}
+{/*					<span className="icon iconfontysl icon-jiazaishibai1"></span>*/}
+{/*					<p className="intermediatecenter sortinxdirection mt5 juplboolp"><p className="colorbluetest">加载实训失败，</p><p className="colorbluetwo" onClick={()=>this.updatamakedowns()}>重新加载</p></p>*/}
+
+{/*				</div>*/}
+
+{/*				:""*/}
+{/*		)*/}
+{/*		:""*/}
+{/*}*/}