一元捐前端bug的解决

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

@@ -383,6 +383,17 @@
     <i></i>
 </div>
 <div ng-include src="'static/view/common/nav.html'"></div>
+<div id="nav">
+    <div class="container clearfix">
+        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span>一元捐</span></div>
+        <div class="fr">
+            <a href="https://account.ubtob.com/sso/login">登录</a>
+            <a href="javascript:void(0)">注册</a>
+            <a href="http://www.ubtob.com/" target="_blank">进入优软云</a>
+        </div>
+    </div>
+</div>
+
 <div class="main">
     <div class="container">
         <div class="section section1">
@@ -418,18 +429,18 @@
                         </a>
                     </div>
                     <div class="top-item">
-                        <a href="">
+                        <a href="/personalCenter">
                             <img src="static/images/index/icon_2.png" alt=""/>
                             <p>消息中心</p>
                             <em class="red"></em>
                         </a>
                     </div>
-                    <div class="top-item">
-                        <a href="">
-                            <img src="static/images/index/icon_3.png" alt=""/>
-                            <p>发起项目</p>
-                        </a>
-                    </div>
+                    <#--<div class="top-item">-->
+                        <#--<a href="selectInstitutionsNature">-->
+                            <#--<img src="static/images/index/icon_3.png" alt=""/>-->
+                            <#--<p>发起项目</p>-->
+                        <#--</a>-->
+                    <#--</div>-->
                 </div>
                 <div class="button">
                     <a href="/index"><span>项目中心</span></a><span class="active">活动中心</span>

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

@@ -12,7 +12,7 @@
     <link href="static/images/icon/u.png" rel="icon" type="image/x-icon" />
     <link rel="stylesheet" href="static/css/bootstrap.min.css">
     <link rel="stylesheet" href="static/css/base.css">
-    <link rel="stylesheet" type="text/css" href="static/css/kkpager_blue.css" />
+    <link rel="stylesheet" type="text/css" href="static/css/kkpager_orange.css" />
 
     <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
     <script type="text/javascript" src ="static/js/pay.js"></script>
@@ -346,7 +346,7 @@
         }
         .section2 .list-item .project-progress{
             width: 190px;
-            height: 130px;
+            /*height: 130px;*/
             margin: 15px 0 12px 0;
             padding-left: 20px;
             background: #f5f5f5;
@@ -355,21 +355,25 @@
             margin-bottom: 16px;
         }
         .section2 .list-item .project-progress div:first-child{
-            margin-top:26px;
+            margin-top:16px;
         }
         .section2 .list-item .project-progress div span{
-            font-size: 14px;
+            font-size: 13px;
             color: #787878;
         }
         .section2 .list-item .project-progress div span em{
-            font-size: 14px;
+            font-size: 13px;
             color: #323232;
             font-style: normal;
-            font-weight: bold;
+            /*font-weight: bold;*/
         }
-        .section2 .list-item .project-progress div:first-child span em {
-            font-weight: normal;
+        .section2 .list-item .project-progress div span em.red{
+            color: #ef613b;
+            font-weight: bold;
         }
+        /*.section2 .list-item .project-progress div:first-child span em {*/
+            /*font-weight: normal;*/
+        /*}*/
         .section2 .list-item a.donation{
             display: inline-block;
             width: 190px;
@@ -638,9 +642,6 @@
         .show{
             display: block;
         }
-        #kkpager {
-            margin-bottom: 130px!important;
-        }
         #carousel-fragment li {
             width: 12px;
             height: 12px;
@@ -714,18 +715,18 @@
                         </a>
                     </div>
                     <div class="top-item">
-                        <a href="personalCenter">
+                        <a href="/personalCenter">
                             <img src="static/images/index/icon_2.png" alt=""/>
                             <p>消息中心</p>
                             <em class="red"></em>
                         </a>
                     </div>
-                    <div class="top-item">
-                        <a href="selectInstitutionsNature">
-                            <img src="static/images/index/icon_3.png" alt=""/>
-                            <p>发起项目</p>
-                        </a>
-                    </div>
+                    <#--<div class="top-item">-->
+                        <#--<a href="selectInstitutionsNature">-->
+                            <#--<img src="static/images/index/icon_3.png" alt=""/>-->
+                            <#--<p>发起项目</p>-->
+                        <#--</a>-->
+                    <#--</div>-->
                 </div>
                 <div class="button">
                     <span class="active">项目中心</span><a href="activeCenter"><span>活动中心</span></a>
@@ -733,12 +734,12 @@
                 <!--切换&ndash;&gt;-->
                 <div class="buttons show">
                     <div class="bottom-item">
-                        <div class="title"><span>历史参加人数</span></div>
+                        <div class="title"><span>历史参加人次</span></div>
                         <div class="count"><span class="historyperson">${historyPerson!''}</span><span>人次</span></div>
                     </div>
                     <div class="bottom-item">
                         <div class="title"><span>历史捐款总额</span></div>
-                        <div class="count" style="margin-left: -10px;"><span class="totality">${totality!''}</span><span>元</span></div>
+                        <div class="count" style="margin-left: -14px;"><span class="totality">${totality!''}</span><span>元</span></div>
                     </div>
                 </div>
             </div>
@@ -783,9 +784,10 @@
                     <div><span>执&nbsp;行&nbsp;方：</span><span>${project.orgName!''}</span></div>
                 </div>
                 <div class="project-progress fr">
-                    <div><span>项目状态：<em>${project.overdue!''}</em></span></div>
-                    <div><span>已参与：<em>${project.joinAmount!'0'}</em>人</span></div>
-                    <div><span>已筹款：<em>${project.totalAmount!'0'}</em>元<#if project.target?exists><#if project.totalAmount?exists>(${project.totalAmount/project.target*100!''}%)</#if></#if></span></div>
+                    <div><span>状态：<em>${project.overdue!''}</em></span></div>
+                    <div><span>参与：<em>${project.joinAmount!'0'}</em>人</span></div>
+                    <div><span>筹款：<em class="red">${project.totalAmount!'0'}</em>元</span></div>
+                    <div><span>进度：<#if project.target?exists><#if project.totalAmount?exists>(${project.totalAmount/project.target*100!''}%)</#if></#if></span></div>
                 </div>
                     <a class="fr donation" onclick="donate(this)">我要捐款</a>
                 </div>
@@ -813,7 +815,7 @@
                             <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"><img src="static/images/bank.png" alt=""/>网银支付</div>
+                                <#--<div class="item"><img src="static/images/bank.png" alt=""/>网银支付</div>-->
                             </div>
                         </div>
                         <div class="choose clearfix">

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

@@ -179,7 +179,7 @@
                 <div class="item fl">
                     <p>捐款方式：微信支付</p>
                     <p>执行机构：深圳市优软科技有限公司</p>
-                    <p>参与活动：优软一元捐感恩活动03</p>
+                    <!--<p>参与活动：优软一元捐感恩活动03</p>-->
                 </div>
             </div>
             <div class="txt">捐款成功后自动参与<span>【优软一元捐感恩回馈07】</span>活动，将有机会获得丰厚奖品。<a href="">立即查看</a></div>

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

@@ -809,7 +809,7 @@
     <div class="container">
         <div class="section">
           <div class="nav">
-              <span><a href="">项目列表</a></span><span>&gt;</span><span>个人中心</span>
+              <span><a href="/">首页</a></span><span>&gt;</span><span>个人中心</span>
           </div>
           <div class="personalCenter clearfix">
             <div class="personal-center fl">

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

@@ -1,4 +1,5 @@
 #kkpager{
+	margin-top: 20px;
 	clear:both;
 	color:#999;
 	padding:5px 0px 5px 0px;
@@ -33,20 +34,20 @@
 }
 #kkpager span.curr{
 	float: left;
-	border: 1px solid #FF6600;
 	display: inline;
 	padding: 3px 10px 3px 10px;
 	margin-right: 5px;
 	border-radius: 3px;
 	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
-	background: #FFEEE5;
-	color: #FF6600;
+	border: 1px solid #ef613b;
+	background: #ef613b;
+	color: #fff;
 }
 #kkpager a:hover{
-	border:1px solid #FF6600; 
-	background-color:#FF6600; 
-	color:#fff;
+	border: 1px solid #ef613b;
+	background-color: #ef613b;
+	color: #fff;
 }
 #kkpager span.normalsize{
 }
@@ -56,27 +57,29 @@
 	top:0px;
 }
 #kkpager_btn_go {
-	width:44px;
-	height:18px;
+	margin:0px;
+	top: -4px;
+	margin-top: 0;
+	margin-left: 15px;
+	width: 45px;
+	height: 25px;
+	background: #ef613b;
 	border:0px;
 	overflow:hidden;
 	line-height:140%;
 	padding:0px;
-	margin:0px;
 	text-align:center;
 	cursor:pointer;
-	background-color:#FF6600;
 	color:#FFF;
 	position:absolute;
 	left:0px;
-	top:-2px;
 	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	display:none;
 }
 #kkpager_btn_go_input{
-	width:36px;
-	height:14px;
+	width: 30px;
+	height: 25px;
 	color:#999;
 	text-align:center;
 	margin-left:1px;
@@ -98,7 +101,9 @@
 	float:left;
 }
 #kkpager .infoTextAndGoPageBtnWrap{
-	float:right;
+	margin-left: 15px;
+	padding-top: 0;
+	float: left;
 }
 #kkpager .spanDot{
 	float:left;
@@ -110,5 +115,5 @@
 }
 
 #kkpager .infoTextAndGoPageBtnWrap{
-	padding-top:5px;
+	padding-top:0px;
 }

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

@@ -182,7 +182,7 @@
                 <div class="item fl">
                     <p>捐款方式：{{projectRecode.way}}</p>
                     <p>执行机构：{{projectRecode.orgName}}</p>
-                    <p>参与活动：</p>
+                    <!--<p>参与活动：</p>-->
                 </div>
             </div>
             <div class="txt">捐款成功后自动参与<span>【优软一元捐感恩回馈07】</span>活动，将有机会获得丰厚奖品。<a href="">立即查看</a></div>