Skip to content

石磊 / cihai

Go to a project
Commit 4164eeed by 石磊
Options

pc端调整完成

1 parent 67970052
Expand all
Inline Side-by-side
Showing 12 changed files with 56 additions and 76 deletions
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/home/index.jsp
<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %> <%@ include file="/WEB-INF/jsp/include/taglib.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%--添加此行消除额外空格--%>
<%@ page trimDirectiveWhitespaces="true" %>
<%--添加此行消除额外空格--%>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
...@@ -12,7 +15,7 @@ ...@@ -12,7 +15,7 @@
<body> <body>
<div class="bg-video"> <div class="bg-video">
<video src="/static/temp/xingkong.mp4" autoplay loop preload="true" x-webkit-airplay="true" <video src="/static/temp/xingkong.mp4" autoplay loop preload="true" x-webkit-airplay="true"
webkit-playsinline="true" playsinline="true" x5-video-player-type="h5" controls="false"></video> webkit-playsinline="true" playsinline="true" x5-video-player-type="h5" ></video>
<div class="bg-mask bg-mask-1"></div> <div class="bg-mask bg-mask-1"></div>
</div> </div>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/include/header_search.jsp
...@@ -11,12 +11,14 @@ ...@@ -11,12 +11,14 @@
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<title>辞海-${param.pageTitle}</title> <title>辞海-${param.pageTitle}</title>
<link rel="stylesheet" href="/static/css/vendor.css"> <link rel="stylesheet" href="/static/css/vendor.css">
<link rel="stylesheet" href="/static/css/video.css">
<%--<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/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>
<script src="/static/js/pingzi_video.js"></script>
<script> <script>
$(function () { $(function () {
backEndApp.init(); backEndApp.init();
...@@ -134,11 +136,10 @@ ...@@ -134,11 +136,10 @@
<input name="image" type="file" class="j_search_image" style="opacity: 0;width: 100%;" <input name="image" type="file" class="j_search_image" style="opacity: 0;width: 100%;"
accept=".png, .jpg, .jpeg"> accept=".png, .jpg, .jpeg">
</div> </div>
<div class="icon icon-voice2"></div>
</button> </button>
<%--<button class="btn navbar-search-microphone" type="button">--%> <button class="btn navbar-search-microphone" type="button">
<%--<div class="icon icon-microphone"></div>--%> <div class="icon icon-microphone"></div>
<%--</button>--%> </button>
</div> </div>
<button class="btn btn-inverse btn-lg" type="submit">进入词条</button> <button class="btn btn-inverse btn-lg" type="submit">进入词条</button>
<button class="btn btn-default btn-lg" type="submit">搜索词条</button> <button class="btn btn-default btn-lg" type="submit">搜索词条</button>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/statement_baike.jsp
...@@ -685,7 +685,7 @@ ...@@ -685,7 +685,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="${item.file}" target="_blank" data-size="202x146"> <a data-src="${item.file}" class="m-video" data-size="202x146">
<%--<video class="img-responsive" src="${item.file}">--%> <%--<video class="img-responsive" src="${item.file}">--%>
<img class="img-responsive" src="/static/temp/word/${item.alt}"> <img class="img-responsive" src="/static/temp/word/${item.alt}">
</a> </a>
...@@ -697,7 +697,7 @@ ...@@ -697,7 +697,7 @@
<div class="row list-img list-gallery"> <div class="row list-img list-gallery">
<c:forEach items="${vo.audios}" var="item"> <c:forEach items="${vo.audios}" var="item">
<figure class="col-xs-6"> <figure class="col-xs-6">
<a href="${item.file}" target="_blank" data-size="202x146"> <a data-src="${item.file}" class="m-video" data-size="202x146">
<img class="img-responsive" src="/static/temp/word/${item.alt}"> <img class="img-responsive" src="/static/temp/word/${item.alt}">
</a> </a>
</figure> </figure>
...@@ -980,6 +980,21 @@ ...@@ -980,6 +980,21 @@
} }
}) })
}) })
// layer
$(".js-video").click(function () {
$(this).toggleClass("active").siblings().removeClass("active")
if ($("#collapse").is(":visible")) $("#collapse").slideUp()
layer.open({
type: 1,
content: $("#calligraphy"),
area: ['900px'],
title: false,
btn: [],
cancel: function () {
$(".js-calligraphy").removeClass("active")
}
})
})
// 复制 // 复制
var clipboard = new Clipboard(".js-copy") var clipboard = new Clipboard(".js-copy")
$(".js-copy").click(function (e) { $(".js-copy").click(function (e) {
......
serverside/cihai-pc/src/main/webapp/static/css1/vendor.css
This diff could not be displayed because it is too large.
serverside/cihai-pc/src/main/webapp/static/index.html
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<title>index</title> <title>index</title>
<link rel="stylesheet" href="css/vendor.css"> <link rel="stylesheet" href="css/vendor.css">
</head> </head>
<body> <body>
<div class="bg-video"> <div class="bg-video">
<video src="temp/xingkong.mp4" autoplay loop preload="true" x-webkit-airplay="true" webkit-playsinline="true" playsinline="true" x5-video-player-type="h5" controls></video> <video src="temp/xingkong.mp4" autoplay loop preload="true" x-webkit-airplay="true" webkit-playsinline="true" playsinline="true" x5-video-player-type="h5" controls="false"></video>
<div class="bg-mask bg-mask-1"></div> <div class="bg-mask bg-mask-1"></div>
</div> </div>
<div class="wrapper-index"> <div class="wrapper-index">
<div class="header clearfix"> <div class="header clearfix">
<div class="nav pull-left"> <div class="nav pull-left"><a href="javascript:;">万国志</a><i>/</i><a href="javascript:;">地方志</a><i>/</i><a href="javascript:;">人物志</a></div>
<a href="javascript:;">万国志</a> <div class="login pull-right"><a class="active" href="javascript:;">登录</a><a href="javascript:;">注册</a></div>
<i>/</i>
<a href="javascript:;">地方志</a>
<i>/</i>
<a href="javascript:;">人物志</a>
</div>
<div class="login pull-right">
<a class="active" href="javascript:;">登录</a>
<a href="javascript:;">注册</a>
</div>
</div>
<div class="logo">
<img src="images/logo-search2.png" title="云辞海">
</div> </div>
<div class="logo"><img src="images/logo-search2.png" title="云辞海"></div>
<div class="search-box clearfix"> <div class="search-box clearfix">
<div class="input-group"> <div class="input-group">
<input class="form-control" placeholder="输入关键词搜索"> <input class="form-control" placeholder="输入关键词搜索">
</div> </div>
<button class="btn-search pull-right" href="javascript:;"> <button class="btn-search pull-right" href="javascript:;"><span class="icon-search"></span></button>
<span class="icon-search"></span> <ul class="btn-sec clearfix">
</button> <li><a class="icon-camera" href="javascript:;"></a></li>
<a class="icon-camera" href="javascript:;"></a> <li><a class="icon-mic" href="javascript:;"></a></li>
</ul>
<div class="decoration-box box-3"></div> <div class="decoration-box box-3"></div>
<div class="decoration-box box-2"></div> <div class="decoration-box box-2"></div>
<div class="decoration-box box-1"></div> <div class="decoration-box box-1"></div>
</div> </div>
<div class="radio-box clearfix"> <div class="search-wrap clearfix">
<label class="radio-inline"> <div class="search-help"><a href="javascript:;">高级检索</a><a href="javascript:;">搜索助手</a><span class="icon-mark">?</span></div>
<input type="radio" name="search-type" checked>词头</label>
<label class="radio-inline">
<input type="radio" name="search-type">全文</label>
<label class="radio-inline">
<input type="radio" name="search-type">图片</label>
<label class="radio-inline">
<input type="radio" name="search-type">视频</label>
<div class="search-help">
<span class="icon-mark">?</span>
<a href="javascript:;">搜索助手</a>
</div>
</div>
<div class="link-box clearfix">
<a class="knowledge" href="http://cihai-pc.beckee.cn/word/592"></a>
<a class="word" href="http://cihai-pc.beckee.cn/word/1"></a>
<a class="cloud" href="javascript:;"></a>
<a class="today" href="http://cihai-pc.beckee.cn/today"></a>
</div> </div>
<div class="link-box clearfix"><a class="knowledge" href="http://cihai-pc.beckee.cn/word/592"></a><a class="word" href="http://cihai-pc.beckee.cn/word/1"></a><a class="cloud" href="javascript:;"></a><a class="today" href="http://cihai-pc.beckee.cn/today"></a></div>
</div> </div>
<script src="js/plugins/jquery.min.js"></script> <script src="js/plugins/jquery.min.js"></script>
<script src="js/plugins/layer/layer.js"></script>
<script src="js/vendor.js" merge="true"></script> <script src="js/vendor.js" merge="true"></script>
<script> <script>
var $indexitemHover = $('.index-item-hover'); var $indexitemHover = $('.index-item-hover');
$('.index-item').hover(function() { $('.index-item').hover(function () {
var $this = $(this), var $this = $(this),
_position = $this.position(); _position = $this.position();
if (!$this.data('hover')) return; if(!$this.data('hover')) return;
$indexitemHover.attr('src', $this.data('hover')).css({ $indexitemHover.attr('src',$this.data('hover')).css({'width':0.3125*$(window).width(),'left':_position.left+$this.width()-40,'top':_position.top+$this.height()-(0.4*$this.height()),'display':'block'})
'width': 0.3125 * $(window).width(), },function () {
'left': _position.left + $this.width() - 40,
'top': _position.top + $this.height() - (0.4 * $this.height()),
'display': 'block'
})
}, function() {
$indexitemHover.hide(); $indexitemHover.hide();
}) })
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file \ No newline at end of file
serverside/cihai-pc/src/main/webapp/static/index2.html
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<title>index2</title> <title>index2</title>
<link rel="stylesheet" href="css/vendor.css"> <link rel="stylesheet" href="css/vendor.css">
</head> </head>
<body> <body>
<div class="bg-video"> <div class="bg-video">
<video src="temp/kongjian.mp4" autoplay loop preload="true" x-webkit-airplay="true" webkit-playsinline="true" playsinline="true" x5-video-player-type="h5" controls></video> <video src="temp/kongjian.mp4" autoplay loop preload="true" x-webkit-airplay="true" webkit-playsinline="true" playsinline="true" x5-video-player-type="h5" controls></video>
<div class="bg-mask bg-mask-2"></div> <div class="bg-mask bg-mask-2"></div>
</div> </div>
<div class="wrapper-index"> <div class="wrapper-index">
<div class="index-top-left"> <div class="index-top-left"><img src="images/index-2-top-left.png" draggable="false"></div>
<img src="images/index-2-top-left.png" draggable="false"> <div class="index-top-right index-top-right-2"><img src="images/index-2-top-right.png" draggable="false"></div>
</div> <div class="index-search index-search-2"><img src="images/index-2-search.png" draggable="false"></div>
<div class="index-top-right index-top-right-2"> <div class="index-item index-2-item"><img src="images/index-2-item-1.png" draggable="false"><img src="images/index-2-item-2.png" draggable="false"><img src="images/index-2-item-3.png" draggable="false"><img src="images/index-2-item-4.png" draggable="false">
<img src="images/index-2-top-right.png" draggable="false">
</div>
<div class="index-search index-search-2">
<img src="images/index-2-search.png" draggable="false">
</div>
<div class="index-item index-2-item">
<img src="images/index-2-item-1.png" draggable="false">
<img src="images/index-2-item-2.png" draggable="false">
<img src="images/index-2-item-3.png" draggable="false">
<img src="images/index-2-item-4.png" draggable="false">
</div> </div>
</div> </div>
<script src="js/plugins/jquery.min.js"></script> <script src="js/plugins/jquery.min.js"></script>
<script src="js/plugins/layer/layer.js"></script>
<script src="js/vendor.js" merge="true"></script> <script src="js/vendor.js" merge="true"></script>
</body> </body>
</html> </html>
\ No newline at end of file \ No newline at end of file
serverside/cihai-pc/src/main/webapp/static/js/vendor.js
This diff could not be displayed because it is too large.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!