From d5ebe26cb8bca0fef7409d2eb05cb736d428ecbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Wed, 14 Aug 2019 16:26:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/ListPageIndex.js | 24 +++--- .../src/modules/courses/new/CoursesNew.js | 81 +++++++++++-------- .../modules/courses/shixunHomework/Guide.js | 5 +- .../modules/courses/shixunHomework/guide.css | 45 +++++++++++ 4 files changed, 110 insertions(+), 45 deletions(-) diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js index 9033b2006..3721a081e 100644 --- a/public/react/src/modules/courses/ListPageIndex.js +++ b/public/react/src/modules/courses/ListPageIndex.js @@ -145,18 +145,18 @@ class ListPageIndex extends Component{
{/*头部banner*/} - - {yslGuideone!==undefined? - ( - yslGuideone===true? - this.setwindowlocal(b)} - > - - :"" - ) - :"" - } + {/*下面是指引哦*/} + {/*{yslGuideone!==undefined?*/} + {/*(*/} + {/* yslGuideone===true?*/} + {/* this.setwindowlocal(b)}*/} + {/* >*/} + {/* */} + {/* :""*/} + {/* )*/} + {/* :""*/} + {/*}*/}
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index 4f21c5d55..8629ba944 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -41,7 +41,8 @@ class CoursesNew extends Component { searchlist: [], searchlistscholl:[], listvalue: undefined, - fetching:false + fetching:false, + boolxinjian:false, } } @@ -80,6 +81,9 @@ class CoursesNew extends Component { }).catch((error) => { console.log(error); }) + this.setState({ + boolxinjian:false, + }); }else{ let url = "/courses/new.json" axios.get(url).then((result) => { @@ -96,18 +100,25 @@ class CoursesNew extends Component { }); this.handleSearchschool(user_school); - + this.setState({ + boolxinjian:true, + }); } } - componentDidUpdate(prevProps){ - // if(prevProps.current_user!=this.props.current_user){ - // if(this.props.current_user.user_identity==="学生"){ - // window.location.href ="/403" - // } - // } - } + componentDidUpdate(prevProps) { + if(prevProps.current_user !== this.props.current_user){ + let user_school=this.props.current_user&&this.props.current_user.user_school; + this.props.form.setFieldsValue({ + school:user_school, + }); + this.setState({ + school:user_school, + }); + this.handleSearchschool(user_school); + } + } onChangeTimepublishs = (date, dateString) => { if(dateString===""){ this.setState({ @@ -207,18 +218,20 @@ class CoursesNew extends Component { // this.goback() window.location.href=first_category_url; - var yslGuideone = window.localStorage.getItem('yslGuideone'); - try { - if(yslGuideone=== null){ - window.localStorage.setItem('yslGuideone', "true"); - return - } - if(yslGuideone=== undefined){ - window.localStorage.setItem('yslGuideone', "true"); - return - } - }catch (e) { + if(this.state.boolxinjian===true) { + var yslGuideone = window.localStorage.getItem('yslGuideone'); + try { + if (yslGuideone === null) { + window.localStorage.setItem('yslGuideone', "true"); + return + } + if (yslGuideone === undefined) { + window.localStorage.setItem('yslGuideone', "true"); + return + } + } catch (e) { + } } } @@ -265,19 +278,23 @@ class CoursesNew extends Component { if (response.status === 200) { // this.goback window.location.href=response.data.first_category_url; - var yslGuideone = window.localStorage.getItem('yslGuideone'); - try { - if(yslGuideone=== null){ - window.localStorage.setItem('yslGuideone', "true"); - return - } - if(yslGuideone=== undefined){ - window.localStorage.setItem('yslGuideone', "true"); - return - } - }catch (e) { + if(this.state.boolxinjian===true){ + var yslGuideone = window.localStorage.getItem('yslGuideone'); + try { + if(yslGuideone=== null){ + window.localStorage.setItem('yslGuideone', "true"); + return + } + if(yslGuideone=== undefined){ + window.localStorage.setItem('yslGuideone', "true"); + return + } + }catch (e) { + + } + + } - } } }).catch((error) => { console.log(error) diff --git a/public/react/src/modules/courses/shixunHomework/Guide.js b/public/react/src/modules/courses/shixunHomework/Guide.js index 29470190f..6be0ce3a5 100644 --- a/public/react/src/modules/courses/shixunHomework/Guide.js +++ b/public/react/src/modules/courses/shixunHomework/Guide.js @@ -6,7 +6,9 @@ import guihome2 from "../../../images/guideimg/guihome2.jpg"; import guihome3 from "../../../images/guideimg/guihome3.jpg"; import guihome4 from "../../../images/guideimg/guihome4.jpg"; import guihome5 from "../../../images/guideimg/guihome5.jpg"; -import guihome6 from "../../../images/guideimg/guihome6.jpg"; + import guihome6 from "../../../images/guideimg/guihome6.jpg"; +// import guihome6 from "../../../images/guideimg/guihome6.png"; +// import guihome7 from "../../../images/guideimg/guihome7.png"; class Guide extends Component { @@ -123,6 +125,7 @@ class Guide extends Component { page===6?
this.thissetPage(7)}/> + {/*this.thissetPage(7)}/>*/}
: "" diff --git a/public/react/src/modules/courses/shixunHomework/guide.css b/public/react/src/modules/courses/shixunHomework/guide.css index e571884a8..cd7ec9b0b 100755 --- a/public/react/src/modules/courses/shixunHomework/guide.css +++ b/public/react/src/modules/courses/shixunHomework/guide.css @@ -470,4 +470,49 @@ margin-left: 27%; margin-right: 0; height: 40%; +} + + + + + +.ysldiv71900{ + margin-top: 16%; + margin-left: 34%; + margin-right: 19% + +} +.ysldiv71680{ + margin-top: 18%; + margin-left: 31%; + margin-right: 14%; +} +.ysldiv71600{ + margin-top: 19%; + margin-left: 30%; + margin-right: 12%; +} +.ysldiv71440{ + margin-top: 21%; + margin-left: 28%; + margin-right: 8%; +} + +.ysldiv71280{ + margin-top: 24%; + margin-left: 25%; + margin-right: 3%; + height: 53%; +} +.ysldiv71366{ + margin-top: 22%; + margin-left: 26%; + margin-right: 6%; + height: 53%; +} +.ysldiv71024{ + margin-top: 31%; + margin-left: 27%; + margin-right: 0; + height: 40%; } \ No newline at end of file