提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

public/home/search.js

@@ -578,14 +578,18 @@ function page(current){
     totalPage =Math.ceil(pageData.Total/pageSize);
     console.log("totalPage=" + totalPage);
     var html ="";
-    for(var i=startIndex-1;i < endIndex&&(i+currentPage)<totalPage;i++){
+    for(var i=startIndex-1; i < endIndex; i++){
         var  page_i = (currentPage + i);
+        if(page_i > totalPage){
+            break;
+        }
         if( i== 0){
             html += "<a id=\"page_"  + page_i+ "\" class=\"active item\" href=\"page(" + page_i +")\">" + page_i + "</a>";
         }else{
             html += "<a id=\"page_"  + page_i+ "\" class=\"item\" href=\"page(" + page_i +")\">" + page_i + "</a>";
         }
     }
+    console.log("html=" + html)
     document.getElementById("page_ids").innerHTML=html;
     if(currentPage >=totalPage){
         $('#nextPage').addClass("disabled");

templates/explore/search_new.tmpl

@@ -77,20 +77,18 @@
             
             <div class="center page buttons"  style="margin: 0px auto 15px">
 			   <div class="ui borderless mini pagination menu">
-				<span class="item" id="page_total">共 272 条</span>
+				<span class="item" id="page_total"></span>
 				<a id="startPage" class=" item navigation" href="javascript:page(1)"><span class="navigation_label">首页</span></a>
 				<a id="lastPage" class=" item navigation" href="javascript:prePage()">
 					<i class="left arrow icon"></i>
 				</a>
                 <span id="page_ids">
-				<a id="page_1" class="active item" href="">1</a>
-                <a id="page_2" class="item" href="">2</a>
-                <a id="page_n" class="disabled item">...</a>
+				
 				</span>
 				<a id="nextPage" class="item navigation" href="javascript:nextPage()">
 					<i class="icon right arrow"></i>
 				</a>
-				<a id="endPage" class="item navigation" href="javascript:endPage()"><span class="navigation_label">末页</span></a>
+				<a id="endPage" class="item navigation" href=""><span class="navigation_label">末页</span></a>
 				<div class="item"> 
         			前往<div class="ui input"><input id="inputpage" type="text" placeholder="1"></div>页
     			</div>