Skip to content

石磊 / cihai

Go to a project
Commit 2cf1278f by 侯昆
Options

一些修改

1 parent f4fd00aa
Expand all
Inline Side-by-side
Showing 8 changed files with 9 additions and 10 deletions
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/vo/EditionVO.java
...@@ -17,6 +17,7 @@ package com.dookay.cihai.app.controller.vo; ...@@ -17,6 +17,7 @@ package com.dookay.cihai.app.controller.vo;
import com.dookay.cihai.core.word.domain.WordDomain; import com.dookay.cihai.core.word.domain.WordDomain;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.ArrayUtils;
/** /**
* 编辑信息 * 编辑信息
...@@ -38,6 +39,8 @@ public class EditionVO { ...@@ -38,6 +39,8 @@ public class EditionVO {
EditionVO vo = new EditionVO(); EditionVO vo = new EditionVO();
if (wordDomain.getWord().equals("中华人民共和国")) { if (wordDomain.getWord().equals("中华人民共和国")) {
vo.setMainEditor("刘君德"); vo.setMainEditor("刘君德");
}else if(ArrayUtils.contains(new String[]{"鲁迅", "中国左翼作家联盟"}, wordDomain.getWord())){
vo.setMainEditor("陈思和");
} else { } else {
vo.setMainEditor("王继如"); vo.setMainEditor("王继如");
} }
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/relate.jsp
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<span class="list-group-item list-group-item-header">开头</span> <span class="list-group-item list-group-item-header">开头</span>
<a class="list-group-item" >象车</a> <a class="list-group-item" >象车</a>
<a class="list-group-item" >象服</a> <a class="list-group-item" >象服</a>
<a class="list-group-item" >象罔</a> <a class="list-group-item" >象齿焚身</a>
</div> </div>
<div class="list-group"> <div class="list-group">
<span class="list-group-item list-group-item-header">中间</span> <span class="list-group-item list-group-item-header">中间</span>
...@@ -58,14 +58,7 @@ ...@@ -58,14 +58,7 @@
<span class="list-group-item list-group-item-header">结尾</span> <span class="list-group-item list-group-item-header">结尾</span>
<a class="list-group-item" >历象</a> <a class="list-group-item" >历象</a>
<a class="list-group-item" >蛇吞象</a> <a class="list-group-item" >蛇吞象</a>
<a class="list-group-item" >罔象</a>
</div>
<div class="list-group">
<span class="list-group-item list-group-item-header">相关成语</span>
<a class="list-group-item" >象齿焚身</a>
<a class="list-group-item" >形象代言人</a>
<a class="list-group-item" >盲人摸象</a> <a class="list-group-item" >盲人摸象</a>
<a class="list-group-item" >万象森罗</a>
</div> </div>
</c:when> </c:when>
<c:when test="${vo.word eq '象鼻山'}"> <c:when test="${vo.word eq '象鼻山'}">
......
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/controller/vo/EditionVO.java
...@@ -16,6 +16,7 @@ package com.dookay.cihai.pc.controller.vo; ...@@ -16,6 +16,7 @@ package com.dookay.cihai.pc.controller.vo;
import com.dookay.cihai.core.word.domain.WordDomain; import com.dookay.cihai.core.word.domain.WordDomain;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.ArrayUtils;
/** /**
* 编辑信息 * 编辑信息
...@@ -38,6 +39,8 @@ public class EditionVO { ...@@ -38,6 +39,8 @@ public class EditionVO {
EditionVO vo = new EditionVO(); EditionVO vo = new EditionVO();
if (wordDomain.getWord().equals("中华人民共和国")) { if (wordDomain.getWord().equals("中华人民共和国")) {
vo.setMainEditor("刘君德"); vo.setMainEditor("刘君德");
}else if(ArrayUtils.contains(new String[]{"鲁迅", "中国左翼作家联盟"}, wordDomain.getWord())){
vo.setMainEditor("陈思和");
} else { } else {
vo.setMainEditor("王继如"); vo.setMainEditor("王继如");
} }
......
serverside/cihai-pc/src/main/webapp/static/css/index.css
body,html{height:100%}.wrapper-index{position:relative;height:100%;min-height:770px;background:url(../images/bg-index.jpg) top center no-repeat}.wrapper-index .navbar-default{padding:40px 0}.wrapper-index .navbar-default,.wrapper-index .navbar-default .navbar-collapse{background-color:transparent;border-color:transparent}.wrapper-index .navbar-nav{top:18px}.wrapper-index .navbar-form .navbar-main-list{margin-top:20px}.wrapper-index .logo{position:absolute;left:40px;top:40px}.wrapper-index .search-main{padding-top:400px}.wrapper-index .search-main .navbar-form{width:775px}.wrapper-index .search-main .navbar-form .btn-link{float:left;margin-left:15px}.wrapper-index .search-main .navbar-form .logo-search{text-align:center;width:380px;height:70px;padding-right:150px;margin:0 auto 30px}.wrapper-index .search-main .navbar-form .logo-search img{display:inline-block}.wrapper-index .push-main{padding:0 50px}.wrapper-index .push-main .footer-main .qr{float:right;margin-top:-2px}.wrapper-index .push-main .footer-main .qr a:hover .icon-qr{background-image:url(../images/sprite-2.png);background-position:0 0}.wrapper-index .push-main .footer-main .copyright{text-align:left}.wrapper-index .search-main-input-wrapper{position:relative;float:left;padding:0 6px 4px 0;background:url(../images/right.png) right 0 no-repeat}.wrapper-index .search-main-input-wrapper .search-main-input-inner{padding:0 0 6px 0;background:url(../images/bottom.png) 4px bottom no-repeat}.wrapper-index .search-main-input-img{position:absolute;left:-60px;bottom:100%}.btn-search{border:none;width:160px!important;height:75px!important;outline:0;background:url(../images/btn-search.png) center no-repeat}.btn-search:active,.btn-search:focus{background:url(../images/btn-search.png) center no-repeat}.navbar-form .form-group{padding:13px 0!important}.container-fluid .navbar-form .form-group{border-color:#c13633}@media (min-width:1400px){.wrapper-index .navbar-form .navbar-main-list{width:103%;font-size:22px;line-height:30px}.wrapper-index .navbar-form .navbar-main-list .icon-search{margin-top:-4px}.wrapper-index .navbar-form .navbar-main-list a{margin:0 18px}.wrapper-index .navbar .navbar-form{width:1005px}}@media (max-width:1400px){.wrapper-index .container .navbar-form .form-group,.wrapper-index .container-fluid .navbar-form .form-group{width:531px}.wrapper-index .container .navbar-form .form-group .form-control,.wrapper-index .container-fluid .navbar-form .form-group .form-control{width:441px!important}.wrapper-index .container .navbar-form .form-group .btn,.wrapper-index .container-fluid .navbar-form .form-group .btn{width:38px}.wrapper-index .push-main{padding:0 40px}}@media (max-width:1200px){.container-fluid .navbar-header{margin-left:0}.container-fluid .navbar-collapse{margin-right:0}.wrapper-index .push-main{padding:0 10px}}@media (max-width:1200px){.container-fluid .navbar-header{margin-left:-10px}.container-fluid .navbar-collapse{margin-right:0}.wrapper-index .push-main{padding:0}}.word{padding:35px 0;height:230px;background-clip:content-box;background-position:center;background-repeat:no-repeat;background-size:contain;background-image:url(../images/ciyun.png)}.calendar{position:absolute;right:0;top:0}.container-fluid .navbar-links{padding:15px 0 40px;font-size:16px}.container-fluid .navbar-links>a{color:#999;margin-right:20px}.container-fluid .navbar-links>a:hover{color:#187bb2}
\ No newline at end of file \ No newline at end of file
body,html{height:100%}.wrapper-index{position:relative;height:100%;min-height:770px;background:url(../images/bg-index.jpg) top center no-repeat}.wrapper-index .navbar-default{padding:40px 0}.wrapper-index .navbar-default,.wrapper-index .navbar-default .navbar-collapse{background-color:transparent;border-color:transparent}.wrapper-index .navbar-nav{top:18px}.wrapper-index .navbar-form .navbar-main-list{margin-top:20px}.wrapper-index .logo{position:absolute;left:40px;top:40px}.wrapper-index .search-main{padding-top:400px}.wrapper-index .search-main .navbar-form{width:775px}.wrapper-index .search-main .navbar-form .btn-link{float:left;margin-left:15px}.wrapper-index .search-main .navbar-form .logo-search{text-align:center;width:380px;height:70px;margin:0 auto 30px}.wrapper-index .search-main .navbar-form .logo-search img{display:inline-block}.wrapper-index .push-main{padding:0 50px}.wrapper-index .push-main .footer-main .qr{float:right;margin-top:-2px}.wrapper-index .push-main .footer-main .qr a:hover .icon-qr{background-image:url(../images/sprite-2.png);background-position:0 0}.wrapper-index .push-main .footer-main .copyright{text-align:left}.wrapper-index .search-main-input-wrapper{position:relative;float:left;padding:0 6px 4px 0;background:url(../images/right.png) right 0 no-repeat}.wrapper-index .search-main-input-wrapper .search-main-input-inner{padding:0 0 6px 0;background:url(../images/bottom.png) 4px bottom no-repeat}.wrapper-index .search-main-input-img{position:absolute;left:-60px;bottom:100%}.btn-search{border:none;width:160px!important;height:75px!important;outline:0;background:url(../images/btn-search.png) center no-repeat}.btn-search:active,.btn-search:focus{background:url(../images/btn-search.png) center no-repeat}.navbar-form .form-group{padding:13px 0!important}.container-fluid .navbar-form .form-group{border-color:#c13633}@media (min-width:1400px){.wrapper-index .navbar-form .navbar-main-list{width:103%;font-size:22px;line-height:30px}.wrapper-index .navbar-form .navbar-main-list .icon-search{margin-top:-4px}.wrapper-index .navbar-form .navbar-main-list a{margin:0 18px}.wrapper-index .navbar .navbar-form{width:1005px}}@media (max-width:1400px){.wrapper-index .container .navbar-form .form-group,.wrapper-index .container-fluid .navbar-form .form-group{width:531px}.wrapper-index .container .navbar-form .form-group .form-control,.wrapper-index .container-fluid .navbar-form .form-group .form-control{width:441px!important}.wrapper-index .container .navbar-form .form-group .btn,.wrapper-index .container-fluid .navbar-form .form-group .btn{width:38px}.wrapper-index .push-main{padding:0 40px}}@media (max-width:1200px){.container-fluid .navbar-header{margin-left:0}.container-fluid .navbar-collapse{margin-right:0}.wrapper-index .push-main{padding:0 10px}}@media (max-width:1200px){.container-fluid .navbar-header{margin-left:-10px}.container-fluid .navbar-collapse{margin-right:0}.wrapper-index .push-main{padding:0}}.word{padding:35px 0;height:230px;background-clip:content-box;background-position:center;background-repeat:no-repeat;background-size:contain;background-image:url(../images/ciyun.png)}.calendar{position:absolute;right:0;top:0}.container-fluid .navbar-links{padding:15px 0 40px;font-size:16px}.container-fluid .navbar-links>a{color:#999;margin-right:20px}.container-fluid .navbar-links>a:hover{color:#187bb2}
\ No newline at end of file \ No newline at end of file
serverside/cihai-pc/src/main/webapp/static/css/vendor.css
This diff could not be displayed because it is too large.
serverside/cihai-pc/src/main/webapp/static/index.html
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="container-fluid search-main"> <div class="container-fluid search-main">
<form class="navbar-form clearfix"> <form class="navbar-form clearfix">
<div class="logo-search"> <div class="logo-search">
<img class="img-responsive" src="images/logo-search.png"> <img class="img-responsive" src="images/logo-search2.png">
</div> </div>
<div class="search-main-input-wrapper"> <div class="search-main-input-wrapper">
<img class="search-main-input-img" src="images/bg-dog.png" alt=""> <img class="search-main-input-img" src="images/bg-dog.png" alt="">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!