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

dev_hjm
daiao 6 years ago
commit 54024c76aa

File diff suppressed because one or more lines are too long

@ -17,6 +17,7 @@ function locationurl(list){
window.location.replace(list) window.location.replace(list)
} }
} }
let hashTimeout
// TODO 开发期多个身份切换 // TODO 开发期多个身份切换
let debugType ="" let debugType =""
@ -137,6 +138,18 @@ export function initAxiosInterceptors(props) {
} }
throw new axios.Cancel('Operation canceled by the user.'); throw new axios.Cancel('Operation canceled by the user.');
} else {
// hash跳转
var hash = window.location.hash;
if (hash) {
hashTimeout && window.clearTimeout(hashTimeout)
hashTimeout = setTimeout(() => {
var element = document.querySelector(hash);
if (element) {
element.scrollIntoView();
}
}, 400)
}
} }
// if(response.data.status === 401){ // if(response.data.status === 401){
// console.log("401401401") // console.log("401401401")

@ -372,7 +372,7 @@ class PathDetailIndex extends Component{
<span className="font-16">课程须知</span> <span className="font-16">课程须知</span>
{detailInfoList===undefined?"":detailInfoList.allow_statistics===true? {detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
<Tooltip placement="bottom" title={"编辑"}> <Tooltip placement="bottom" title={"编辑"}>
<Link to={"/paths/"+this.props.match.params.pathId+"/edit"} className="fr mtf5"> <Link to={"/paths/"+this.props.match.params.pathId+"/edit#learning_notes"} className="fr mtf5">
<i className="iconfont icon-bianjidaibeijing font-20 color-green"></i> <i className="iconfont icon-bianjidaibeijing font-20 color-green"></i>
</Link> </Link>
</Tooltip> </Tooltip>

@ -213,13 +213,15 @@ class PathNew extends Component{
} }
render(){ render(){
let pathId = this.props.match.params.pathId;
let {pathName,description,point,flag_name}=this.state; let {pathName,description,point,flag_name}=this.state;
return( return(
<div className="newContainer"> <div className="newContainer">
<div className="newMain clearfix"> <div className="newMain clearfix">
<div className="educontent mt10 mb50"> <div className="educontent mt10 mb50">
<div className="mb10 edu-back-white"> <div className="mb10 edu-back-white">
<p className="padding20 bor-bottom-greyE font-18 color-grey-3">创建实践课程</p> <p className="padding20 bor-bottom-greyE font-18 color-grey-3">{pathId ? '编辑' : '创建'}实践课程</p>
<div className="padding30-20" id="part_Name"> <div className="padding30-20" id="part_Name">
<p className="color-grey-6 font-16 mb15">实践课程名称</p> <p className="color-grey-6 font-16 mb15">实践课程名称</p>
<div className="df"> <div className="df">
@ -251,7 +253,7 @@ class PathNew extends Component{
</div> </div>
<div className="mb10 edu-back-white padding30-20" id="part_point"> <div className="mb10 edu-back-white padding30-20" id="part_point">
<p className="color-grey-6 font-16 mb15">学习须知</p> <p className="color-grey-6 font-16 mb15" id="learning_notes">学习须知</p>
<div className="df"> <div className="df">
<span className="mr30 color-orange pt10">*</span> <span className="mr30 color-orange pt10">*</span>
<div className="flex1 mr20"> <div className="flex1 mr20">

Loading…
Cancel
Save