diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js index 4642707b2..dbca5a242 100644 --- a/public/react/src/modules/user/Interestpage.js +++ b/public/react/src/modules/user/Interestpage.js @@ -71,7 +71,23 @@ class InterestpageComponent extends Component { }if(response.data.repertoires[i].id===9){ qdkfys=rgzn; } - var datas={id:response.data.repertoires[i].id,name:response.data.repertoires[i].name,bool:false,url:qdkfys}; + + if(response.data.repertoires[i].id===1) { + var datas = { + id: response.data.repertoires[i].id, + name: response.data.repertoires[i].name, + bool: true, + url: qdkfys + }; + } else{ + var datas = { + id: response.data.repertoires[i].id, + name: response.data.repertoires[i].name, + bool: false, + url: qdkfys + }; + } + gouxuans4.push(datas); this.setState({ gouxuans4:gouxuans4, @@ -166,7 +182,7 @@ class InterestpageComponent extends Component { //兴趣页面点击 Interestcompletionpage(){ if(this.state.gouxuans.length === 0){ - this.openNotification("请选择您的职业"); + this.openNotification("请选择职业"); return } @@ -177,7 +193,7 @@ class InterestpageComponent extends Component { } } if(ints.length<1){ - this.openNotification("内容是最少得选一个"); + this.openNotification("请至少选择一个您感兴趣的内容"); return } var url = "/users/interest.json"; diff --git a/public/react/src/modules/user/InterestpageMax.js b/public/react/src/modules/user/InterestpageMax.js index fb3f1544c..e0585ed33 100644 --- a/public/react/src/modules/user/InterestpageMax.js +++ b/public/react/src/modules/user/InterestpageMax.js @@ -71,7 +71,23 @@ class InterestpageMax extends Component { }if(response.data.repertoires[i].id===9){ qdkfys=rgzn; } - var datas={id:response.data.repertoires[i].id,name:response.data.repertoires[i].name,bool:false,url:qdkfys}; + + if(response.data.repertoires[i].id===1) { + var datas = { + id: response.data.repertoires[i].id, + name: response.data.repertoires[i].name, + bool: true, + url: qdkfys + }; + } else{ + var datas = { + id: response.data.repertoires[i].id, + name: response.data.repertoires[i].name, + bool: false, + url: qdkfys + }; + } + gouxuans4.push(datas); this.setState({ gouxuans4:gouxuans4, @@ -171,7 +187,7 @@ class InterestpageMax extends Component { setpagecomplet:true }) if(this.state.gouxuans.length === 0){ - this.openNotification("请选择您的职业"); + this.openNotification("请选择职业"); return } @@ -182,7 +198,7 @@ class InterestpageMax extends Component { } } if(ints.length<1){ - this.openNotification("内容是最少得选一个"); + this.openNotification("请至少选择一个您感兴趣的内容"); return } var url = "/users/interest.json"; diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css index b80677ee5..d23412d07 100644 --- a/public/react/src/modules/user/common.css +++ b/public/react/src/modules/user/common.css @@ -70,7 +70,7 @@ margin-right: 129px; } .ysldivhome2{ - width: 100%; + width: 800px; display: flex; flex-flow: row wrap; align-content:stretch; diff --git a/public/react/src/modules/user/commontwo.css b/public/react/src/modules/user/commontwo.css index 718139f36..d25b888c8 100644 --- a/public/react/src/modules/user/commontwo.css +++ b/public/react/src/modules/user/commontwo.css @@ -71,6 +71,7 @@ margin-top: 10px; } .ysldivhome22{ + width: 800px; display: flex; flex-flow: row wrap; align-content:stretch;