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

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

@@ -511,7 +511,7 @@
     $("#chooseStatus").change(function(){
         //得到被选中的状态下拉框文本值
         var status=$("#chooseStatus").find("option:selected").text();
-        window.location.href="http://localhost:8084/activeCenter?status="+status;
+        window.location.href="http://lj.ubtob.com/activeCenter?status="+status;
     })
 
     //获取浏览器地址参数值
@@ -539,7 +539,7 @@
    $("#search").keydown(function(){
         if(event.keyCode==13){
             var search=$("#search").val();
-            window.location.href="http://localhost:8084/activeCenter?search="+search;
+            window.location.href="http://lj.ubtob.com/activeCenter?search="+search;
         }
    })
 
@@ -587,7 +587,7 @@
         var area=$("#chooseArea").find("option:selected").text();
         //得到被选中的状态下拉框文本值
         var status=$("#chooseStatus").find("option:selected").text();
-        window.location.href="http://localhost:8084/activeCenter?status="+status+"&&page="+(pno-1);
+        window.location.href="http://lj.ubtob.com/activeCenter?status="+status+"&&page="+(pno-1);
     }
 </script>
 </body>

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

@@ -872,7 +872,7 @@
         var area=$("#chooseArea").find("option:selected").text();
         //得到被选中的状态下拉框文本值
         var status=$("#chooseStatus").find("option:selected").text();
-        window.location.href="http://localhost:8084/index?area="+area+"&&status="+status+"&&page="+(pno-1);
+        window.location.href="http://lj.ubtob.com/index?area="+area+"&&status="+status+"&&page="+(pno-1);
     }
 
     $('#chooseArea').val(area);
@@ -887,7 +887,7 @@
             var area=$("#chooseArea").find("option:selected").text();
             //得到被选中的状态下拉框文本值
             var status=$("#chooseStatus").find("option:selected").text();
-            window.location.href="http://localhost:8084/index?area="+area+"&&status="+status;
+            window.location.href="http://lj.ubtob.com/index?area="+area+"&&status="+status;
         })
 
     //项目状态下拉框查询项目
@@ -896,14 +896,14 @@
         var area=$("#chooseArea").find("option:selected").text();
         //得到被选中的状态下拉框文本值
         var status=$("#chooseStatus").find("option:selected").text();
-        window.location.href="http://localhost:8084/index?area="+area+"&&status="+status;
+        window.location.href="http://lj.ubtob.com/index?area="+area+"&&status="+status;
     })
 
     //input搜索框查询项目
     $("#search").keydown(function(event){
       if(event.keyCode==13){
           var search=$("#search").val();
-          window.location.href="http://localhost:8084/index?search="+search;
+          window.location.href="http://lj.ubtob.com/index?search="+search;
       }
     })
 </script>

donate-service/src/main/webapp/resources/view/common/donate_over.html

@@ -0,0 +1,60 @@
+<style>
+    .donate-overflow{
+        width: 480px;
+        height: 220px;
+    }
+    .donate-overflow .header{
+        padding: 0 20px;
+        width: 100%;
+        height: 44px;
+        line-height: 44px;
+        overflow: hidden;
+        background: #eeeeee;
+    }
+    .donate-overflow .header p{
+        font-size: 16px;
+        color: #e96d08;
+        font-weight: bold;
+    }
+    .donate-overflow .header .close{
+        font-size: 38px;
+    }
+    .donate-overflow .body{
+        padding-top: 50px;
+        margin: 0 auto;
+        text-align: center;
+    }
+    .donate-overflow .body p{
+        margin-bottom: 45px;
+        font-size: 16px;
+        color: #505050;
+    }
+    .donate-overflow .body .btn{
+        margin: 0 auto;
+        text-align: center;
+    }
+    .donate-overflow .body .btn button{
+        width: 110px;
+        height: 34px;
+        font-size: 16px;
+        color: #fff;
+        background: #ef613b;
+        border-radius: 0;
+        border: none;
+        outline: none;
+        text-align: center;
+    }
+    .donate-overflow .body .btn button:hover{
+        background: #be3b1b;
+    }
+</style>
+<div class="donate-overflow">
+    <div class="header">
+        <p class="fl">系统提示</p>
+        <div class="close fr" id="close">&times;</div>
+    </div>
+    <div class="body">
+        <p>感谢您的善心,该项目筹得目标善款！</p>
+        <div class="btn"><button>确认</button></div>
+    </div>
+</div>