Skip to content

石磊 / cihai

Go to a project
Commit 87275811 by 石头
Options

pc端调整完成

1 parent 5beff5bf
Inline Side-by-side
Showing 6 changed files with 111 additions and 114 deletions
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/controller/vo/CharacterBaikeVO.java
...@@ -46,6 +46,8 @@ public class CharacterBaikeVO { ...@@ -46,6 +46,8 @@ public class CharacterBaikeVO {
private List<ImageModel> images; private List<ImageModel> images;
private ImageModel thumb;
private List<ImageModel> videos; private List<ImageModel> videos;
public static CharacterBaikeVO fromDomain(WordDomain word) { public static CharacterBaikeVO fromDomain(WordDomain word) {
...@@ -68,12 +70,12 @@ public class CharacterBaikeVO { ...@@ -68,12 +70,12 @@ public class CharacterBaikeVO {
.collect(Collectors.toList()); .collect(Collectors.toList());
dto.setBody(body); dto.setBody(body);
if (StringUtils.isNotEmpty(word.getBaikePhotos())) { if (StringUtils.isNotEmpty(word.getBaikePhotos())) {
List<ImageModel> images = List<ImageModel> images = ImageModel.toList(word.getBaikePhotos())
ImageModel.toList(word.getBaikePhotos()) .stream()
.stream() .sorted(Comparator.comparing(ImageModel::getFile))
.sorted(Comparator.comparing(ImageModel::getFile)) .collect(Collectors.toList());
.collect(Collectors.toList());
dto.setImages(images); dto.setImages(images);
dto.setThumb(images.stream().findFirst().orElse(new ImageModel()));
} }
if (StringUtils.isNotEmpty(word.getBaikeVideo())) { if (StringUtils.isNotEmpty(word.getBaikeVideo())) {
dto.setVideos(ImageModel.toList(word.getBaikeVideo())); dto.setVideos(ImageModel.toList(word.getBaikeVideo()));
......
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/controller/vo/StatementBaikeVO.java
...@@ -47,6 +47,8 @@ public class StatementBaikeVO { ...@@ -47,6 +47,8 @@ public class StatementBaikeVO {
private List<ImageModel> videos; private List<ImageModel> videos;
private ImageModel thumb;
public static StatementBaikeVO fromDomain(WordDomain word) { public static StatementBaikeVO fromDomain(WordDomain word) {
StatementBaikeVO dto = new StatementBaikeVO(); StatementBaikeVO dto = new StatementBaikeVO();
dto.setWordId(word.getId()); dto.setWordId(word.getId());
...@@ -69,6 +71,7 @@ public class StatementBaikeVO { ...@@ -69,6 +71,7 @@ public class StatementBaikeVO {
.sorted(Comparator.comparing(ImageModel::getFile)) .sorted(Comparator.comparing(ImageModel::getFile))
.collect(Collectors.toList()); .collect(Collectors.toList());
dto.setImages(images); dto.setImages(images);
dto.setThumb(images.stream().findFirst().orElse(new ImageModel()));
} }
if (StringUtils.isNotEmpty(word.getBaikeVideo())) { if (StringUtils.isNotEmpty(word.getBaikeVideo())) {
dto.setVideos(ImageModel.toList(word.getBaikeVideo())); dto.setVideos(ImageModel.toList(word.getBaikeVideo()));
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/include/header.jsp
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<link rel="stylesheet" href="/static/css/index.css"> <link rel="stylesheet" href="/static/css/index.css">
<script src="/static/js/plugins/jquery.min.js"></script> <script src="/static/js/plugins/jquery.min.js"></script>
<script src="/static/js/plugins/validator/jquery.validator.js"></script> <script src="/static/js/plugins/validator/jquery.validator.js"></script>
<script src="/static/js/common.js"></script>
<script src="/static/js/vendor.js" merge="true"></script> <script src="/static/js/vendor.js" merge="true"></script>
<script src="/static/js/backend.js"></script> <script src="/static/js/backend.js"></script>
<script src="/static/js/layer/layer.js"></script> <script src="/static/js/layer/layer.js"></script>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/include/header_search.jsp
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
<%--<link rel="stylesheet" href="/static/css/index.css">--%> <%--<link rel="stylesheet" href="/static/css/index.css">--%>
<script src="/static/js/plugins/jquery.min.js"></script> <script src="/static/js/plugins/jquery.min.js"></script>
<script src="/static/js/plugins/validator/jquery.validator.js"></script> <script src="/static/js/plugins/validator/jquery.validator.js"></script>
<script src="/static/js/common.js"></script>
<script src="/static/js/vendor.js" merge="true"></script> <script src="/static/js/vendor.js" merge="true"></script>
<script src="/static/js/backend.js"></script> <script src="/static/js/backend.js"></script>
<script src="/static/js/layer/layer.js"></script> <script src="/static/js/layer/layer.js"></script>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/character_baike.jsp
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
<div class="encyclopedia" <div class="encyclopedia"
<c:choose> <c:choose>
<c:when test="${vo.images.size() > 0}"> <c:when test="${vo.images.size() > 0}">
style=" background-image:url(${vo.images.get(0).file})" style=" background-image:url(${vo.thumb.file})"
</c:when> </c:when>
<c:otherwise> <c:otherwise>
style="background-image:url(/static/images/word-bg-01.jpg)" style="padding-top: 0;"
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
> >
...@@ -41,81 +41,80 @@ ...@@ -41,81 +41,80 @@
<div class="col-xs-17"> <div class="col-xs-17">
<main class="main"> <main class="main">
<div class="word-detail"> <div class="word-detail">
<div class="head-intro clearfix"> <div class="head-intro clearfix">
<div class="word pull-left">${vo.word}</div> <div class="word pull-left">${vo.word}</div>
<div class="voice-box pull-left"> <div class="voice-box pull-left">
<%--<div class="voice clearfix">--%> <%--<div class="voice clearfix">--%>
<%--<div class="pull-left py">--%> <%--<div class="pull-left py">--%>
<%--<c:forEach items="${vo.spell}" var="item">--%> <%--<c:forEach items="${vo.spell}" var="item">--%>
<%--【${item}】--%> <%--【${item}】--%>
<%--</c:forEach>--%> <%--</c:forEach>--%>
<%--</div>--%> <%--</div>--%>
<%--<div class="icon" style="background-image:url(/static/icons/voice.png)"></div>--%> <%--<div class="icon" style="background-image:url(/static/icons/voice.png)"></div>--%>
</div>
<%--<div class="sub-name">长鼻目象科哺乳动物</div>--%>
</div> </div>
<%--<div class="sub-name">长鼻目象科哺乳动物</div>--%> <div class="intro-box clearfix">
</div> <c:forEach items="<%=HtmlHelper.baikeBreifToHtml(vo.getBrief())%>" var="item">
</div> ${item}
<div class="intro-box clearfix">
<c:forEach items="<%=HtmlHelper.baikeBreifToHtml(vo.getBrief())%>" var="item">
${item}
</c:forEach>
</div>
<c:if test="${vo.images.size() > 0}">
<div class="album-box js-album">
<div class="album">
<div class="pic" style="background-image:url(${vo.images.get(0).file})"></div>
</div>
<%-- <div class="sub-tip">${vo.word}图册（5）</div> --%>
</div>
</c:if>
</div>
<div class="main__bd">
<ul class="main-tab js-tab clearfix">
<li class="main-tab-item active">
<a href="#tab1">释义</a>
</li>
<c:if test="${vo.videos.size() > 0}">
<li class="main-tab-item">
<a href="#tab2">视频
<span class="badge">${vo.videos.size()}</span>
</a>
</li>
</c:if>
<%--<li class="main-tab-item">--%>
<%--<a href="#tab3">音频</a>--%>
<%--</li>--%>
<%--<li class="main-tab-item">--%>
<%--<a href="#tab4">图谱</a>--%>
<%--</li>--%>
</ul>
<div class="tab-content">
<div class="tab-pane active paraphrase" id="tab1">
<article class="paraphrase-article">
<section class="paraphrase-section js-sec">
<c:forEach items="${vo.body}" var="item" varStatus="status">
<p class="paraphrase-p">${item}</p>
</c:forEach> </c:forEach>
<a class="paraphrase-btn js-copy" href="#">复制</a> </div>
</section> <c:if test="${vo.images.size() > 0}">
</article> <div class="album-box js-album">
</div> <div class="album">
<div class="tab-pane" id="tab2"> <div class="pic" style="background-image:url(${vo.images.get(0).file})"></div>
<div class="row list-img list-gallery"> </div>
<c:forEach items="${vo.videos}" var="item"> <%-- <div class="sub-tip">${vo.word}图册（5）</div> --%>
<figure class="col-xs-6"> </div>
<a href="/temp/xiang.jpg" data-size="202x146"> </c:if>
<video class="img-responsive" src="${item.file}"> </div>
<div class="main__bd">
<ul class="main-tab js-tab clearfix">
<li class="main-tab-item active">
<a href="#tab1">释义</a>
</li>
<c:if test="${vo.videos.size() > 0}">
<li class="main-tab-item">
<a href="#tab2">视频
<span class="badge">${vo.videos.size()}</span>
</a> </a>
</figure> </li>
</c:forEach> </c:if>
<%--<li class="main-tab-item">--%>
<%--<a href="#tab3">音频</a>--%>
<%--</li>--%>
<%--<li class="main-tab-item">--%>
<%--<a href="#tab4">图谱</a>--%>
<%--</li>--%>
</ul>
<div class="tab-content">
<div class="tab-pane active paraphrase" id="tab1">
<article class="paraphrase-article">
<section class="paraphrase-section js-sec">
<c:forEach items="${vo.body}" var="item" varStatus="status">
<p class="paraphrase-p">${item}</p>
</c:forEach>
<a class="paraphrase-btn js-copy" href="#">复制</a>
</section>
</article>
</div>
<div class="tab-pane" id="tab2">
<div class="row list-img list-gallery">
<c:forEach items="${vo.videos}" var="item">
<figure class="col-xs-6">
<a href="/temp/xiang.jpg" data-size="202x146">
<video class="img-responsive" src="${item.file}">
</a>
</figure>
</c:forEach>
</div>
</div>
</div> </div>
</div> </div>
</div> <div class="js-top"></div>
</main>
</div> </div>
<div class="js-top"></div> <div class="col-xs-7">
</main>
</div>
<div class="col-xs-7">
<aside class="aside"> <aside class="aside">
<div class="statistics"> <div class="statistics">
<div class="statistics-title title-base">词条统计</div> <div class="statistics-title title-base">词条统计</div>
...@@ -184,6 +183,8 @@ ...@@ -184,6 +183,8 @@
<div class="aside-tag text-primary">标签：百科</div> <div class="aside-tag text-primary">标签：百科</div>
</aside> </aside>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -260,8 +261,6 @@ ...@@ -260,8 +261,6 @@
$(this).attr('data-clipboard-text', text) $(this).attr('data-clipboard-text', text)
}) })
// 相册查看
commonApp.photoSwipeFromDom('.list-gallery');
}); });
</script> </script>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/statement_baike.jsp
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
style="background-image:url(/static/images/world.topo.bathy.200401.jpg)" style="background-image:url(/static/images/world.topo.bathy.200401.jpg)"
</c:when> </c:when>
<c:when test="${vo.images.size() > 0}"> <c:when test="${vo.images.size() > 0}">
style="background-image:url(${vo.images.get(0).file})" style="background-image:url(${vo.thumb.file})"
</c:when> </c:when>
<c:otherwise> <c:otherwise>
style="background-image:url(/static/images/word-bg-01.jpg)" style="padding-top: 0;"
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
> >
...@@ -117,36 +117,36 @@ ...@@ -117,36 +117,36 @@
<img src="/static/images/24.jpg" alt=""> <img src="/static/images/24.jpg" alt="">
<div class="st-links"> <div class="st-links">
<div class="st-row"> <div class="st-row">
<a class="st-link" href=""></a> <a class="st-link" href="/word/473"></a>
<a class="st-link" href=""> </a> <a class="st-link" href="/word/463"></a>
<a class="st-link" href=""></a> <a class="st-link" href="/word/472"></a>
<a class="st-link" href=""> </a> <a class="st-link" href="/word/462"></a>
<a class="st-link" href=""></a> <a class="st-link" href="/word/517"></a>
<a class="st-link" href=""></a> <a class="st-link" href="/word/470"></a>
</div> </div>
<div class="st-row"> <div class="st-row">
<a class="st-link" href=""></a> <a class="st-link" href="/word/476"></a>
<a class="st-link" href=""> </a> <a class="st-link" href="/word/482"></a>
<a class="st-link" href=""></a> <a class="st-link" href="/word/477"></a>
<a class="st-link" href=""> </a> <a class="st-link" href="/word/606"></a>
<a class="st-link" href=""></a> <a class="st-link" href="/word/483"></a>
<a class="st-link" href=""></a> <a class="st-link" href="/word/467"></a>
</div> </div>
<div class="st-row"> <div class="st-row">
<a class="st-link" href=""></a> <a class="st-link" href="/word/475"></a>
<a class="st-link" href=""> </a> <a class="st-link" href="/word/465"></a>
<a class="st-link" href=""></a> <a class="st-link" href="/word/464"></a>
<a class="st-link" href=""> </a> <a class="st-link" href="/word/479"></a>
<a class="st-link" href=""></a> <a class="st-link" href="/word/471"></a>
<a class="st-link" href=""></a> <a class="st-link" href="/word/480"></a>
</div> </div>
<div class="st-row"> <div class="st-row">
<a class="st-link" href=""></a> <a class="st-link" href="/word/474"></a>
<a class="st-link" href=""> </a> <a class="st-link" href="/word/484"></a>
<a class="st-link" href=""></a> <a class="st-link" href="/word/468"></a>
<a class="st-link" href=""> </a> <a class="st-link" href="/word/469"></a>
<a class="st-link" href=""></a> <a class="st-link" href="/word/481"></a>
<a class="st-link" href=""></a> <a class="st-link" href="/word/466"></a>
</div> </div>
</div> </div>
</div> </div>
...@@ -692,7 +692,7 @@ ...@@ -692,7 +692,7 @@
<div class="row list-img list-gallery"> <div class="row list-img list-gallery">
<c:forEach items="${vo.videos}" var="item"> <c:forEach items="${vo.videos}" var="item">
<figure class="col-xs-6"> <figure class="col-xs-6">
<a href="/temp/xiang.jpg" data-size="202x146"> <a href="${item.file}" target="_blank" data-size="202x146">
<video class="img-responsive" src="${item.file}"> <video class="img-responsive" src="${item.file}">
</a> </a>
</figure> </figure>
...@@ -789,16 +789,12 @@ ...@@ -789,16 +789,12 @@
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">中华人民共和国</div> <div class="recommend-section-title title-sm title-primary">中华人民共和国</div>
<div class="recommend-cells"> <div class="recommend-cells">
<span class="recommend-cell">中华人民共和国主席</span>
<span class="recommend-cell">中华人民共和国首都</span> <span class="recommend-cell">中华人民共和国首都</span>
<span class="recommend-cell">中华人民共和国宪法</span>
<span class="recommend-cell">中华人民共和国国旗</span> <span class="recommend-cell">中华人民共和国国旗</span>
<span class="recommend-cell">中华人民共和国国徽</span> <span class="recommend-cell">中华人民共和国国徽</span>
<span class="recommend-cell">中华人民共和国国歌</span>
<span class="recommend-cell">中华人民共和国国庆日</span>
<span class="recommend-cell">中华人民共和国国务院</span> <span class="recommend-cell">中华人民共和国国务院</span>
<span class="recommend-cell">中华人民共和国合同法</span>
<span class="recommend-cell">中华人民共和国审计法</span>
<span class="recommend-cell">中华人民共和国财政部</span>
<span class="recommend-cell">中华人民共和国可再生能源法</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -918,7 +914,6 @@ ...@@ -918,7 +914,6 @@
}) })
// 相册查看 // 相册查看
commonApp.photoSwipeFromDom('.list-gallery');
<c:if test="${vo.word eq '太阳系'}"> <c:if test="${vo.word eq '太阳系'}">
//- 地球 //- 地球
var option = { var option = {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!