From 746cfef99323d17d03eef50e1ad412a23c53e143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 13 Aug 2019 11:44:09 +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 | 37 ++++++++++++------- .../src/modules/courses/new/CoursesNew.js | 9 +++-- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js index 39eeaf115..9c1923452 100644 --- a/public/react/src/modules/courses/ListPageIndex.js +++ b/public/react/src/modules/courses/ListPageIndex.js @@ -69,16 +69,20 @@ class ListPageIndex extends Component{ super(props); this.state={ yslGuideone:undefined, + mysearch:undefined, } } componentDidMount(){ - var yslGuideone = window.localStorage.getItem('yslGuideone'); + var yslGuideone = window.sessionStorage.getItem('yslGuideone'); console.log("77"); console.log(yslGuideone); + var mysearchs= this.props.location.search===""?undefined:this.props.location.search===undefined?undefined:this.props.location.search==="?exhibition=true"?true:undefined; this.setState({ yslGuideone:yslGuideone, + mysearch:mysearchs, }) + } // // getleftNavid=(navid,newselectnavid)=>{ @@ -89,37 +93,42 @@ class ListPageIndex extends Component{ // }) // } componentWillUnmount(){ - window.localStorage.setItem('yslGuideone', false); - + window.sessionStorage.setItem('yslGuideone', false); } setwindowlocal=(bool)=>{ - window.localStorage.setItem('yslGuideone', bool); + window.sessionStorage.setItem('yslGuideone', bool); this.setState({ yslGuideone:bool, - }) + mysearch:undefined, + }); + var currenturl = this.props.location.pathname; + var newUrl = (currenturl.split("?"))[0]; + window.history.pushState('','',newUrl); } render() { - let {yslGuideone} =this.state; - console.log("98"); - console.log(yslGuideone); - console.log(this.props.isAdmin()); - var yslGuideones = window.localStorage.getItem('yslGuideone'); + let {yslGuideone,mysearch} =this.state; + // console.log("98"); + // console.log(yslGuideone); + // console.log(this.props.isAdmin()); + // // var yslGuideones = window.sessionStorage.getItem('yslGuideone'); + // console.log(this.props); + // console.log(this.props.location.search); return (
{/*头部banner*/} - {yslGuideones!==undefined? + {mysearch!==undefined? ( - yslGuideones===true? + mysearch===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 beb3c74a9..7dcc9bce7 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -205,8 +205,9 @@ class CoursesNew extends Component { // debugger if (response.data.status === 0) { // this.goback() - window.location.href=first_category_url; - window.localStorage.setItem('yslGuideone', true); + + window.location.href=first_category_url+"?exhibition=true"; + window.sessionStorage.setItem('yslGuideone', true); } }).catch((error) => { console.log(error) @@ -250,8 +251,8 @@ class CoursesNew extends Component { ).then((response) => { if (response.status === 200) { // this.goback - window.location.href=response.data.first_category_url; - window.localStorage.setItem('yslGuideone', true); + window.location.href=response.data.first_category_url+"?exhibition=true"; + window.sessionStorage.setItem('yslGuideone', true); } }).catch((error) => { console.log(error)