Merge branch 'dev' of ssh://10.10.101.21/source/usoftchina-jpress into feature/serviceCenter

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/taxonomy_news.html

@@ -294,14 +294,14 @@ $(document).ready(function() {
 						</#list>
 						</@jp.taxonomys>
 					</div>
-					<@jp.contentPage pageSize="6" orderBy="created desc">
+					<@jp.contentPage pageSize="10" orderBy="created desc">
 					<!--行业新闻-->
 					<div class="trade-news">
 						<#list page.getList() as content>
 							<div class="tradeNews">
 								<div class="news-time">
 									<div>
-										<h3>${(content.created?string("yy"))!''}</h3>
+										<h3>${(content.created?string("dd"))!''}</h3>
 										<h4>
 											<#if content.created?string("MM") ??>
 												<#switch content.created?string("MM")>
@@ -357,20 +357,20 @@ $(document).ready(function() {
 							</div>
 
 							<#if content_has_next>
-								<#if contents[content_index+1].created?string("mm") != content.created?string("mm")>
+								<#if contents[content_index+1].created?string("yy") != content.created?string("yy")>
 									<!--年份分割线-->
-									<p class="years">${contents[content_index+1].created?string("mm")}年</p>
+									<p class="years">${contents[content_index+1].created?string("yy")}年</p>
 								</#if>
 							</#if>
 						</#list>
 						<div style="padding: 15px;margin: 30px 0 70px 0;">
 							<span class="pull-left" style="line-height: 30px;">共 <span class="text-mun">${page.totalRow!'0'}</span> 条</span>
 							<div class="btn-group btn-group-sm pull-right" style="display: inline-block;">
-								<a type="button" <#if page.isFirstPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news"><i class="fa fa-angle-double-left"></i> 首页</a>
-								<a type="button" <#if page.isFirstPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${page.pageNumber - 1}">&lt; 上一页</a>
+								<a type="button" <#if page.isFirstPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${taxonomy.slug!}"><i class="fa fa-angle-double-left"></i> 首页</a>
+								<a type="button" <#if page.isFirstPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${taxonomy.slug!}-${page.pageNumber - 1}">&lt; 上一页</a>
 								<a type="button" disabled="disabled" class="btn btn-default">第 <span class="text-mun">${page.pageNumber!'0'}</span> 页</a>
-								<a type="button" <#if page.isLastPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${page.pageNumber + 1}">下一页 &gt;</a>
-								<a type="button" <#if page.isLastPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${page.totalPage!'0'}">尾页 <i class="fa fa-angle-double-right"></i></a>
+								<a type="button" <#if page.isLastPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${taxonomy.slug!}-${page.pageNumber + 1}">下一页 &gt;</a>
+								<a type="button" <#if page.isLastPage()> disabled="disabled"</#if> class="btn btn-default" href="${CPATH}/news-${taxonomy.slug!}-${page.totalPage!'0'}">尾页 <i class="fa fa-angle-double-right"></i></a>
 							</div>
 						</div>
 					</div>