解决方案调整

jpress-web-core/src/main/java/io/jpress/core/render/freemarker/BasePaginateTag.java

@@ -15,14 +15,13 @@
  */
 package io.jpress.core.render.freemarker;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.jfinal.plugin.activerecord.Page;
-
 import io.jpress.model.query.OptionQuery;
 import io.jpress.utils.StringUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public abstract class BasePaginateTag extends JTag {
 
 	final Page<?> page;
@@ -59,20 +58,20 @@ public abstract class BasePaginateTag extends JTag {
 			return;
 		}
 
-		int startPage = currentPage - 4;
+		int startPage = currentPage - 3;
 		if (startPage < 1) {
 			startPage = 1;
 		}
-		int endPage = currentPage + 4;
+		int endPage = currentPage + 3;
 		if (endPage > totalPage) {
 			endPage = totalPage;
 		}
 
-		if (currentPage <= 8) {
+		if (currentPage <= 6) {
 			startPage = 1;
 		}
 
-		if ((totalPage - currentPage) < 8) {
+		if ((totalPage - currentPage) < 6) {
 			endPage = totalPage;
 		}
 
@@ -83,7 +82,7 @@ public abstract class BasePaginateTag extends JTag {
 			pages.add(new PaginateItem(previousClass, getUrl(currentPage - 1), previousText));
 		}
 
-		if (currentPage > 8 && !onlyShowPreviousAndNext) {
+		if (currentPage > 6 && !onlyShowPreviousAndNext) {
 			pages.add(new PaginateItem("", getUrl(1), "1"));
 			pages.add(new PaginateItem("", getUrl(2), "2"));
 			pages.add(new PaginateItem(disabledClass, "javascript:;", "..."));
@@ -99,7 +98,7 @@ public abstract class BasePaginateTag extends JTag {
 			}
 		}
 
-		if ((totalPage - currentPage) >= 8 && !onlyShowPreviousAndNext) {
+		if ((totalPage - currentPage) >= 6 && !onlyShowPreviousAndNext) {
 			pages.add(new PaginateItem(disabledClass, "javascript:;", "..."));
 			pages.add(new PaginateItem("", getUrl(totalPage - 1), totalPage - 1));
 			pages.add(new PaginateItem("", getUrl(totalPage), totalPage));

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/page_solutions.html → jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/taxonomy_schemes.html

@@ -6,6 +6,16 @@
 			$(this).addClass('active').siblings().removeClass('active');
 			$('.solution-icon-list').eq($index).addClass('show').siblings().removeClass('show');
 		});
+
+		<#if REQUEST.requestURI?contains('enterprise')>
+			$index = 0;
+		<#elseif REQUEST.requestURI?contains('territory')>
+			$index = 1;
+		<#elseif REQUEST.requestURI?contains('industry')>
+			$index = 2;
+		</#if>
+
+		$('.solution-icon-list').eq($index).addClass('show').siblings().removeClass('show');
 	});
 </#macro>
 <#macro css>
@@ -426,15 +436,15 @@
 	<div class="section section-2">
 		<div class="content">
 			<div class="bread">
-				<span class="current">当前位置：</span><a	href="">首页 &gt; </a><span class="ways">解决方案</span>
+				<span class="current">当前位置：</span><a href="">首页 &gt; </a><span class="ways">解决方案</span>
 			</div>
 			<div class="solution-list">
 				<div class="left">
 					<div class="left-nav">
 						<ul class="navBar">
-							<li class="active"><span>行业应用</span></li>
-							<li><span>领域应用</span></li>
-							<li><span>企业应用</span></li>
+							<li class<#if REQUEST.requestURI?contains('enterprise')>="active"</#if>><span>企业应用</span></li>
+							<li class<#if REQUEST.requestURI?contains('industry')>="active"</#if>><span>行业应用</span></li>
+							<li class<#if REQUEST.requestURI?contains('territory')>="active"</#if>><span>领域应用</span></li>
 						</ul>
 					</div>
 					<div class="contact">