Authored by 郝肖肖

Merge branch 'feature/plustar' into release/4.9.1.0

... ... @@ -10,6 +10,7 @@ var plusstar = {},
require('../common');
plusstar = {
scrollObj: {},
init: function() {
var that = this,
$liDom,
... ... @@ -49,6 +50,12 @@ plusstar = {
tabNav: function(code) {
var that = this;
if (typeof this.scrollObj[code] === 'undefined') {
// 如果不是第一次点击,回顶部
$(document).scrollTop(0);
this.scrollObj[code] = true;
}
loading.showLoadingMask();
$.ajax({
type: 'GET',
... ... @@ -71,7 +78,7 @@ plusstar = {
loading.hideLoadingMask();
lazyLoad($('img.lazy'));
//处理左右滑动,未加载的图片
// 处理左右滑动,未加载的图片
setTimeout(function() {
$('img.lazy').each(function() {
if ($(this).attr('src') !== $(this).data('original')) {
... ...
... ... @@ -14,6 +14,9 @@
height: 80px;
font-size: 16px;
text-align: center;
position: fixed;
z-index: 10;
background-color: #fff;
li {
display: block;
... ... @@ -49,6 +52,12 @@
}
}
.plusstar-resources:before {
height: 72px;
content: "";
display: inline-block;
}
.resources {
background: #f6f6f6;
... ... @@ -72,15 +81,13 @@
.header-title {
position: relative;
width: 100%;
height: 100px;
height: 70px;
font-size: 28px;
line-height: 100px;
line-height: 70px;
text-align: center;
font-weight: bold;
border-top: 1px solid #eee;
margin: 0;
margin-top: 20px;
background: #fff;
.more {
position: absolute;
... ... @@ -88,6 +95,8 @@
right: 0;
width: 100px;
height: 100px;
color: #b0b0b0;
font-size: 50px;
}
&:first-child {
... ... @@ -178,14 +187,12 @@
a {
display: inline-block;
width: 50%;
height: 375px;
overflow: hidden;
}
}
img {
width: 100%;
height: 100%;
}
.goods {
background-color: #fff;
}
}
}
... ...