From 20bbd96a330b6d540dfcfbbb3a5feb29159dd6f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 12 Nov 2019 16:36:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Competitioncommon/CompetitionCommon.css          |  6 ++++++
 .../CompetitionContentsChart.js                      | 12 ++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
index 5ec38aff5..d923c4a28 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
@@ -429,4 +429,10 @@
 }
 .competimgabsolute .ant-badge-count{
     box-shadow: none !important;
+}
+
+.competimgabsoluteijmg{
+    position: absolute;
+    left: 14px;
+    bottom: 0px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
index f2b2cd451..4f13bf213 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
@@ -85,7 +85,10 @@ class CompetitionContents extends Component{
 				key: 'userimg',
 				render:  (text, record) =>(
 					<a href={`/users/${record.user_login}`} target={"_blank"} className="color-dark">
-						<img className={"Competitionuserimg"} src={getImageUrl(`images/${record.userimg===null?`avatars/User/0?1442652658`:record.userimg}`)}/>
+						<div className={"relativef"}>
+					    	<img className={"Competitionuserimg mb10"} src={getImageUrl(`images/${record.userimg===null?`avatars/User/0?1442652658`:record.userimg}`)}/>
+						  	<div className={"competimgabsoluteijmg"}><Badge count={record.competition_prize} style={{ backgroundColor: '#459BE5' }} /></div>
+						</div>
 					</a>),
 			},
 			{
@@ -130,7 +133,7 @@ class CompetitionContents extends Component{
 
 		}
 
-		{chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<3?"":chartdata.teams.map((item,key)=>{
+		{chartdata===undefined?"":chartdata.teams.length===0?"":chartdata.teams.map((item,key)=>{
 				let list={
 					usersum:key+1,
 				  userimg:item.user_image,
@@ -138,7 +141,8 @@ class CompetitionContents extends Component{
 					school:item.school_name,
 					spendtime:item.spend_time,
 					score:item.score<50?"< 50 分":item.score,
-					user_login:item.user_login
+					user_login:item.user_login,
+					competition_prize:item.competition_prize
 				}
 				datas.push(list)
 		 })}
@@ -397,7 +401,7 @@ class CompetitionContents extends Component{
 							`
 						}
 					</style>
-					{chartdata === undefined ? "" : chartdata.teams.length === 0 || chartdata.teams.length < 4 ? "" :
+					{chartdata === undefined ? "" : chartdata.teams.length === 0 ? "" :
 						<Table className="Competitiontransparent" columns={columns} dataSource={datas} showHeader={false}
 									 pagination={false}/>}
 				</Row>