Browse Source

Merge remote-tracking branch 'origin/master' into test

enderx 8 years ago
parent
commit
465efaf085

+ 15 - 5
src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html

@@ -130,7 +130,7 @@
   			</div>
   		</div>
   		<div class="process_btn">
-  			<a th:href="${basePath+'/user/account/services.html#evaluate'}">立即评估</a>
+  			<a href="javascript:;" onclick="_MEIQIA('showPanel')">立即评估</a>
   			<a href="javascript:;" onclick="_MEIQIA('showPanel')">在线咨询</a>
   		</div>
   	</div>
@@ -218,36 +218,46 @@
   			<div class="cont_img">
   				
   			</div>
+  			
+  			<a th:if="${#lists.size(zcfg) ge 1}" th:href="@{/portal/news/newsDetail(id=${zcfg[0].id})}" >
   			<div class="cont_p">
   				<h5 th:text=${zcfg[0].createTimeFormattedDate}></h5>
   				<div class="line"></div>
   				<h4 th:text=${zcfg[0].title}></h4>
   				<p th:text=${zcfg[0].summary}></p>
+  				</a>
 				<div class="more">
 					<span>+</span>
-					<a href="/portal/thinkTank/index.html">更多政策</a>
+					<span><a href="/portal/thinkTank/index.html">更多政策</a></span>
 				</div>
   			</div>
   		</div>
   		<div class="policies_bot">
-  			<div  class="bot" th:if="${#lists.size(zcfg) ge 2}">
+  		
+  			<a th:if="${#lists.size(zcfg) ge 2}" th:href="@{/portal/news/newsDetail(id=${zcfg[1].id})}" >
+  			<div  class="bot" >
   				<h5 th:text=${zcfg[1].createTimeFormattedDate}></h5>
   				<div class="line"></div>
   				<h4 th:text=${zcfg[1].title}></h4>
   				<p th:text=${zcfg[1].summary}></p>
   			</div>
-  			<div  class="bot" th:if="${#lists.size(zcfg) ge 3}">
+  				</a>
+  			<a th:if="${#lists.size(zcfg) ge 3}" th:href="@{/portal/news/newsDetail(id=${zcfg[2].id})}" >
+  			<div  class="bot">
   				<h5 th:text=${zcfg[2].createTimeFormattedDate}></h5>
   				<div class="line"></div>
   				<h4 th:text=${zcfg[2].title}></h4>
   				<p th:text=${zcfg[2].summary}></p>
   			</div>
-  			<div  class="bot" th:if="${#lists.size(zcfg) ge 4}">
+  			</a>
+  			<a th:if="${#lists.size(zcfg) ge 4}" th:href="@{/portal/news/newsDetail(id=${zcfg[3].id})}" >
+  			<div  class="bot">
   				<h5 th:text=${zcfg[3].createTimeFormattedDate}></h5>
   				<div class="line"></div>
   				<h4 th:text=${zcfg[3].title}></h4>
   				<p th:text=${zcfg[3].summary}></p>
   				</div>
+  				</a>
   		</div>
   	</div>
   	<div class="advantages">