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

donate-service/src/main/webapp/WEB-INF/views/activeDetail.html

@@ -667,7 +667,7 @@
     </div>
 </div>
 <!--领奖弹出框-->
-<div class="pop modal" id="layer" role="dialog">
+<div class="pop modal" id="layer" role="dialog" data-backdrop="static">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="header modal-header clearfix">
@@ -719,7 +719,7 @@
     </div>
 </div>
 <!--领奖成功系统提示-->
-<div class="success modal" id="success" role="dialog">
+<div class="success modal" id="success" role="dialog" data-backdrop="static">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="header modal-header clearfix">
@@ -735,7 +735,7 @@
     </div>
 </div>
 <!--未中奖系统提示-->
-<div class="fail modal" id="fail" role="dialog">
+<div class="fail modal" id="fail" role="dialog" data-backdrop="static">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="header modal-header clearfix">
@@ -755,7 +755,5 @@
 <script src="static/lib/bootstrap/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="static/lib/require.js"
         data-main="static/js/activity/main.js"></script>
-<script>
-</script>
 </body>
 </html>