Merge branch 'release/4.3' of http://git.dev.yoho.cn/web/yohobuywap into release/4.3

@@ -5381,7 +5381,7 @@ define("js/passport/bind/relate", ["jquery"], function(require, exports, module)
 require("js/passport/code")(true, false, true);
 require("js/passport/code")(true, false, true);
 
 
 });
 });
-define("js/product/entry", ["jquery","swiper","lazyload","hammer","handlebars","source-map","index"], function(require, exports, module){
+define("js/product/entry", ["jquery","swiper","lazyload","hammer","mlellipsis","handlebars","source-map","index"], function(require, exports, module){
 /**
 /**
  *  产品打包入口
  *  产品打包入口
  * @author: liangzhifeng<zhifeng.liang@yoho.cn>
  * @author: liangzhifeng<zhifeng.liang@yoho.cn>
@@ -6400,7 +6400,7 @@ $listNav.on('touchstart', 'li', function(e) {
 });
 });
 
 
 });
 });
-define("js/product/list", ["jquery","hammer","lazyload"], function(require, exports, module){
+define("js/product/list", ["jquery","hammer","mlellipsis","lazyload"], function(require, exports, module){
 /**
 /**
  * 商品列表页
  * 商品列表页
  * @author: xuqi<qi.xu@yoho.cn>
  * @author: xuqi<qi.xu@yoho.cn>
@@ -6409,6 +6409,7 @@ define("js/product/list", ["jquery","hammer","lazyload"], function(require, expo
 
 
 var $ = require("jquery"),
 var $ = require("jquery"),
     Hammer = require("hammer"),
     Hammer = require("hammer"),
+    ellipsis = require("mlellipsis"),
     lazyLoad = require("lazyload");
     lazyLoad = require("lazyload");
 
 
 
 
@@ -6464,7 +6465,10 @@ var $listNav = $('#list-nav'),
     searching,
     searching,
     btnIntroHammer,
     btnIntroHammer,
     introHammer,
     introHammer,
-    brandColHammer;
+    brandColHammer,
+    $this;
+
+ellipsis.init();
 
 
 $input.on('input', function() {
 $input.on('input', function() {
     if ($input.val() === '') {
     if ($input.val() === '') {

@@ -850,6 +850,7 @@
                 border-color: rgba(255,255,255,.6);
                 border-color: rgba(255,255,255,.6);
                 background-image: image-url("me/index/user-avatar.png");
                 background-image: image-url("me/index/user-avatar.png");
                 background-repeat: no-repeat;
                 background-repeat: no-repeat;
+                background-origin: border-box;
                 background-size: contain;
                 background-size: contain;
                 display: inline-block;
                 display: inline-block;
             }
             }
@@ -939,7 +940,7 @@
                 font-size: 24rem / $pxConvertRem;
                 font-size: 24rem / $pxConvertRem;
                 color: #444;
                 color: #444;
                 margin-top: 5rem / $pxConvertRem;
                 margin-top: 5rem / $pxConvertRem;
-                width: 180rem / $pxConvertRem;
+                width: 260rem / $pxConvertRem;
                 white-space: nowrap;
                 white-space: nowrap;
                 text-overflow: ellipsis;
                 text-overflow: ellipsis;
                 overflow: hidden;
                 overflow: hidden;

@@ -850,6 +850,7 @@
                 border-color: rgba(255,255,255,.6);
                 border-color: rgba(255,255,255,.6);
                 background-image: resolve("me/index/user-avatar.png");
                 background-image: resolve("me/index/user-avatar.png");
                 background-repeat: no-repeat;
                 background-repeat: no-repeat;
+                background-origin: border-box;
                 background-size: contain;
                 background-size: contain;
                 display: inline-block;
                 display: inline-block;
             }
             }
@@ -939,7 +940,7 @@
                 font-size: 24px;
                 font-size: 24px;
                 color: #444;
                 color: #444;
                 margin-top: 5px;
                 margin-top: 5px;
-                width: 180px;
+                width: 260px;
                 white-space: nowrap;
                 white-space: nowrap;
                 text-overflow: ellipsis;
                 text-overflow: ellipsis;
                 overflow: hidden;
                 overflow: hidden;

@@ -15,10 +15,10 @@
         </div>
         </div>
         <div id="Container"></div>
         <div id="Container"></div>
     </div>
     </div>
-    <div class="fan-charts">
-        <h2>新潮粉丝榜</h2>
-        <a href="{{topUrl}}" class="arrow iconfont">&#xe614;</a>
-    </div>
+    <a class="fan-charts" href="{{topUrl}}">
+        <h2>星潮粉丝榜</h2>
+        <span class="arrow iconfont">&#xe614;</span>
+    </a>
     <ul class="fan-charts-cont">
     <ul class="fan-charts-cont">
         <!-- {{#each fanCharts}}
         <!-- {{#each fanCharts}}
             <li>
             <li>