Merge branch 'test'

application/index/service/RankingListService.php

@@ -70,7 +70,7 @@ class RankingListService
         foreach ($resultArr as $key => $item) {
             $result[$i][$k++] = $item;
             if ($y == $total_page) {
-                if (($k == $x - 1) && ($i + 1) <= ($total_page - ($residue % $total_page))) {
+                if (($k == $x - 1) && ($residue % $total_page) > 0 && ($i + 1) <= ($total_page - ($residue % $total_page))) {
                     $k = 0;
                     ++$i;
                 } elseif ($k == $x) {

application/index/view/performance_ranking/performance_ranking.html

@@ -40,7 +40,7 @@
    		text-align:center ;
    		width : 20%; 
    		float:left;
-   		padding-bottom:0.30rem;
+   		padding-bottom:0.10rem;
    		/*border : 1px solid red;*/
    }
    .header-area{
@@ -49,7 +49,7 @@
 	   	height:0.58rem;
 	   	border-radius: 50%;
 	   	overflow: hidden;
-	   	background-color:#999999;
+	   	/*background-color:#999999;*/
 	   	position:relative;
 	   	left : 50% ; 
 	   	transform: translateX(-50%);
@@ -147,9 +147,6 @@
    .table {
    		margin-bottom : 0rem !important; 
    }
-
-	
-	
 	.table-scro::-webkit-scrollbar-track
 	{
 	    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
@@ -185,7 +182,7 @@
 			            				<span><strong>个人荣誉榜</strong></span>
 			            			</div>
 		            			</div>
-		            			<div class="col-xs-12" style="margin-top:0.07rem;" id="personList"></div>
+		            			<div class="col-xs-12" style="margin-top:0.07rem;padding-bottom:0.05rem;" id="personList"></div>
 		            		</div>
 	            		</div>
 	            		<div class="col-xs-4 p-a-10 p-t-0">

public/resource/js/performance_ranking.js

@@ -125,6 +125,7 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
 				console.log(data.data.list);
 				var tag = '' ;
 				for ( var i = 0 ; i < data.data.list.length ; i++ ){
+					
 					tag += '<div class="content" style="overflow:hidden;">';
 			        tag += '    <div class="col-xs-9 p-a-0">';
 	    			tag += '		<div class="col-xs-12 p-a-0 ">';
@@ -181,6 +182,11 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
 					imgUrl = url+data[i].img;
 				}
 				tag += '<div class="harf-in-five">';
+				tag += '	<div style="height:.2rem;width:40%;margin-left:30%">';
+				if ( i < 3 ){
+					tag += '		<image src="/resource/image/no'+(i+1)+'.png" />';
+				}
+				tag += '	</div>';
 		        tag += '    <div class="header-area">';
     			tag += '		<image src="'+ imgUrl +'"></image>';
     			tag += '	</div>';
@@ -216,6 +222,11 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
 					imgUrl = url+data[i].img;
 				}
 				tag += '<div class="harf-in-five">';
+				tag += '	<div style="height:.2rem;width:40%;margin-left:30%">';
+				if ( i < 3 ){
+					tag += '		<image src="/resource/image/no'+(i+1)+'.png" />';
+				}
+				tag += '	</div>';
 		        tag += '    <div class="header-area">';
     			tag += '		<image src="'+ imgUrl +'"></image>';
     			tag += '	</div>';