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">
                 <ul class="clearfix swiper-wrapper">
                     {{# starAvatar}}
                     {{# starAvatar}}
                         <li class="swiper-slide">
                         <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>
                         </li>
                     {{/ starAvatar}}
                     {{/ starAvatar}}
                 </ul>
                 </ul>

 <div class="banner">
 <div class="banner">
 
 
     {{# outletActivity}}
     {{# 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-activity-time" data-time-ms="{{endLeftTime}}"><i class="iconfont time-ico">&#xe603;</i><span></span></p>
         <p class="outlet-discount">{{promotionName}}</p>
         <p class="outlet-discount">{{promotionName}}</p>
     {{/ outletActivity}}
     {{/ outletActivity}}

@@ -87,8 +87,6 @@ function bindAvatar(dom) {
     } else if (window.queryString.app_version) {
     } else if (window.queryString.app_version) {
         return false;
         return false;
     }
     }
-
-    return false;
 }
 }
 
 
 function setIndexAction() {
 function setIndexAction() {
@@ -125,7 +123,7 @@ function setIndexAction() {
     });
     });
 
 
     starIScroll.iScroll.on('scroll', function() {
     starIScroll.iScroll.on('scroll', function() {
-        if (commonHeaderTop > $avatarWrap.offset().top) {
+        if ($avatarWrap.offset().top <= 0) {
             $('.avatar-clone').show();
             $('.avatar-clone').show();
 
 
             if (!avatarSwiperClone) {
             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();
             $('.avatar-clone').hide();
         }
         }
     });
     });

@@ -124,7 +124,7 @@
             margin-top: 0;
             margin-top: 0;
             position: fixed;
             position: fixed;
             width: 640px;
             width: 640px;
-            padding: 5px 0;
+            padding: 30px 0;
             z-index: 9;
             z-index: 9;
             background: #000;
             background: #000;
         }
         }
@@ -390,6 +390,7 @@
 
 
 .star-index-bg {
 .star-index-bg {
     background: #000;
     background: #000;
+    overflow: hidden;
 
 
     .star-page {
     .star-page {
         background: #000;
         background: #000;