Merge branch 'develop' into test

@@ -17,3 +17,4 @@ require('./browse-record');
 require('./address-act');
 require('./address-act');
 require('./logistic');
 require('./logistic');
 require('./pay');
 require('./pay');
+require('./personal-details');

@@ -43,7 +43,8 @@ goodsSwiper = new Swiper('.banner-swiper', {
     paginationClickable: true,
     paginationClickable: true,
     pagination: '.banner-top .pagination-inner',
     pagination: '.banner-top .pagination-inner',
     nextButton: '.my-swiper-button-next',
     nextButton: '.my-swiper-button-next',
-    prevButton: '.my-swiper-button-prev'
+    prevButton: '.my-swiper-button-prev',
+    spaceBetween: 3
 });
 });
 
 
 
 
@@ -69,4 +70,3 @@ if (goodsDiscountHammer) {
 
 
 
 
 require('./like');
 require('./like');
-

@@ -9,4 +9,5 @@ require('./newsale/discount');
 require('./list');
 require('./list');
 require('./detail/detail');
 require('./detail/detail');
 require('./detail/loadmore');
 require('./detail/loadmore');
-require('./detail/consultform');
+require('./detail/consultform');
+require('./detail/hot-rank');

@@ -13,10 +13,14 @@
     .basic-info {
     .basic-info {
         padding-top: 30rem / $pxConvertRem;
         padding-top: 30rem / $pxConvertRem;
         padding-bottom: 25rem / $pxConvertRem;
         padding-bottom: 25rem / $pxConvertRem;
-
         .user-name {
         .user-name {
+            max-width: 240rem / $pxConvertRem;
+            text-overflow:ellipsis; 
+            white-space:nowrap; 
             font-size: 25rem / $pxConvertRem;
             font-size: 25rem / $pxConvertRem;
             margin-right: 0.5rem;
             margin-right: 0.5rem;
+            display: inline-block;
+            overflow: hidden;
         }
         }
 
 
         .vip-icon {
         .vip-icon {