diff --git a/public/react/src/modules/courses/coursesHome/coursesHome.js b/public/react/src/modules/courses/coursesHome/coursesHome.js index 6f9e0577c..994e14eb9 100644 --- a/public/react/src/modules/courses/coursesHome/coursesHome.js +++ b/public/react/src/modules/courses/coursesHome/coursesHome.js @@ -57,7 +57,7 @@ class coursesHome extends Component{ axios.get(upsystem).then((response)=>{ let updata=response.data; this.setState({ - updata + updata:updata }) }).catch((error)=>{ console.log(error); @@ -106,10 +106,9 @@ class coursesHome extends Component{ return (
- + />}
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js index 5400368ec..92f3c9f44 100644 --- a/public/react/src/modules/home/shixunsHome.js +++ b/public/react/src/modules/home/shixunsHome.js @@ -10,6 +10,8 @@ import { TPMIndexHOC } from '../tpm/TPMIndexHOC'; import SiderBar from '../tpm/SiderBar'; +import UpgradeModals from '../modals/UpgradeModals'; + import { SnackbarHOC , getImageUrl} from 'educoder'; import Slider from '@icedesign/base/lib/slider'; @@ -35,6 +37,15 @@ class ShixunsHome extends Component { } } componentDidMount(){ + const upsystem=`/users/system_update.json`; + axios.get(upsystem).then((response)=>{ + let updata=response.data; + this.setState({ + updata:updata + }) + }).catch((error)=>{ + console.log(error); + }) let url=`/home/index.json`; axios.get(url).then((response)=> { if(response.status===200){ @@ -106,6 +117,9 @@ class ShixunsHome extends Component { return (
+ {this.state.updata===undefined?"":} {/*懒加载*/} diff --git a/public/react/src/modules/modals/UpgradeModals.js b/public/react/src/modules/modals/UpgradeModals.js index 0bf06ff6e..e3d882ff4 100644 --- a/public/react/src/modules/modals/UpgradeModals.js +++ b/public/react/src/modules/modals/UpgradeModals.js @@ -18,6 +18,10 @@ class UpgradeModals extends Component { this.setState({ system_updates:true }) + }else if(SystemUpdateEndTime===undefined){ + this.setState({ + system_updates:true + }) }else if(moment(SystemUpdateEndTime) < moment(updata.end_time)){ this.setState({ system_updates:true @@ -31,9 +35,9 @@ class UpgradeModals extends Component { } componentDidUpdate(prevProps){ - if (prevProps.data!=this.props.updata) { - this.updatasmodals() - } + // if (prevProps.data!=this.props.updata){ + // this.updatasmodals() + // } } setmodalSave=()=>{ diff --git a/public/react/src/modules/paths/ShixunPathSearch.js b/public/react/src/modules/paths/ShixunPathSearch.js index cca9b0e94..da19e0521 100644 --- a/public/react/src/modules/paths/ShixunPathSearch.js +++ b/public/react/src/modules/paths/ShixunPathSearch.js @@ -71,7 +71,7 @@ class ShixunPathSearch extends Component{ axios.get(upsystem).then((response)=>{ let updata=response.data; this.setState({ - updata + updata:updata }) }).catch((error)=>{ console.log(error); @@ -108,10 +108,9 @@ class ShixunPathSearch extends Component{ let { order,sortList,search,page,total_count,select }=this.state; return (
- + />}
diff --git a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js index bbf63ca2d..468afc43a 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js +++ b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js @@ -52,7 +52,7 @@ class ShixunsIndex extends Component { axios.get(upsystem).then((response)=>{ let updata=response.data; this.setState({ - updata + updata:updata }) }).catch((error)=>{ console.log(error); @@ -379,12 +379,12 @@ class ShixunsIndex extends Component { render() { let {middleshixundata, typepvisible, pages, search_tags, keyword,parsedid,newtag_level,newpalce} = this.state; + console.log(this.state.updata) return (
- + />} {/**/} { - const upsystem=`/users/system_update.json`; + let upsystem=`/users/system_update.json`; axios.get(upsystem).then((response)=>{ let updata=response.data; this.setState({ - updata + updata:updata }) }).catch((error)=>{ console.log(error); @@ -68,7 +68,6 @@ class Infos extends Component{ //判断是否看的是当前用户的个人主页 componentDidUpdate =(prevProps)=> { if(this.props.current_user && prevProps.current_user != this.props.current_user){ - console.log(this.props); if(this.props.current_user.login != this.props.match.params.username){ this.setState({ is_current:false, @@ -226,10 +225,9 @@ class Infos extends Component{ moduleName=pathname.split("/")[3]; return(
- + />} { isRenders && this.cancelModulationModels()}/> }