Skip to content

Z
ZhongWeiXin
Commit 4b5316ba by 邓丽
Options

修复bug

parent 1a5595fd
Showing with 218 additions and 119 deletions
dist/css/style.css
......@@ -401,7 +401,7 @@ body {
.slick-arrow {
position: absolute;
transform: translateY(-50%) !important;
top: 47.5% !important;
top: 50% !important;
margin-top: 0 !important;
height: 100% !important;
}
......@@ -566,11 +566,9 @@ body {
}
.slick-prev:hover {
background: url("../images/leftIcon.png") no-repeat left;
margin-left: 10px;
}
.slick-next:hover {
background: url("../images/rightIcon.png") no-repeat right;
margin-right: 10px;
}
.am-topbar-fixed-bottom,
.am-topbar-fixed-top {
......@@ -822,6 +820,7 @@ a.cd-read-more:hover {
color: #8a8a8a;
font-weight: 400;
font-size: 14px;
display: block;
}
.topbar-nav > li > a:hover {
background: transparent;
......@@ -1012,7 +1011,7 @@ a.cd-read-more:hover {
height: 3rem;
overflow: auto;
text-align: left;
padding-left: 30px;
padding-left: 20px;
}
#exDetailUl li div.publicationsIntro p,
.publicationBox li div.publicationsIntro p {
......@@ -1033,15 +1032,15 @@ a.cd-read-more:hover {
.publicCon {
width: 50%;
text-align: center;
margin: 200px auto 20px auto;
margin: 200px auto 50px auto;
min-width: 600px;
}
.publicCon h2 {
color: #d4d4d4;
font-size: 24px;
line-height: 60px;
font-size: 22px;
line-height: 35px;
letter-spacing: 4px;
margin-bottom: 50px;
margin-bottom: 70px;
}
.publicCon small {
display: block;
......@@ -1263,7 +1262,7 @@ a.cd-read-more:hover {
/*模态框效果*/
.am-modal {
left: 35%;
top: 28%;
top: 27%;
width: 600px;
height: 240px;
margin: 0 auto;
......@@ -1394,7 +1393,7 @@ a.cd-read-more:hover {
#cd-timeline::before {
left: 25%;
margin-left: -2px;
height: 96%;
height: 95%;
}
.am-slider .portfolioSiles img {
width: auto;
......@@ -1413,7 +1412,7 @@ a.cd-read-more:hover {
height: 30px;
line-height: 30px;
position: absolute;
bottom: 10px;
bottom: 30px;
width: 100%;
z-index: 12;
color: #d4d4d4;
......@@ -1482,7 +1481,7 @@ a.cd-read-more:hover {
/*模态框效果*/
.am-modal {
left: 25%;
top: 26%;
top: 24%;
width: 600px;
height: 240px;
margin: 0 auto;
......@@ -1496,7 +1495,7 @@ a.cd-read-more:hover {
}
@media (min-width: 640px) and (max-width: 1150px) {
.publicCon {
margin: 150px auto 0;
margin: 150px auto 40px auto;
}
.am-with-topbar-fixed-top {
padding-top: 100px;
......@@ -1586,7 +1585,7 @@ a.cd-read-more:hover {
/*模态框效果*/
.am-modal {
left: 18%;
top: 24%;
top: 21%;
width: 600px;
height: 240px;
margin: 0 auto;
......@@ -2002,7 +2001,7 @@ a.cd-read-more:hover {
margin-bottom: 1em;
}
#cd-timeline::before {
height: 97%;
height: 96%;
}
/*新闻页博客效果*/
#news ul li {
......@@ -2212,6 +2211,10 @@ img.lazy {
-o-object-fit: cover;
object-fit: cover;
}
.slick-loading {
height: 0px!important;
background: transparent;
}
.am-gotop-fixed .am-gotop-icon {
display: block;
height: 32px;
......
dist/html/biography.html
......@@ -22,7 +22,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -36,9 +37,11 @@
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/js/amazeui.min.js"></script>
<script src="../assets/js/slick.min.js"></script>
<!--<script src="../assets/js/slick.min.js"></script>-->
<script src="../assets/js/slick.js"></script>
<script src="../js/slickInit.min.js"></script>
<script src="../js/public.min.js"></script>
<!--<script src="../js/public.min.js"></script>-->
<script src="../js/public.js"></script>
<script>
/*便于百度搜索引擎*/
......@@ -58,7 +61,7 @@
</style>
</head>
<body>
<script type="text/javascript" src="../js/navRoll.js"></script>
<script type="text/javascript" src="../js/navRoll.min.js"></script>
<!--header-->
<header class="am-topbar am-topbar-fixed-top wos-header blackBg header boxShadow">
<div class="am-container">
......
dist/html/exhibition.html
......@@ -23,7 +23,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -37,9 +38,11 @@
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/js/amazeui.min.js"></script>
<script src="../assets/js/slick.min.js"></script>
<!--<script src="../assets/js/slick.min.js"></script>-->
<script src="../assets/js/slick.js"></script>
<script src="../js/slickInit.min.js"></script>
<script src="../js/public.min.js"></script>
<!--<script src="../js/public.min.js"></script>-->
<script src="../js/public.js"></script>
<script>
/*便于百度搜索引擎*/
......@@ -54,7 +57,7 @@
</head>
<body>
<script type="text/javascript" src="../js/navRoll.js"></script>
<script type="text/javascript" src="../js/navRoll.min.js"></script>
<!--header-->
<header class="am-topbar am-topbar-fixed-top wos-header blackBg header boxShadow">
<div class="am-container">
......
dist/html/index.html
......@@ -23,7 +23,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -37,9 +38,11 @@
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/js/amazeui.min.js"></script>
<script src="../assets/js/slick.min.js"></script>
<!--<script src="../assets/js/slick.min.js"></script>-->
<script src="../assets/js/slick.js"></script>
<script src="../js/slickInit.min.js"></script>
<script src="../js/public.min.js"></script>
<!--<script src="../js/public.min.js"></script>-->
<script src="../js/public.js"></script>
<script>
/*便于百度搜索引擎*/
......@@ -52,38 +55,47 @@
})();
</script>
<!-- <script src="../assets/js/slickIndex.js"></script>-->
</head>
<body>
<div class="am-container">
<div class="am-slider am-slider-default mobileTop">
<div>
<!-- <div class="bgImg"></div>-->
<div class="title">
<h2>ZHONG WEIXING</h2>
<P><a>中文</a> | <a>English</a></P>
</div>
</div>
<ul class="slider lazy am-slides indexSlide" id="portfolioDel">
<li>
<div>
<img class="image" data-lazy="../images/testImg1.png" />
<div class="image">
<img data-lazy="../images/testImg3.png" />
</div>
</li>
<li>
<div>
<div class="image">
<img data-lazy="../images/testImg2.png" />
</div>
</li>
<li>
<div class="image" >
<img data-lazy="../images/testImg1.png" />
</div>
</li>
<li>
<div class="image">
<img class="image" data-lazy="../images/testImg7.jpg" />
</div>
</li>
<li>
<div>
<img class="image" data-lazy="../images/testImg3.png" />
<div class="image" >
<img data-lazy="../images/testImg11.jpg" />
</div>
</li>
<li>
<div>
<img class="image" data-lazy="../images/testImg2.png" />
<div class="image">
<img data-lazy="../images/testImg10.jpg" />
</div>
</li>
</ul>
......@@ -120,7 +132,6 @@ var _h = parseInt($(window).height());//获取浏览器的宽度
function indexImg(){
var titleH=$(".title h2").height();
var titleP=$(".title p").height();
console.log(_h+20);
if(_w<=640) {
var hTop=parseInt((_h - titleH-20)/2);
var pTop=parseInt((_h - titleP+50)/2);
......
dist/html/news.html
......@@ -22,7 +22,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -36,9 +37,11 @@
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/js/amazeui.min.js"></script>
<script src="../assets/js/slick.min.js"></script>
<!--<script src="../assets/js/slick.min.js"></script>-->
<script src="../assets/js/slick.js"></script>
<script src="../js/slickInit.min.js"></script>
<script src="../js/public.min.js"></script>
<!--<script src="../js/public.min.js"></script>-->
<script src="../js/public.js"></script>
<script>
/*便于百度搜索引擎*/
......@@ -57,7 +60,7 @@
</style>
</head>
<body>
<script type="text/javascript" src="../js/navRoll.js"></script>
<script type="text/javascript" src="../js/navRoll.min.js"></script>
<!--header-->
<header class="am-topbar am-topbar-fixed-top wos-header blackBg header boxShadow">
<div class="am-container">
......
dist/html/portfolio.html
......@@ -22,7 +22,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -36,9 +37,11 @@
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/js/amazeui.min.js"></script>
<script src="../assets/js/slick.min.js"></script>
<!--<script src="../assets/js/slick.min.js"></script>-->
<script src="../assets/js/slick.js"></script>
<script src="../js/slickInit.min.js"></script>
<script src="../js/public.min.js"></script>
<!--<script src="../js/public.min.js"></script>-->
<script src="../js/public.js"></script>
<script>
/*便于百度搜索引擎*/
......@@ -62,7 +65,7 @@
</style>
</head>
<body>
<script type="text/javascript" src="../js/navRoll.js"></script>
<script type="text/javascript" src="../js/navRoll.min.js"></script>
<!--header-->
<header class="am-topbar am-topbar-fixed-top wos-header blackBg header boxShadow">
<div class="am-container">
......
dist/html/portfolioDetail.html
......@@ -22,7 +22,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -36,9 +37,11 @@
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/js/amazeui.min.js"></script>
<script src="../assets/js/slick.min.js"></script>
<!--<script src="../assets/js/slick.min.js"></script>-->
<script src="../assets/js/slick.js"></script>
<script src="../js/slickInit.min.js"></script>
<script src="../js/public.min.js"></script>
<!--<script src="../js/public.min.js"></script>-->
<script src="../js/public.js"></script>
<script>
/*便于百度搜索引擎*/
......@@ -154,8 +157,13 @@
/*分页数字指示*/
$(function(){
var len=parseInt(parseInt($(this).find("li").size())-2);
$(".allItem").text(len);
/*var len=parseInt(parseInt($(this).find("li").size())-2);
$(".allItem").text(len);*/
var len=parseInt($(".allItem").text());
var windowH = parseInt($(window).height());
$("#portfolioDel").height(windowH);
$(".slick-next").click(function(){
var nowVal=parseInt($(".nowItem").text())+1;
if(nowVal-len<=0){
......@@ -174,17 +182,6 @@
})
})
function item(){
var allItem=parseInt($(".allItem").text());
if(nowVal-allItem<=0){
$(".nowItem").text(nowVal);
}else{
$(".nowItem").text(1);
}
}
</script>
<script>
</script>
</body>
</html>
\ No newline at end of file
dist/html/publications.html
......@@ -23,7 +23,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -37,9 +38,11 @@
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/js/amazeui.min.js"></script>
<script src="../assets/js/slick.min.js"></script>
<!--<script src="../assets/js/slick.min.js"></script>-->
<script src="../assets/js/slick.js"></script>
<script src="../js/slickInit.min.js"></script>
<script src="../js/public.min.js"></script>
<!--<script src="../js/public.min.js"></script>-->
<script src="../js/public.js"></script>
<script>
/*便于百度搜索引擎*/
......@@ -62,7 +65,7 @@
</style>
</head>
<body>
<script type="text/javascript" src="../js/navRoll.js"></script>
<script type="text/javascript" src="../js/navRoll.min.js"></script>
<!--header-->
<header class="am-topbar am-topbar-fixed-top wos-header blackBg header boxShadow">
<div class="am-container">
......
dist/html/publicationsDetail.html
......@@ -23,7 +23,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -37,9 +38,11 @@
<script src="../assets/js/jquery.min.js"></script>
<script src="../assets/js/amazeui.min.js"></script>
<script src="../assets/js/slick.min.js"></script>
<!--<script src="../assets/js/slick.min.js"></script>-->
<script src="../assets/js/slick.js"></script>
<script src="../js/slickInit.min.js"></script>
<script src="../js/public.min.js"></script>
<!--<script src="../js/public.min.js"></script>-->
<script src="../js/public.js"></script>
<script>
/*便于百度搜索引擎*/
......@@ -64,6 +67,8 @@
<i class="icon-closeIco3"></i>
</a> </span>
</div>
<div class="am-container">
<div class="publicCon marginTop">
<h2>文章标题文章标题文章标题文章标题</h2>
......@@ -78,7 +83,20 @@
</div>
<p>
Arago club and Trump's relatives described,<a>trfyhyrht</a> the damage condition of the property is not so bad. Trump's former Butler Anthony Seneca recalled, "Wilma" hurricane passes behind the horse Arago club house many trees were blown down, but the house itself is just blown away some tiles.
"That house has never been seriously damaged," sai <img class="lazy" data-original="../images/testImg1.png" alt="" />
"That house has never been seriously damaged," sai <img src="../images/testImg1.png" alt="" />
</p>
<!-- <small>2019/9/23 10:36</small>-->
<p>
In a lot of Malaysia Arago club and Trump's relatives described, the damage condition of the property is not so bad. Trump's former Butler Anthony Seneca recalled, "Wilma" hurricane passes behind the horse Arago club house many trees were blown down, but the house itself is just blown away some tiles.
"That house has never been seriously damaged," said Sene Karl. "I've been working on this for a series of hurricanes from 2005 to 2004."
"Wilma" hurricane after two weeks, the son of Trump Donald Trump wedding in Malaysia Arago club reception for 370 guests. The wedding photos taken from the famous American Picture Company Getty image in the visible house, swimming pool, beach hut etc. in good condition.
</p>
<div class="pubImg">
<img src="../images/testImg8.jpg" />
</div>
<p>
Arago club and Trump's relatives described,<a>trfyhyrht</a> the damage condition of the property is not so bad. Trump's former Butler Anthony Seneca recalled, "Wilma" hurricane passes behind the horse Arago club house many trees were blown down, but the house itself is just blown away some tiles.
"That house has never been seriously damaged," sai <img src="../images/testImg1.png" alt="" />
</p>
</div>
</div>
......@@ -95,18 +113,36 @@
<input id="linkTitle" value="publications" />
<script>
$(window).scroll(function(){
/* $(window).scroll(function(){
var scrollTop = parseInt($(window).scrollTop());
var scrollHeight = parseInt($(document).height());
var windowHeight =parseInt( $(window).height());
var bottom = parseInt(scrollTop + windowHeight);
if( bottom == scrollHeight){
*//* console.log(scrollTop);
console.log(scrollHeight);
console.log(windowHeight);
var bottom = parseInt(scrollTop + windowHeight);*//*
if( scrollHeight-windowHeight >= 0){
$(".prevBtn").css("opacity",1);
}else{
$(".prevBtn").css("opacity",0);
}
})
})*/
/*滚动后出现关闭按钮*/
$(document).ready(function () { //本人习惯这样写了
$(window).scroll(function () {
var sTop= $(window).scrollTop()
var wHeight= $(window).height()
var rHeight= $(document).height()
var bot = 0; //bot是底部距离的高度
if (sTop>10 && sTop <= parseInt(2 * (rHeight - wHeight))) {
//当底部基本距离+滚动的高度〉=文档的高度-窗体的高度时；
$(".prevBtn").css("opacity",1);
}else{
$(".prevBtn").css("opacity",0);
}
});
});
</script>
</body>
</html>
\ No newline at end of file
src/less/style.less
......@@ -18,7 +18,7 @@ html, body {
.slick-arrow {
position: absolute;
transform: translateY(-50%) !important;
top: 47.5% !important;
top:50% !important;
margin-top: 0 !important;
height: 100% !important;
}
......@@ -177,11 +177,9 @@ body{
}
.slick-prev:hover{
background: url("../images/leftIcon.png") no-repeat left;
margin-left:10px;
}
.slick-next:hover{
background: url("../images/rightIcon.png") no-repeat right;
margin-right: 10px;
}
.am-topbar-fixed-bottom, .am-topbar-fixed-top{
......@@ -436,6 +434,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
color: #8a8a8a;
font-weight: 400;
font-size: 14px;
display: block;
}
.topbar-nav>li>a:hover {
background: transparent;
......@@ -632,7 +631,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
height: 3rem;
overflow: auto;
text-align: left;
padding-left: 30px;
padding-left: 20px;
}
#exDetailUl li div.publicationsIntro p,
.publicationBox li div.publicationsIntro p{
......@@ -654,14 +653,14 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
.publicCon{
width: 50%;
text-align: center;
margin: 200px auto 20px auto;
margin: 200px auto 50px auto;
min-width:600px;
h2{
color: #d4d4d4;
font-size: 24px;
line-height: 60px;
font-size: 22px;
line-height: 35px;
letter-spacing: 4px;
margin-bottom:50px;
margin-bottom:70px;
}
small{
display: block;
......@@ -890,7 +889,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
/*模态框效果*/
.am-modal {
left: 35%;
top: 28%;
top: 27%;
width: 600px;
height: 240px;
margin: 0 auto;
......@@ -1022,7 +1021,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
#cd-timeline::before {
left: 25%;
margin-left: -2px;
height: 96%;
height: 95%;
}
.am-slider .portfolioSiles img{
......@@ -1042,7 +1041,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
height: 30px;
line-height: 30px;
position: absolute;
bottom: 10px;
bottom:30px;
width: 100%;
z-index: 12;
color: #d4d4d4;
......@@ -1111,7 +1110,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
/*模态框效果*/
.am-modal {
left: 25%;
top: 26%;
top: 24%;
width: 600px;
height: 240px;
margin: 0 auto;
......@@ -1127,7 +1126,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
@media (min-width: 640px) and (max-width:1150px){
.publicCon {
margin: 150px auto 0;
margin: 150px auto 40px auto;
}
.am-with-topbar-fixed-top {
padding-top: 100px;
......@@ -1224,7 +1223,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
/*模态框效果*/
.am-modal {
left: 18%;
top: 24%;
top: 21%;
width: 600px;
height: 240px;
margin: 0 auto;
......@@ -1650,7 +1649,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
margin-bottom: 1em;
}
#cd-timeline::before {
height:97%;
height:96%;
}
/*新闻页博客效果*/
#news{
......@@ -1871,7 +1870,10 @@ img.lazy{
}
}
}
.slick-loading{
height:0px!important;
background: transparent;
}
.am-gotop-fixed .am-gotop-icon {
display: block;
height: 32px;
......
src/pages/components/header.html
<script type="text/javascript" src="../js/navRoll.js"></script>
<script type="text/javascript" src="../js/navRoll.min.js"></script>
<!--header-->
<header class="am-topbar am-topbar-fixed-top wos-header blackBg header boxShadow">
<div class="am-container">
......
src/pages/index.ejs
......@@ -9,38 +9,47 @@
<title>钟维兴影像</title>
<% include ./components/publicHead.html %>
<!-- <script src="../assets/js/slickIndex.js"></script>-->
</head>
<body>
<div class="am-container">
<div class="am-slider am-slider-default mobileTop">
<div>
<!-- <div class="bgImg"></div>-->
<div class="title">
<h2>ZHONG WEIXING</h2>
<P><a>中文</a> | <a>English</a></P>
</div>
</div>
<ul class="slider lazy am-slides indexSlide" id="portfolioDel">
<li>
<div>
<img class="image" data-lazy="../images/testImg1.png" />
<div class="image">
<img data-lazy="../images/testImg3.png" />
</div>
</li>
<li>
<div>
<div class="image">
<img data-lazy="../images/testImg2.png" />
</div>
</li>
<li>
<div class="image" >
<img data-lazy="../images/testImg1.png" />
</div>
</li>
<li>
<div class="image">
<img class="image" data-lazy="../images/testImg7.jpg" />
</div>
</li>
<li>
<div>
<img class="image" data-lazy="../images/testImg3.png" />
<div class="image" >
<img data-lazy="../images/testImg11.jpg" />
</div>
</li>
<li>
<div>
<img class="image" data-lazy="../images/testImg2.png" />
<div class="image">
<img data-lazy="../images/testImg10.jpg" />
</div>
</li>
</ul>
......@@ -71,7 +80,6 @@ var _h = parseInt($(window).height());//获取浏览器的宽度
function indexImg(){
var titleH=$(".title h2").height();
var titleP=$(".title p").height();
console.log(_h+20);
if(_w<=640) {
var hTop=parseInt((_h - titleH-20)/2);
var pTop=parseInt((_h - titleP+50)/2);
......
src/pages/portfolioDetail.ejs
......@@ -111,8 +111,13 @@
/*分页数字指示*/
$(function(){
var len=parseInt(parseInt($(this).find("li").size())-2);
$(".allItem").text(len);
/*var len=parseInt(parseInt($(this).find("li").size())-2);
$(".allItem").text(len);*/
var len=parseInt($(".allItem").text());
var windowH = parseInt($(window).height());
$("#portfolioDel").height(windowH);
$(".slick-next").click(function(){
var nowVal=parseInt($(".nowItem").text())+1;
if(nowVal-len<=0){
......@@ -131,17 +136,6 @@
})
})
function item(){
var allItem=parseInt($(".allItem").text());
if(nowVal-allItem<=0){
$(".nowItem").text(nowVal);
}else{
$(".nowItem").text(1);
}
}
</script>
<script>
</script>
</body>
</html>
\ No newline at end of file
src/pages/publicationsDetail.ejs
......@@ -21,6 +21,8 @@
<i class="icon-closeIco3"></i>
</a> </span>
</div>
<div class="am-container">
<div class="publicCon marginTop">
<h2>文章标题文章标题文章标题文章标题</h2>
......@@ -35,7 +37,20 @@
</div>
<p>
Arago club and Trump's relatives described,<a>trfyhyrht</a> the damage condition of the property is not so bad. Trump's former Butler Anthony Seneca recalled, "Wilma" hurricane passes behind the horse Arago club house many trees were blown down, but the house itself is just blown away some tiles.
"That house has never been seriously damaged," sai <img class="lazy" data-original="../images/testImg1.png" alt="" />
"That house has never been seriously damaged," sai <img src="../images/testImg1.png" alt="" />
</p>
<!-- <small>2019/9/23 10:36</small>-->
<p>
In a lot of Malaysia Arago club and Trump's relatives described, the damage condition of the property is not so bad. Trump's former Butler Anthony Seneca recalled, "Wilma" hurricane passes behind the horse Arago club house many trees were blown down, but the house itself is just blown away some tiles.
"That house has never been seriously damaged," said Sene Karl. "I've been working on this for a series of hurricanes from 2005 to 2004."
"Wilma" hurricane after two weeks, the son of Trump Donald Trump wedding in Malaysia Arago club reception for 370 guests. The wedding photos taken from the famous American Picture Company Getty image in the visible house, swimming pool, beach hut etc. in good condition.
</p>
<div class="pubImg">
<img src="../images/testImg8.jpg" />
</div>
<p>
Arago club and Trump's relatives described,<a>trfyhyrht</a> the damage condition of the property is not so bad. Trump's former Butler Anthony Seneca recalled, "Wilma" hurricane passes behind the horse Arago club house many trees were blown down, but the house itself is just blown away some tiles.
"That house has never been seriously damaged," sai <img src="../images/testImg1.png" alt="" />
</p>
</div>
</div>
......@@ -46,18 +61,36 @@
<input id="linkTitle" value="publications" />
<script>
$(window).scroll(function(){
/* $(window).scroll(function(){
var scrollTop = parseInt($(window).scrollTop());
var scrollHeight = parseInt($(document).height());
var windowHeight =parseInt( $(window).height());
var bottom = parseInt(scrollTop + windowHeight);
if( bottom == scrollHeight){
*//* console.log(scrollTop);
console.log(scrollHeight);
console.log(windowHeight);
var bottom = parseInt(scrollTop + windowHeight);*//*
if( scrollHeight-windowHeight >= 0){
$(".prevBtn").css("opacity",1);
}else{
$(".prevBtn").css("opacity",0);
}
})
})*/
/*滚动后出现关闭按钮*/
$(document).ready(function () { //本人习惯这样写了
$(window).scroll(function () {
var sTop= $(window).scrollTop()
var wHeight= $(window).height()
var rHeight= $(document).height()
var bot = 0; //bot是底部距离的高度
if (sTop>10 && sTop <= parseInt(2 * (rHeight - wHeight))) {
//当底部基本距离+滚动的高度〉=文档的高度-窗体的高度时；
$(".prevBtn").css("opacity",1);
}else{
$(".prevBtn").css("opacity",0);
}
});
});
</script>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment