Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/competition/Registration.js

@@ -219,7 +219,7 @@ class Registration extends React.Component {
 								//管理员
 								try {
 									this.setState({
-										type: result.data.competition_teams.length === 0 ? 1 : 4,
+										type: 4,
 										count: result.data.count,
 										data: result.data.my_teams,
 										competition_teams: result.data.competition_teams,

public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js

@@ -317,25 +317,26 @@ class CompetitionContents extends Component{
 						{
 							`
 							 .ant-table-tbody > tr > td:nth-last-child(4){
-									line-height: 63px;
+		   								//  line-height: 63px;
-									width: 300px;
+											// width: 300px;
-									height: 96px;
+											// height: 96px;
-
+											// // display: inline-flex;
-									overflow: hidden;
+											// overflow: hidden;
-									text-overflow: ellipsis;
+											// text-overflow: ellipsis;
-									white-space: nowrap;
+											// white-space: nowrap;
+											    width: 150px;
 							 }
 							.ant-table-tbody > tr > td:nth-last-child(3){
-			   						 line-height: 63px;
+											// line-height: 63px;
-										width: 300px;
+											// width: 290px;
-										height: 96px;
+											// height: 96px;
-										display: inline-block;
+											// display: inline-block;
-										overflow: hidden;
+											// overflow: hidden;
-										text-overflow: ellipsis;
+											// text-overflow: ellipsis;
-										white-space: nowrap;
+											// white-space: nowrap;
 								}
 								.ant-table-tbody>tr>td, .ant-table-thead>tr>th {
-										padding: 15px;
+										padding: 5px;
 								}
 							`
 						}