官网新闻新闻中心调整

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

@@ -200,41 +200,45 @@
 					</div>
 					<div class="allNews">
 						<div class="newsNav">
-							<div class="news-item"><em></em><span>公司动态</span></div>
-							<div class="news-item active"><em></em><span>行业新闻</span></div>
+							<#list content.getTaxonomys() as tax>
+								<#if tax.slug == "companyDynamic">
+									<@jp.taxonomys module="news">
+									<#list taxonomys as taxonomy>
+										<#if taxonomy.title == "公司动态">
+											<div class="news-item active"><em></em><span><a href="${taxonomy.url!}">公司动态</a></span></div>
+										</#if>
+										<#if taxonomy.title == "行业新闻">
+											<div class="news-item "><em></em><span><a href="${taxonomy.url!}">行业新闻</a></span></div>
+										</#if>
+									</#list>
+									</@jp.taxonomys>
+								<#elseif tax.slug == "tradeNews">
+									<@jp.taxonomys module="news">
+									<#list taxonomys as taxonomy>
+										<#if taxonomy.title == "公司动态">
+											<div class="news-item "><em></em><span><a href="${taxonomy.url!}">公司动态</a></span></div>
+										</#if>
+										<#if taxonomy.title == "行业新闻">
+											<div class="news-item active"><em></em><span><a href="${taxonomy.url!}">行业新闻</a></span></div>
+										</#if>
+									</#list>
+									</@jp.taxonomys>
+								</#if>
+							</#list>
 						</div>
 						<!--公司动态-->
 						<div class="company-dynamic"></div>
 						<!--行业新闻-->
 						<div class="trade-news">
-							<h3>从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低</h3>
+							<h3> ${content.title}</h3>
 							<div class="info">
 								<span class="text-num"><img src="${CTPATH}/images/question/read.png" style="margin-left: 15px;"/> ${content.view_count!'0'}</span>
 								<span class="pull-left text-num">${(content.created?string("yyyy-MM-dd"))!''}</span>
 							</div>
-							<p>
-								从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低
-							</p>
-							<h5>是什么？</h5>
-							<img src="${CTPATH}/images/question/read.png" alt="">
-							<p>
-								从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低从电报到5G从甚低
-							</p>
+							<dev>
+								${content.text!}
+							</dev>
 						</div>
-					<!--<div class="col-md-9">-->
-						<!--<h3>${content.title!}</h3>-->
-						<!--<p>-->
-							<!--<span class="text-muted">时间 ${(content.created?string("yyyy-MM-dd HH:mm:ss"))!''}</span>-->
-							<!--<span class="pull-right text-num">-->
-								<!--<i class="fa fa-eye" style="margin-left: 15px;"></i> ${content.view_count!'0'}-->
-								<!--&lt;!&ndash; <i class="fa fa-thumbs-o-up" style="margin-left: 15px;"></i> ${content.vote_up!'0'}-->
-								<!--<i class="fa fa-commenting-o" style="margin-left: 15px;"></i> ${content.comment_count!'0'} &ndash;&gt;-->
-							<!--</span>-->
-						<!--</p>-->
-						<!--<hr>-->
-						<!--<div class="news-text">-->
-							<!--${content.text!}-->
-						<!--</div>-->
 						<div class="content-toggle">
 							<p class="p-toggle">
 								<@jp.previous>

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

@@ -129,14 +129,11 @@
         </div>
     </div>
     <div class="section-item section1">
-        <h3>产品如何保证数据的安全性和稳定性？</h3>
+        <h3>${content.title!}</h3>
         <div class="content">
             <hr/>
             <div class="content-txt">
-               <p>优软科技企业管理软件从以下几个方面保证数据的安全性：</p>
-                <ul>
-                    <li>1、平台自带回收站功能平台自带回收站功能平台自带回收站功能平台自带回收站功能</li>
-                </ul>
+                ${content.text!}
             </div>
         </div>
     </div>

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

@@ -283,10 +283,10 @@ $(document).ready(function() {
 							<@jp.taxonomys module="news">
 							<#list taxonomys as taxonomy>
 								<#if taxonomy.title == "公司动态">
-									<div class="news-item <#if REQUEST.requestURI == taxonomy.url>active</#if>"><em></em><span><a href="${taxonomy.url!}">公司动态</a></span></div>
+									<div class="news-item <#if ((REQUEST.requestURI?contains(taxonomy.slug)) == (taxonomy.url?contains(taxonomy.slug)))>active</#if>"><em></em><span><a href="${taxonomy.url!}">公司动态</a></span></div>
 								</#if>
 								<#if taxonomy.title == "行业新闻">
-									<div class="news-item <#if REQUEST.requestURI == taxonomy.url>active</#if>"><em></em><span><a href="${taxonomy.url!}">行业新闻</a></span></div>
+									<div class="news-item <#if ((REQUEST.requestURI?contains(taxonomy.slug)) == (taxonomy.url?contains(taxonomy.slug)))>active</#if>"><em></em><span><a href="${taxonomy.url!}">行业新闻</a></span></div>
 								</#if>
 							</#list>
 							</@jp.taxonomys>
@@ -366,6 +366,18 @@ $(document).ready(function() {
 							</#list>
 
 						</div>
+
+					<div style="padding: 15px;">
+					<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-${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-${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>
+
 					</@jp.contentPage>
 						<!--<div class="page">-->
 							<!--<ul>-->