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

app/assets/javascripts/admins/competition_settings/index.js

@@ -107,6 +107,19 @@ $(document).on('turbolinks:load', function(){
     }
 });
 
+//添加主办方或者开放范围
+function addSponsor(item){
+    var html='<div class="sponsor_label">\n' +
+        '              <input type="hidden" value="school_id" />\n' +
+        '              <span>caicai</span>\n' +
+        '              <a href="javascript:void(0)" onclick="del_sponsor(this)">×</a>\n' +
+        '            </div>';
+    $(item).parents(".sponsorPanel").append(html);
+}
+//删除
+function del_sponsor(item){
+    $(item).parents(".sponsor_label").remove();
+}
 
 $(function () {
     //MD编辑

app/assets/stylesheets/admins/competition_settings.scss

@@ -40,6 +40,33 @@
     line-height: 20px;
   }
 
+  .sponsor_label{
+    border:1px solid #4CACFF;
+    border-radius: 5px;
+    background-color: rgba(76,172,255,0.3);
+    color: #333;
+    padding:0px 4px;
+    height: 30px;
+    line-height: 30px;
+    float: left;
+    margin: 4px 5px;
+
+    span{
+      display: block;
+      float: left;
+      height: 28px;
+      line-height: 28px;
+      margin-right: 5px;
+    }
+
+    a{
+      font-size: 18px;
+      float: left;
+      height: 28px;
+      line-height: 28px;
+    }
+  }
+
   .large_panel{
     padding:0px 15px;
 

app/assets/stylesheets/common.scss

@@ -29,6 +29,7 @@ input.form-control {
 .flex-1 {
   flex: 1;
 }
+.fl{float: left}
 .no_padding{padding: 0px!important;}
 .font-12 { font-size: 12px !important; }
 .font-14 { font-size: 14px !important; }

app/views/admins/competition_settings/index.html.erb

@@ -93,12 +93,31 @@
           </div>
         </div>
 
-        <div class="row align-items-center mb-2">
+        <div class="row align-items-center d-flex mb-2">
           <div class="col-1 text-right">
             主办方
           </div>
-          <div class="col-5 text-left">
+          <div class="flex-1 text-left sponsorPanel">
+            <a href="javascript:void(0)" class="btn btn-white fl ml10" onclick="addSponsor(this)">+</a>
+            <div class="sponsor_label">
+              <input type="hidden" value="school_id" />
+              <span>caicai</span>
+              <a href="javascript:void(0)" onclick="del_sponsor(this)">×</a>
+            </div>
+          </div>
+        </div>
 
+        <div class="row align-items-center d-flex mb-2">
+          <div class="col-1 text-right">
+            开放范围
+          </div>
+          <div class="flex-1 text-left sponsorPanel">
+            <a href="javascript:void(0)" class="btn btn-white fl ml10" onclick="addSponsor(this)">+</a>
+            <div class="sponsor_label">
+              <input type="hidden" value="school_id" />
+              <span>caicai</span>
+              <a href="javascript:void(0)" onclick="del_sponsor(this)">×</a>
+            </div>
           </div>
         </div>