Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

albertshaw 8 years ago
parent
commit
76a128e76e

+ 5 - 4
src/main/webapp/WEB-INF/views/common.html

@@ -100,10 +100,11 @@
 			</li>
 			<li th:classappend="${mainM=='news'}? 'active'">
 				<a th:href="${basePath + '/portal/news/newsIndex.html'}">策源地</a>
-				<ul class="secondary_navigation_nav" th:style="${'width:'+(3*75)+'px;left:-'+(3*75/2-74.25/2)+'px;'}">
-					<li><a th:href="${basePath + '/portal/news/newsIndex.html#news'}">新闻快讯</a></li>
-					<li><a th:href="${basePath + '/portal/news/newsIndex.html#policy'}">科技政策</a></li>
-					<li><a th:href="${basePath + '/portal/news/newsIndex.html#government'}">政府往来</a></li>
+				<ul class="secondary_navigation_nav" th:style="${'width:'+(4*75)+'px;left:-'+(4*75/2-74.25/2)+'px;'}">
+					<li><a th:href="${basePath + '/portal/news/newsDetails.html?type=1'}">新闻快讯</a></li>
+					<li><a th:href="${basePath + '/portal/news/newsDetails.html?type=3'}">技淘新闻</a></li>
+					<li><a th:href="${basePath + '/portal/news/newsDetails.html?type=4'}">科技政策</a></li>
+					<li><a th:href="${basePath + '/portal/news/newsDetails.html?type=2'}">政府往来</a></li>
 				</ul>
 			</li>
 			<li th:classappend="${mainM=='creative'}? 'active'">

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/news/newsDetails.html

@@ -31,9 +31,9 @@
 	<div class="container newsDetails_content">
 		<ul id="newsDetailsTab">
 			<li class="active"><a href="#newsDetailsTab0" data-toggle="tab">全部</a></li>
-			<li><a href="#newsDetailsTab1" data-toggle="tab">技淘动态</a></li>
+			<li><a href="#newsDetailsTab1" data-toggle="tab">新闻快讯</a></li>
 			<li><a href="#newsDetailsTab2" data-toggle="tab">政府往来</a></li>
-			<li><a href="#newsDetailsTab3" data-toggle="tab">科技资讯</a></li>
+			<li><a href="#newsDetailsTab3" data-toggle="tab">技淘新闻</a></li>
 			<li><a href="#newsDetailsTab4" data-toggle="tab">国家政策</a></li>
 			<li><a href="#newsDetailsTab5" data-toggle="tab">地方政策</a></li>
 		</ul>