|
|
@@ -1,84 +1,12 @@
|
|
|
-<<<<<<< HEAD
|
|
|
-<!DOCTYPE html>
|
|
|
-<html xmlns="http://www.w3.org/1999/xhtml"
|
|
|
- xmlns:th="http://www.thymeleaf.org"
|
|
|
- xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
|
|
-<head th:replace="common::header(~{::title},~{::link})">
|
|
|
-<title>新闻详情</title>
|
|
|
-<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
|
|
|
-<link th:href="${portalHost + '/thinkTank/policyDetail.css'}" rel="stylesheet">
|
|
|
-</head>
|
|
|
-<body>
|
|
|
- <header>
|
|
|
- <div th:replace="common::nav('news','newsDetail')"></div>
|
|
|
- </header>
|
|
|
- <div id="policyDetail">
|
|
|
- <div id="policy_content">
|
|
|
- <div class="content_left" th:each="newsDetail:${newsDetail}">
|
|
|
- <h3 th:text="${newsDetail.title}?${newsDetail.title}:''"></h3>
|
|
|
- <div class="small_title">
|
|
|
- <span>时间:<span th:text="${newsDetail.createTime}?${newsDetail.createTimeS}:''"></span></span>
|
|
|
- <span>来源:<span th:text="${newsDetail.source}?${newsDetail.source}:行业新闻"></span></span>
|
|
|
- </div>
|
|
|
- <div th:if="${newsDetail.titleImg != null and newsDetail.titleImg !=''}" class="content_img">
|
|
|
- <img th:src="${avatarUploadHost+newsDetail.titleImg}" alt="" />
|
|
|
- </div>
|
|
|
- <p th:utext="${newsDetail.content}?${newsDetail.content}:'暂无内容'">
|
|
|
- </p>
|
|
|
- <h5 class="text_end">文章来自:</h5>
|
|
|
- <a th:href="${newsDetail.sourceUrl}?${newsDetail.sourceUrl}:'www.jishutao.com'"></a>
|
|
|
- <hr />
|
|
|
- <h5 >本文关键词:</h5>
|
|
|
- <span>高新</span> <span>信息</span> <span>技术</span>
|
|
|
- <hr />
|
|
|
- <!-- <div class="next_div">
|
|
|
- <span class="rf">
|
|
|
- <h5>下一篇:</h5> <a href="#">科技探索</a>
|
|
|
- </span> <span>
|
|
|
- <h5>上一篇:</h5> <a href="#">探索科技</a>
|
|
|
- </span>
|
|
|
- </div> -->
|
|
|
- <hr />
|
|
|
- <h5>推荐文章:</h5>
|
|
|
- <div th:each="news:${news}">
|
|
|
- <span ><a th:href="@{/portal/news/newsDetail(id=${news.id})}" th:text="${news.title}?${news.title}:'暂无更多内容'"></a></span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="contetn_right" >
|
|
|
- <div class="right_title">
|
|
|
- <div>热点资讯</div>
|
|
|
- </div>
|
|
|
- <div th:each="newsList:${newsList}">
|
|
|
- <h5 ><a th:href="@{/portal/news/newsDetail(id=${newsList.id})}" th:text="${newsList.title}?${newsList.title}:''"></a></h5>
|
|
|
- <!-- <img th:src="${avatarUploadHost+newsDetail.titleImg}" alt="" /> -->
|
|
|
- <p th:text="${newsList.createTime}?${newsList.DataS}:''"></p>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <footer>
|
|
|
- <div th:replace="common::copyright"></div>
|
|
|
- </footer>
|
|
|
- <div th:replace="common::footer(~{::script})">
|
|
|
- <script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
|
|
|
- <script type="text/javascript"
|
|
|
- th:src="${portalHost + '/thinkTank/policyDetail.js'}"></script>
|
|
|
- </div>
|
|
|
-</body>
|
|
|
-
|
|
|
-
|
|
|
-=======
|
|
|
<!DOCTYPE html>
|
|
|
<html xmlns="http://www.w3.org/1999/xhtml"
|
|
|
xmlns:th="http://www.thymeleaf.org"
|
|
|
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
|
|
-
|
|
|
<head th:replace="common::header(~{::title},~{::link})">
|
|
|
<title>新闻详情</title>
|
|
|
<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
|
|
|
<link th:href="${portalHost + '/thinkTank/policyDetail.css'}" rel="stylesheet">
|
|
|
</head>
|
|
|
-
|
|
|
<body>
|
|
|
<header>
|
|
|
<div th:replace="common::nav('news','newsDetail')"></div>
|
|
|
@@ -91,15 +19,10 @@
|
|
|
<span>时间:<span th:text="${newsDetail.createTime}?${newsDetail.createTimeS}:''"></span></span>
|
|
|
<span>来源:<span th:text="${newsDetail.source}?${newsDetail.source}:行业新闻"></span></span>
|
|
|
</div>
|
|
|
- <div class="content_img">
|
|
|
- <div th:if="${newsDetail.titleImg} == null " >
|
|
|
- <img th:src="${avatarUploadHost+ '/default/neswimg_null.png'}" alt=""/>
|
|
|
- </div>
|
|
|
- <div th:if="${newsDetail.titleImg} != null " >
|
|
|
- <img th:src= "${avatarUploadHost+newsDetail.titleImg}"alt="" />
|
|
|
- </div>
|
|
|
+ <div th:if="${newsDetail.titleImg != null and newsDetail.titleImg !=''}" class="content_img">
|
|
|
+ <img th:src="${avatarUploadHost+newsDetail.titleImg}" alt="" />
|
|
|
</div>
|
|
|
- <p th:text="${newsDetail.content}?${newsDetail.content}:'暂无内容'">
|
|
|
+ <p th:utext="${newsDetail.content}?${newsDetail.content}:'暂无内容'">
|
|
|
</p>
|
|
|
<h5 class="text_end">文章来自:</h5>
|
|
|
<a th:href="${newsDetail.sourceUrl}?${newsDetail.sourceUrl}:'www.jishutao.com'"></a>
|
|
|
@@ -143,5 +66,4 @@
|
|
|
</body>
|
|
|
|
|
|
|
|
|
->>>>>>> branch 'dev' of https://git.coding.net/aft/AFT.git
|
|
|
</html>
|