From 7203345468132511716d8d3657b6c44888a1c320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 21 Oct 2019 15:27:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E6=B7=BB=E5=8A=A0=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E6=88=98=E9=98=9F=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/competition/Registration.js | 10 +- .../competition/comcss/competition.css | 88 ++++++++++++++- .../competition/competmodal/PersonModal.js | 8 +- .../competmodal/PersonalModalteam.js | 101 ++++++++++++++++++ 4 files changed, 201 insertions(+), 6 deletions(-) create mode 100644 public/react/src/modules/competition/competmodal/PersonalModalteam.js diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js index 89cca3e75..50da524cd 100644 --- a/public/react/src/modules/competition/Registration.js +++ b/public/react/src/modules/competition/Registration.js @@ -17,6 +17,7 @@ import RegistrationSearch from './RegistrationSearch'; import RegisListview from './RegisListview'; import RegisListviewdata from './RegisListviewdata'; import PersonModal from './competmodal/PersonModal'; +import PersonalModalteam from './competmodal/PersonalModalteam'; // 团队竞赛报名无报名 class Registration extends React.Component { constructor(props) { @@ -26,7 +27,9 @@ class Registration extends React.Component { loadingstate: false, page: 1, limit: 20, - type: 5, + type: 3, + tmodalsType: false, + tmodalsTypes: true, } } @@ -39,7 +42,7 @@ class Registration extends React.Component { } render() { - const {test, page, limit, type} = this.state; + const {test, page, limit, type, tmodalsType, tmodalsTypes} = this.state; const listItems = test.map((item, index) => ); @@ -57,7 +60,8 @@ class Registration extends React.Component { ` } - + +

在线竞赛 diff --git a/public/react/src/modules/competition/comcss/competition.css b/public/react/src/modules/competition/comcss/competition.css index 947b69067..4466a795d 100644 --- a/public/react/src/modules/competition/comcss/competition.css +++ b/public/react/src/modules/competition/comcss/competition.css @@ -19,6 +19,13 @@ background: #0dcecb; } +.registrationbackcenter { + display: flex; + display: -webkit-flex; + flex-direction: column; + align-items: center; +} + .registrationback1 { height: 368px; width: 1200px; @@ -565,8 +572,19 @@ reglistviewdivs2 { height: 38px; color: #4A4A4A; font-size: 16px; + border-radius: 3px; + cursor: pointer; } +.personbut1 p { + width: 100%; + height: 100%; + text-align: center; + margin-top: 10px; + color: #4A4A4A; + font-size: 16px; + cursor: pointer; +} .personbut2 { background: #459BE5; border-color: #459BE5; @@ -575,6 +593,74 @@ reglistviewdivs2 { height: 38px; color: #ffffff; font-size: 16px; + border-radius: 3px; + cursor: pointer; +} + +.personbut2 p { + width: 100%; + height: 100%; + text-align: center; + margin-top: 10px; + color: #ffffff; + font-size: 16px; + cursor: pointer; +} + +/*PersonModal.js*/ + + +/*PersonalModalteam.js*/ +.personaldiv { + display: flex; + display: -webkit-flex; + flex-direction: column; + align-items: center; +} + +.personaldivbutt1 { + + background: #F2F2F2; + border-color: #F2F2F2; + margin-right: 23px; + width: 100px; + height: 38px; + color: #4A4A4A; + font-size: 16px; + border-radius: 3px; + cursor: pointer; +} + +.personaldivbutt1 p { + width: 100%; + height: 100%; + text-align: center; + margin-top: 10px; + color: #666666; + font-size: 16px; + cursor: pointer; +} + +.personaldivbutt2 { + background: #459BE5; + border-color: #459BE5; + width: 100px; + height: 38px; + color: #ffffff; + font-size: 16px; + border-radius: 3px; + cursor: pointer; } -/*PersonModal.js*/ \ No newline at end of file +.personaldivbutt2 p { + width: 100%; + height: 100%; + text-align: center; + margin-top: 10px; + color: #ffffff; + font-size: 16px; + cursor: pointer; +} + + +/*PersonalModalteam.js*/ \ No newline at end of file diff --git a/public/react/src/modules/competition/competmodal/PersonModal.js b/public/react/src/modules/competition/competmodal/PersonModal.js index 4cd4920a4..2495759d5 100644 --- a/public/react/src/modules/competition/competmodal/PersonModal.js +++ b/public/react/src/modules/competition/competmodal/PersonModal.js @@ -537,8 +537,12 @@ class PersonModal extends Component { justifyContent: "center", width: "100%" }}> - - +

+

取消

+
+
+

确定

+
diff --git a/public/react/src/modules/competition/competmodal/PersonalModalteam.js b/public/react/src/modules/competition/competmodal/PersonalModalteam.js new file mode 100644 index 000000000..3ba02a72a --- /dev/null +++ b/public/react/src/modules/competition/competmodal/PersonalModalteam.js @@ -0,0 +1,101 @@ +import React, {Component} from 'react'; +import {getImageUrl} from 'educoder'; +import {Modal, Input, Spin, Tooltip, Icon, Dropdown, Button} from 'antd'; +import axios from 'axios'; +import competition from '../comcss/competition.css'; +import Registrationitem from "../Registrationitem"; +import InfiniteScroll from 'react-infinite-scroller'; +// import PersonModaltion from "./PersonModaltion"; +const {Search} = Input; + +//立即申请试用 +class PersonalModalteam extends Component { + + constructor(props) { + super(props); + this.state = {} + } + + + render() { + const { + addonAfter, test, test3, Numberofteammentors, Thecurrentnumber, person1, person2 + } = this.state; + //Modal + //keyboard是否支持键盘 esc 关闭 + //closable 是否显示右上角的关闭按钮 + //底部内容，当不需要默认底部按钮时，可以设为 footer={null} + //destroyOnClose 关闭时销毁 Modal 里的子元素 + //centered 垂直居中展示 Modal + //visible 弹出框是否显示 + + return ( + + + +
+
+

+ 邀请码： +

+ + + +
+ +
+
+
+

取消

+
+
+

确定

+
+
+
+
+ + ) + } +} + +export default PersonalModalteam; \ No newline at end of file