Merge remote-tracking branch 'origin/dev' into dev

donate-service/src/main/resources/templates/index.ftl

@@ -415,7 +415,7 @@
             width: 480px;
             /*height: 330px;*/
             text-align: center;
-            border: 1px solid #e1e1e1;
+            /*border: 1px solid #e1e1e1;*/
             display: none;
         }
         .pop .header{
@@ -734,7 +734,7 @@
                     <div class="header clearfix">
                         <p class="fl">${project.name!''}</p>
                         <#--<p>${project.id!''}</p>-->
-                        <div class="close fr" data-dismiss="modal">&times;</div>
+                        <div class="close fr" id="close">&times;</div>
                     </div>
                     <div class="body">
                         <div class="choose clearfix">
@@ -776,6 +776,7 @@
                         </div>
                     </div>
                 </div>
+            </div>
             </#list>
             </#if>
            <#-- 分页按钮-->
@@ -785,6 +786,9 @@
 </div>
 
 <script>
+    $('#close').click(function(){
+       $(this).parent().parent().css('display','none');
+    })
     function donate(e){
         $('.pop').css('display','none');
         $(e).siblings(".pop").css('display','block');