From aaaabd11c1e6cee3bcdcc670805ca5db28fceafe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 18 Jul 2019 10:57:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../competitions/_competitions_name.html.erb | 26 +++++-- app/views/layouts/_logined_header.html.erb | 1 + public/react/src/modules/tpm/NewHeader.js | 75 ++++++++++++++++--- public/stylesheets/educoder/edu-main.css | 3 +- 4 files changed, 88 insertions(+), 17 deletions(-) diff --git a/app/views/competitions/_competitions_name.html.erb b/app/views/competitions/_competitions_name.html.erb index ab7f3253..fa56359d 100644 --- a/app/views/competitions/_competitions_name.html.erb +++ b/app/views/competitions/_competitions_name.html.erb @@ -12,15 +12,31 @@
+ + function competitionfun(){ + localStorage.setItem('competition_uid', true); + } + + function setcompetitionfun(){ + competitionfun(); + window.location.href="/competitions" + } + diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index c36e2bc3..692330a2 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -128,6 +128,7 @@ $("#all_status_show_value").text("用户"); <% end %> <% end %> + if (window.localStorage) { var uid = localStorage.getItem('competition_uid'); } else { diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 45be29bd..4fb90a73 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -5,6 +5,8 @@ import PropTypes from 'prop-types'; import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; +import { Modal} from 'antd'; + // import searchImg from '../../../../images/educoder/icon/search.svg' // /images/educoder/icon/search.svg @@ -134,7 +136,8 @@ class NewHeader extends Component { ImageUrl:"", ecUrl:null, project_packages_url:null, - ImageUrlType:false + ImageUrlType:false, + competitiontype:false } } componentWillMount(){ @@ -230,9 +233,30 @@ class NewHeader extends Component { }); - + if (window.localStorage) { + var uid = localStorage.getItem('competition_uid'); + } else { + var uid = false + } + if(!uid){ + this.setState({ + competitiontype:true + }) + } } + setcompetitionfun=()=>{ + this.competitionfun(); + window.location.href="/competitions" + } + + competitionfun=()=>{ + this.setState({ + competitiontype:false + }) + localStorage.setItem('competition_uid', true); + } + render() { let {careerslist,isLogin,current_user,ImageUrl,ecUrl,ImageUrlType,project_packages_url} = this.state; // const isLogin = isLogintype; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。 @@ -268,6 +292,45 @@ class NewHeader extends Component { // console.log(match.path.startsWith("/ec_courses")) return (
+ + + + +
+
+ + this.competitionfun()} id="closeIcon" + style={{position: "absolute",right: "0px",top: "36px"}} + > + + + + + + this.setcompetitionfun()}> + + + +
+
+
{/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/} @@ -464,11 +527,3 @@ class NewHeader extends Component { export default NewHeader; - -//
    -//
  • 1{/*<%= link_to "首页", home_path %>*/}
    • -//
  • 2{/*<%= link_to "精选实训", shixuns_path %>*/}
    • -//
  • 3{/*<%= link_to "实训路径", subjects_path %>*/}
    • -//
  • 4{/*<%= link_to "在线课堂", courses_path %>*/}
    • -//
  • 5{/*<%= link_to "讨论组", forums_path %>*/}
    • -//
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 0df8d6e8..511685a2 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -1243,6 +1243,5 @@ html>body #ajax-indicator { position: fixed; } } .login_regs{ - margin-right: 35%; - width: 558px; + width: 580px !important; } \ No newline at end of file From e96a39155e798648143335348fc95ac4ef8178d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 18 Jul 2019 11:05:41 +0800 Subject: [PATCH 2/5] b --- public/react/src/modules/tpm/NewHeader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 4fb90a73..7c9e78e1 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -322,10 +322,10 @@ class NewHeader extends Component { - + this.setcompetitionfun()}> - +
From 8a15b45490b8483e076b5f547759cdd819a01775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 18 Jul 2019 11:10:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_unlogin_header.html.erb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index b69a87ec..e466ef2a 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -93,4 +93,15 @@ var sl=-Math.max(document.body.scrollLeft,document.documentElement.scrollLeft); document.getElementById('nHeader').style.left=sl+'px'; }; + + + if (window.localStorage) { + var uid = localStorage.getItem('competition_uid'); + } else { + var uid = false + } + if(!uid){ + var htmlvalue = "<%= escape_javascript(render :partial => 'competitions/competitions_name')%>"; + pop_box_new(htmlvalue, 500, 380); + } \ No newline at end of file From 48b38f32bb7958df611d467943b3f1cd8ca39310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 18 Jul 2019 11:13:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_unlogin_header.html.erb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index e466ef2a..ab5adc0e 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -94,14 +94,16 @@ document.getElementById('nHeader').style.left=sl+'px'; }; + $(function() { + if (window.localStorage) { + var uid = localStorage.getItem('competition_uid'); + } else { + var uid = false + } + if(!uid){ + var htmlvalue = "<%= escape_javascript(render :partial => 'competitions/competitions_name')%>"; + pop_box_new(htmlvalue, 500, 380); + } + }) - if (window.localStorage) { - var uid = localStorage.getItem('competition_uid'); - } else { - var uid = false - } - if(!uid){ - var htmlvalue = "<%= escape_javascript(render :partial => 'competitions/competitions_name')%>"; - pop_box_new(htmlvalue, 500, 380); - } \ No newline at end of file From a5665a02a8f757c50e9b2abf37d8d100d1016f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 18 Jul 2019 11:15:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/educoder/edu-main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 511685a2..93967795 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -1244,4 +1244,5 @@ html>body #ajax-indicator { position: fixed; } .login_regs{ width: 580px !important; + cursor: pointer; } \ No newline at end of file