From 91fd4fc40123122c6d2fe3149a61a32404b58c15 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, 24 Jul 2019 15:56:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/Interestpage.js | 4 ++-- .../react/src/modules/user/InterestpageMax.js | 20 ++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js index 4642707b2..2e1cdcca2 100644 --- a/public/react/src/modules/user/Interestpage.js +++ b/public/react/src/modules/user/Interestpage.js @@ -166,7 +166,7 @@ class InterestpageComponent extends Component { //兴趣页面点击 Interestcompletionpage(){ if(this.state.gouxuans.length === 0){ - this.openNotification("请选择您的职业"); + this.openNotification("请选择职业"); return } @@ -177,7 +177,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..22e53c968 100644 --- a/public/react/src/modules/user/InterestpageMax.js +++ b/public/react/src/modules/user/InterestpageMax.js @@ -71,7 +71,21 @@ 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 +185,7 @@ class InterestpageMax extends Component { setpagecomplet:true }) if(this.state.gouxuans.length === 0){ - this.openNotification("请选择您的职业"); + this.openNotification("请选择职业"); return } @@ -182,7 +196,7 @@ class InterestpageMax extends Component { } } if(ints.length<1){ - this.openNotification("内容是最少得选一个"); + this.openNotification("请至少选择一个您感兴趣的内容"); return } var url = "/users/interest.json"; From a44dbc2aea85ac0120e1fe62188ade5ae0c7b36e 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, 24 Jul 2019 15:57:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/Interestpage.js | 18 +++++++++++++++++- .../react/src/modules/user/InterestpageMax.js | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js index 2e1cdcca2..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, diff --git a/public/react/src/modules/user/InterestpageMax.js b/public/react/src/modules/user/InterestpageMax.js index 22e53c968..e0585ed33 100644 --- a/public/react/src/modules/user/InterestpageMax.js +++ b/public/react/src/modules/user/InterestpageMax.js @@ -71,6 +71,7 @@ class InterestpageMax extends Component { }if(response.data.repertoires[i].id===9){ qdkfys=rgzn; } + if(response.data.repertoires[i].id===1) { var datas = { id: response.data.repertoires[i].id, @@ -86,6 +87,7 @@ class InterestpageMax extends Component { url: qdkfys }; } + gouxuans4.push(datas); this.setState({ gouxuans4:gouxuans4, From a532653add259a460d525f6e5e4791eae7e22310 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, 24 Jul 2019 16:39:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/common.css | 2 +- public/react/src/modules/user/commontwo.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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;