Authored by runner

Merge branch 'release/4.6' of http://git.yoho.cn/fe/yohobuywap-node into release/4.6

... ... @@ -12,7 +12,7 @@
<ul class="clearfix swiper-wrapper">
{{# starAvatar}}
<li class="swiper-slide">
<span class="rank-avatar" data-url='{{url}}' data-avatar="{{image cover 180 180}}"></span>
<a class="rank-avatar" href='{{url}}' data-avatar="{{image cover 180 180}}"></a>
</li>
{{/ starAvatar}}
</ul>
... ...
<div class="banner">
{{# outletActivity}}
<img src="{{image webUrl 640 250}}"/>
<img src="{{image coverUrl 640 250}}"/>
<p class="outlet-activity-time" data-time-ms="{{endLeftTime}}"><i class="iconfont time-ico">&#xe603;</i><span></span></p>
<p class="outlet-discount">{{promotionName}}</p>
{{/ outletActivity}}
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -87,8 +87,6 @@ function bindAvatar(dom) {
} else if (window.queryString.app_version) {
return false;
}
return false;
}
function setIndexAction() {
... ... @@ -125,7 +123,7 @@ function setIndexAction() {
});
starIScroll.iScroll.on('scroll', function() {
if (commonHeaderTop > $avatarWrap.offset().top) {
if ($avatarWrap.offset().top <= 0) {
$('.avatar-clone').show();
if (!avatarSwiperClone) {
... ... @@ -152,7 +150,7 @@ function setIndexAction() {
}
}
if (Math.abs(this.startY) < $('.banner-top').height() + avatarHeight + $('.head-tab').height()) {
if ($avatarWrap.offset().top > $('.avatar-1')[0].scrollHeight) {
$('.avatar-clone').hide();
}
});
... ...
... ... @@ -124,7 +124,7 @@
margin-top: 0;
position: fixed;
width: 640px;
padding: 5px 0;
padding: 30px 0;
z-index: 9;
background: #000;
}
... ... @@ -390,6 +390,7 @@
.star-index-bg {
background: #000;
overflow: hidden;
.star-page {
background: #000;
... ...