Merge branch 'hotfix/platform_coin_fix' of wmtx/platform into release

修改bug

Application/Admin/View/Promote/edit.html

@@ -2,6 +2,7 @@
 
 <block name="body">
 <!-- <link rel="stylesheet" type="text/css" href="__CSS__/admin_table.css" media="all"> -->
+<link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
 <script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
 <script type="text/javascript" src="__STATIC__/provincecityarea/area1.js"></script>
 <script type="text/javascript" src="__STATIC__/provincecityarea/AreaData_min.js"></script>
@@ -180,7 +181,7 @@
                     <tr>
                         <td class="l">推广公司：</td>
                         <td class="r">
-                            <select name="company_id" id="company_id"
+                            <select name="company_id" id="company_id" class="select_gallery"
                             <if condition="$data['level'] != 1">
                                     disabled style="background:#CCCCCC" </if>>
                             <option value="-1">请选择推广公司</option>
@@ -457,8 +458,9 @@
 
 <block name="script">
 <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
-  <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
-  <script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js" ></script>
+<script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
+<script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js" ></script>
+<script type="text/javascript" src="__JS__/select2.min.js"></script>
 <script type="text/javascript">
 //导航高亮
 highlight_subnav("{:U('Promote/lists')}");
@@ -474,7 +476,7 @@ $(function(){
     city="{:substr($data['bank_area'],2,2)}";
     ciarea="{:substr($data['bank_area'],4,2)}";
     //initComplexArea('seachprov', 'seachcity', 'seachdistrict', area_array, sub_array, prov, city, ciarea);
-
+    $(".select_gallery").select2();
     $("input[name=company_belong]").click(function () {
         if ($(this).val() == 1) {
             $('#company_relation').show();