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

app/assets/javascripts/colleges/partner_manager_groups.js

@@ -26,9 +26,11 @@ $(document).on('turbolinks:load', function() {
       var managerGroupName = $link.data('name');
 
       if(managerGroupId && managerGroupId !== ''){
+        $managerGroupModal.find('.modal-title').html('重命名');
         $managerGroupIdInput.val(managerGroupId);
         $managerGroupNameInput.val(managerGroupName)
       } else {
+        $managerGroupModal.find('.modal-title').html('新建');
         $managerGroupIdInput.val('');
         $managerGroupNameInput.val('');
       }

public/assets/admin-9aebd63c5d91cdee009fd9a7c358a1247490eee319caabfa8d003358f615bdda.css

@@ -25595,7 +25595,6 @@ input.form-control {
 
 /* line 134, app/assets/stylesheets/admins/common.scss */
 .admin-body-container .batch-action-container {
-  margin-bottom: -15px;
   padding: 10px 20px 0;
   background: #fff;
 }

public/assets/college-1e70702e2d864fb4d5f57841bfa5937e31c7c059e6cd672a07f0b4b20740f607.js

@@ -115615,9 +115615,11 @@ $(document).on('turbolinks:load', function() {
       var managerGroupName = $link.data('name');
 
       if(managerGroupId && managerGroupId !== ''){
+        $managerGroupModal.find('.modal-title').html('重命名');
         $managerGroupIdInput.val(managerGroupId);
         $managerGroupNameInput.val(managerGroupName)
       } else {
+        $managerGroupModal.find('.modal-title').html('新建');
         $managerGroupIdInput.val('');
         $managerGroupNameInput.val('');
       }

public/assets/college-c2f61098e538cb20e0ebc026209bb909fe520eadf8facb31ac4a0b325c057089.css

@@ -17016,7 +17016,6 @@ input.form-control {
 
 /* line 126, app/assets/stylesheets/colleges/common.scss */
 .college-body-container .batch-action-container {
-  margin-bottom: -15px;
   padding: 10px 20px 0;
   background: #fff;
 }

public/assets/cooperative-4d519075d260a732f398fe474e2bee264487b2071ddf6c88de3ae3037c439ab3.css

@@ -25145,7 +25145,6 @@ input.form-control {
 
 /* line 126, app/assets/stylesheets/cooperative/common.scss */
 .cooperative-body-container .batch-action-container {
-  margin-bottom: -15px;
   padding: 10px 20px 0;
   background: #fff;
 }

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

@@ -131,8 +131,6 @@ class CompetitionContents extends Component{
 		}
 
 		{chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<3?"":chartdata.teams.map((item,key)=>{
-
-		 	if(key>2){
 				let list={
 					usersum:key+1,
 				  userimg:item.user_image,
@@ -143,7 +141,6 @@ class CompetitionContents extends Component{
 					user_login:item.user_login
 				}
 				datas.push(list)
-			}
 		 })}
 
 		// console.log(this.props&&this.props.mode)