From 5b5f9a601446810296c2d76c1cf37a18e4a38239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 26 Oct 2019 10:10:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=89=E9=92=AE=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/competition/CompetitionMaxImg.js  | 63 +++++++++++++++----
 .../competition/comcss/competition.css        | 12 ++--
 2 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/public/react/src/modules/competition/CompetitionMaxImg.js b/public/react/src/modules/competition/CompetitionMaxImg.js
index ce12ade1c..9f9906487 100644
--- a/public/react/src/modules/competition/CompetitionMaxImg.js
+++ b/public/react/src/modules/competition/CompetitionMaxImg.js
@@ -53,15 +53,18 @@ class CompetitionMaxImg extends React.Component {
 						</div>
 						:
 						type === 3 ?
+
 							<div className="registrationback"
-									 style={{"background": `url(${getImageUrl(`images/educoder/competitions/tipregistit.jpg`)})`}}>
+									 style={{"background": `url(${getImageUrl(`images/educoder/competitions/tipregistit.jpg`)})`}}
+							>
 								<p className="registrationbackp1">Educoder竞赛平台</p>
-								<p className="registrationbackp4">高校智能课堂与综合实训平台</p>
-								<div className="registrationbackp2button2">
-									<div className="registbut11">
+								<p className="registrationbackp2">Educoder是一个面向计算机类的互联网IT教育和实战平台，</p>
+								<p className="registrationbackp3">提供企业级工程实训，以实现工程化专业教学的自动化和智能化。</p>
+								<div className="registrationbackp2button">
+									<div className="registbut1">
 										<p onClick={() => this.props.Jointheteam()}>加入战队</p>
 									</div>
-									<div className="registbut22">
+									<div className="registbut2">
 										<p onClick={() => this.props.Createateam()}>创建战队</p>
 									</div>
 
@@ -69,15 +72,18 @@ class CompetitionMaxImg extends React.Component {
 							</div>
 							:
 							type === 4 || type === 5 ?
-								<div className="registrationback1"
-										 style={{"background": `url(${getImageUrl(`images/educoder/competitions/tipregistit.jpg`)})`}}>
-									<p className="registrationbackp11">Educoder竞赛平台</p>
-									<p className="registrationbackp22">高校智能课堂与综合实训平台</p>
-									<div className="registrationbackp2button3">
-										<div className="registbut111">
+
+								<div className="registrationback"
+										 style={{"background": `url(${getImageUrl(`images/educoder/competitions/tipregistit.jpg`)})`}}
+								>
+									<p className="registrationbackp1">Educoder竞赛平台</p>
+									<p className="registrationbackp2">Educoder是一个面向计算机类的互联网IT教育和实战平台，</p>
+									<p className="registrationbackp3">提供企业级工程实训，以实现工程化专业教学的自动化和智能化。</p>
+									<div className="registrationbackp2button">
+										<div className="registbut1">
 											<p onClick={() => this.props.Jointheteam()}>加入战队</p>
 										</div>
-										<div className="registbut222">
+										<div className="registbut2">
 											<p onClick={() => this.props.Createateam()}>创建战队</p>
 										</div>
 
@@ -122,3 +128,36 @@ class CompetitionMaxImg extends React.Component {
 }
 
 export default CompetitionMaxImg;
+
+// // type3
+// /*<div className="registrationback"*/
+// /*		 style={{"background": `url(${getImageUrl(`images/educoder/competitions/tipregistit.jpg`)})`}}>*/
+// /*	<p className="registrationbackp1">Educoder竞赛平台</p>*/
+// /*	<p className="registrationbackp4">高校智能课堂与综合实训平台</p>*/
+// /*	<div className="registrationbackp2button2">*/
+// /*		<div className="registbut11">*/
+// /*			<p onClick={() => this.props.Jointheteam()}>加入战队</p>*/
+// /*		</div>*/
+// /*		<div className="registbut22">*/
+// /*			<p onClick={() => this.props.Createateam()}>创建战队</p>*/
+// /*		</div>*/
+//
+// /*	</div>*/
+// /*</div>*/
+//
+//
+// // type === 4 || type === 5
+// // <div className="registrationback1"
+// // 		 style={{"background": `url(${getImageUrl(`images/educoder/competitions/tipregistit.jpg`)})`}}>
+// // 	<p className="registrationbackp11">Educoder竞赛平台</p>
+// // 	<p className="registrationbackp22">高校智能课堂与综合实训平台</p>
+// // 	<div className="registrationbackp2button3">
+// // 		<div className="registbut111">
+// // 			<p onClick={() => this.props.Jointheteam()}>加入战队</p>
+// // 		</div>
+// // 		<div className="registbut222">
+// // 			<p onClick={() => this.props.Createateam()}>创建战队</p>
+// // 		</div>
+// //
+// // 	</div>
+// // </div>
\ No newline at end of file
diff --git a/public/react/src/modules/competition/comcss/competition.css b/public/react/src/modules/competition/comcss/competition.css
index f9f8fe63a..e5df077ce 100644
--- a/public/react/src/modules/competition/comcss/competition.css
+++ b/public/react/src/modules/competition/comcss/competition.css
@@ -118,10 +118,10 @@
 .registbut1 {
     margin-right: 46px;
     text-align: center;
-    background: #ffffff;
+    background: #0BDEE6;
+    border-radius: 10px;
     height: 54px;
     width: 156px;
-    border-radius: 4px;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -181,7 +181,7 @@
 .registbut1 p {
     width: 100%;
     height: 100%;
-    color: #05101A;
+    color: #ffffff;
     line-height: 54px;
     font-size: 20px;
     font-weight: bold;
@@ -205,7 +205,7 @@
     line-height: 54px;
     width: 100%;
     height: 100%;
-    color: #05101A;
+    color: #ffffff;
     font-size: 20px;
     font-weight: bold;
     cursor: pointer
@@ -235,10 +235,10 @@
     text-align: center;
     color: #05101A;
     font-size: 20px;
-    background: #ffffff;
+    background: #F8EC25;
     height: 54px;
     width: 156px;
-    border-radius: 4px;
+    border-radius: 10px;
     display: flex;
     align-items: center;
     justify-content: center;