一元捐前端弹框bug解决

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

@@ -581,7 +581,7 @@
             height: 20px;
             vertical-align: middle;
         }
-        .pop .body .button{
+        .pop .body button{
             width: 200px;
             height: 40px;
             line-height: 40px;
@@ -592,25 +592,9 @@
             border: none;
             outline: none;
         }
-        .pop .body .button:hover{
+        .pop .body button:hover{
             background: #be3b1b;
         }
-        .pop .body .buttonDisabled{
-            width: 200px;
-            height: 40px;
-            line-height: 40px;
-            font-size: 18px;
-            text-align: center;
-            background: #a0a0a0;
-            color: #fff;
-            border: none;
-            outline: none;
-            disabled: disabled;
-        }
-        .pop .body .buttonDisabled:hover{
-            background: #a0a0a0;
-        }
-
         #hover-background .x-floating-wrap {
             position: fixed;
             z-index: 5;
@@ -824,7 +808,7 @@
                 <!--弹出窗-->
                 <div class="pop">
                     <div class="header clearfix">
-                        <p class="fl">${project.name!''}</p>
+                        <p class="fl">捐款项目：${project.name!''}</p>
                         <div class="close fr" class="close">&times;</div>
                     </div>
                     <div class="body">
@@ -843,8 +827,8 @@
                         <div class="choose clearfix">
                             <span class="fl">支付方式：</span>
                             <div class="fl pay" id="pay-way">
-                                <div class="item active"><img src="static/images/zfb.png" alt=""/>支付宝</div>
-                                <div class="item"><img src="static/images/wx.png" alt=""/>微信支付</div>
+                                <div class="item active"><a href=""><img src="static/images/zfb.png" alt=""/>支付宝</a></div>
+                                <div class="item"><a href=""><img src="static/images/wx.png" alt=""/>微信支付</a></div>
                                <#-- <div class="item"><img src="static/images/bank.png" alt=""/>网银支付</div>-->
                             </div>
                         </div>
@@ -852,7 +836,7 @@
                             <span class="fl best">我的祝福：</span>
                             <textarea name="" id="" cols="30" rows="10" class="fl form-control"></textarea>
                             <div class="fl agree clearfix">
-                                <input type="checkbox" class="fl"><span class="fl"><a href="">同意并接受《优软一元捐用户协议》</a></span>
+                                <input type="checkbox" class="fl"><span class="fl">同意并接受《<a href="/userAgreement" target="_blank" style="color: #5078cb;">优软一元捐用户协议</a>》</span></span>
                             </div>
                         </div>
                        <button onclick="pay(${project.id!''}, money, payWay)" class="buttonDisabled">确认捐款</button><#--</a>-->

donate-service/src/main/webapp/resources/css/base.css

@@ -73,5 +73,5 @@ input,button,select,textarea{outline:none}
 /*通用颜色*/
 button[disabled] {
 	cursor: not-allowed;
-	background-color: #acabab;;
+	background-color: #acabab !important ;
 }

donate-service/src/main/webapp/resources/view/project/project_detail.html

@@ -514,16 +514,19 @@
         opacity: 0;
     }
     /*我要捐款弹出窗*/
+    .modal.in .modal-dialog{
+        position: fixed;
+        top: 50%;
+        margin-top: -205px;
+        width: 100%;
+        height: 100%;
+    }
     .pop{
         margin: 0 auto;
         width: 510px;
         height: 410px;
         text-align: center;
     }
-    .pop .modal-dialog .modal-content{
-        width: 510px;
-        height: 410px;
-    }
     .pop .header{
         padding: 0 20px;
         width: 100%;
@@ -662,14 +665,6 @@
     .pop .body button:hover{
         background: #be3b1b;
     }
-    .modal-open .modal {
-        width: 100%;
-        height: 100%;
-    }
-    .modal-open .modal .modal-dialog{
-        width: 510px;
-        height: 410px;
-    }
     /*项目详情 进度切换*/
     .main .section2 .bottom{
         display: none;
@@ -884,9 +879,9 @@
 </div>
 <!--捐款弹窗-->
 <!--捐款弹窗-->
-<div class="pop modal" role='dialog' id='layer'>
+<div class="modal" role='dialog' id='layer'>
     <div class="modal-dialog">
-        <div class="modal-content">
+        <div class="modal-content pop">
             <div class="header modal-header clearfix">
                 <p class="fl">捐款项目：{{project.name}}</p>
                 <div class="close fr" data-dismiss="modal">&times;</div>