From b52afe0f8b3e86b6f0ebdca48a74d818d637fe53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 18 Oct 2019 15:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/competition/RegisListview.js  | 14 +--
 .../modules/competition/RegisListviewdata.js  | 86 +++++++++++++++++++
 .../src/modules/competition/Registration.js   |  5 +-
 .../modules/competition/Registrationitem.js   | 10 +--
 .../competition/comcss/competition.css        | 27 ++++--
 5 files changed, 125 insertions(+), 17 deletions(-)
 create mode 100644 public/react/src/modules/competition/RegisListviewdata.js

diff --git a/public/react/src/modules/competition/RegisListview.js b/public/react/src/modules/competition/RegisListview.js
index 92146399f..60d8947b8 100644
--- a/public/react/src/modules/competition/RegisListview.js
+++ b/public/react/src/modules/competition/RegisListview.js
@@ -30,11 +30,15 @@ class RegisListview extends React.Component {
 					backgroundPosition: "center",
 					backgroundSize: "110% 100%",
 				}}>
-					<p style={{fontSize: "16px", color: "#05101A", width: "79px", textAlign: "center"}}>创建者</p>
-					<p style={{fontSize: "16px", color: "#05101A", width: "160px", textAlign: "center"}}>战队名称</p>
-					<p style={{fontSize: "16px", color: "#05101A", width: "277px", textAlign: "center"}}>战队成员</p>
-					<p style={{fontSize: "16px", color: "#05101A", width: "96px", textAlign: "center"}}>学校</p>
-					<p style={{fontSize: "16px", color: "#05101A", width: "151px", textAlign: "center"}}>时间</p>
+					<p className="borders"
+						 style={{fontSize: "16px", color: "#05101A", width: "79px", textAlign: "center"}}>创建者</p>
+					<p className="borders"
+						 style={{fontSize: "16px", color: "#05101A", width: "160px", textAlign: "center"}}>战队名称</p>
+					<p className="borders"
+						 style={{fontSize: "16px", color: "#05101A", width: "527px", textAlign: "center"}}>战队成员</p>
+					<p className="borders" style={{fontSize: "16px", color: "#05101A", width: "96px", textAlign: "center"}}>学校</p>
+					<p className="borders"
+						 style={{fontSize: "16px", color: "#05101A", width: "151px", textAlign: "center"}}>时间</p>
 				</div>
 			</div>
 		)
diff --git a/public/react/src/modules/competition/RegisListviewdata.js b/public/react/src/modules/competition/RegisListviewdata.js
new file mode 100644
index 000000000..a665783ec
--- /dev/null
+++ b/public/react/src/modules/competition/RegisListviewdata.js
@@ -0,0 +1,86 @@
+import React, {Component} from 'react';
+import {
+	BrowserRouter as Router,
+	Route,
+	Switch
+} from 'react-router-dom';
+import axios from 'axios';
+import moment from 'moment';
+import competition from './comcss/competition.css';
+import {Checkbox, Table, Pagination, Menu, Icon} from "antd";
+import Rectanglex from "./Rectanglex.png";
+
+// 团队竞赛报名无报名子组件团队 在线竞赛 > 全国高校计算机大赛-项目挑战>
+class RegisListviewdata extends React.Component {
+	constructor(props) {
+		super(props)
+
+	}
+
+
+	render() {
+		return (
+			<div className="reglistviewdivs2">
+				<div className="reglistviewdivss borders" style={{
+					width: "100%",
+					display: "flex",
+					justifyContent: " space-around",
+					alignItems: "center",
+					backgroundPosition: "center",
+					marginTop: "27px",
+
+				}}>
+					<div style={{width: "79px"}}>
+						<div className="reglistimg1">
+							<div className="reglistimg2">
+
+							</div>
+							<p>小猫头像</p>
+						</div>
+					</div>
+					<div className="borders"
+							 style={{fontSize: "16px", color: "#05101A", width: "160px", textAlign: "center"}}>猫头鹰没头绪高校战队
+					</div>
+					<div style={{width: "277px"}}>
+						<div style={{
+							width: "100%",
+							display: "flex",
+							justifyContent: " space-around",
+							alignItems: "center",
+							backgroundPosition: "center",
+
+						}}>
+							<div className="regitemimgs">
+
+							</div>
+							<div className="regitemimgs2">
+
+							</div>
+							<div className="regitemimgs2">
+
+							</div>
+							<div className="regitemimgs2">
+
+							</div>
+							<div className="regitemimgs2">
+
+							</div>
+							<div className="regitemimgs2">
+
+							</div>
+							<div className="regitemimgs22">
+
+							</div>
+						</div>
+
+					</div>
+					<div style={{width: "96px"}}>学校</div>
+					<div style={{width: "151px"}}>时间</div>
+				</div>
+			</div>
+		)
+	}
+
+}
+
+export default RegisListviewdata;
diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js
index 6cf22015f..3aa167aca 100644
--- a/public/react/src/modules/competition/Registration.js
+++ b/public/react/src/modules/competition/Registration.js
@@ -15,7 +15,7 @@ import RegisNodata from './RegisNodata';
 import CompetitionMaxImg from './CompetitionMaxImg';
 import RegistrationSearch from './RegistrationSearch';
 import RegisListview from './RegisListview';
-
+import RegisListviewdata from './RegisListviewdata';
 // 团队竞赛报名无报名
 class Registration extends React.Component {
 	constructor(props) {
@@ -48,7 +48,8 @@ class Registration extends React.Component {
 					{/*<Registrationitem></Registrationitem>*/}
 					<RegistrationSearch></RegistrationSearch>
 					<RegisListview></RegisListview>
-
+					<Registrationitem></Registrationitem>
+					{/*<RegisListviewdata></RegisListviewdata>*/}
 
 				</div>
 
diff --git a/public/react/src/modules/competition/Registrationitem.js b/public/react/src/modules/competition/Registrationitem.js
index 0de16ecef..c499f5707 100644
--- a/public/react/src/modules/competition/Registrationitem.js
+++ b/public/react/src/modules/competition/Registrationitem.js
@@ -24,13 +24,13 @@ class Registrationitem extends React.Component {
 		return (
 
 			<div className="regitem">
-				<div className="regitemimg1">
+				<div className="regitemimg1 borders">
 					<div className="regitemimg2">
 
 					</div>
 					<p>小猫头像</p>
 				</div>
-				<div style={{
+				<div className="borders" style={{
 					marginTop: "29px",
 					marginLeft: "40px"
 				}}>
@@ -42,7 +42,7 @@ class Registrationitem extends React.Component {
 						textAlign: "center"
 					}}>重庆邮电大学</p>
 				</div>
-				<div style={{
+				<div className="borders" style={{
 					marginLeft: "40px",
 					display: "flex",
 					flexDirection: "initial",
@@ -70,7 +70,7 @@ class Registrationitem extends React.Component {
 
 					</div>
 				</div>
-				<div>
+				<div className="borders">
 					<p style={{
 						border: "1px solid",
 						marginTop: "30px",
@@ -79,7 +79,7 @@ class Registrationitem extends React.Component {
 						marginLeft: "20px"
 					}}>邀请码：yngh5</p>
 				</div>
-				<div className="regitemimgs3">
+				<div className="regitemimgs3 ">
 				</div>
 				<div className="regitemimgs4">
 					<div className="regitemimgs5">
diff --git a/public/react/src/modules/competition/comcss/competition.css b/public/react/src/modules/competition/comcss/competition.css
index 68766d158..0df42417b 100644
--- a/public/react/src/modules/competition/comcss/competition.css
+++ b/public/react/src/modules/competition/comcss/competition.css
@@ -377,10 +377,6 @@
 
 /*RegisListview.js*/
 .reglistviewdivs {
-    display: flex;
-    display: -webkit-flex;
-    flex-direction: column;
-    align-items: center;
     margin-top: 25px;
 
 }
@@ -391,5 +387,26 @@
 
 }
 
+reglistviewdivs2 {
+    margin-top: 27px;
+
+}
+/*RegisListview.js*/
+
+
+/*RegisListviewdata.js*/
+.reglistimg1 {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+
+}
+
+.reglistimg2 {
+    border: 1px solid;
+    height: 78px;
+    width: 78px;
+}
 
-/*RegisListview.js*/
\ No newline at end of file
+/*RegisListviewdata.js*/
\ No newline at end of file