Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -83,6 +83,7 @@ function loadData($parent, url, page) {
             }
             }
 
 
             if (data === ' ') {
             if (data === ' ') {
+                $parent.closest('.fav-type').find('.fav-content-loading').addClass('hide');
                 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
                 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
             } else if (data === 'end') {
             } else if (data === 'end') {
                 $parent.closest('.fav-type').find('.fav-load-background')
                 $parent.closest('.fav-type').find('.fav-load-background')

@@ -20,12 +20,27 @@ var sizeSwiper,
 
 
 require('../recommend-for-you.js');
 require('../recommend-for-you.js');
 
 
+//判断是否要显示向左滑动提示
+function hiddenTips($ele) {
+    var offsetContainer = $ele[0].getBoundingClientRect().right;
+    var offsetLastColumn = $ele.find('.swiper-slide:last-child')[0].getBoundingClientRect().right;
+
+
+    if (offsetLastColumn - offsetContainer < 0) {
+        $ele.next('.tips').css('display', 'none');
+    } else {
+        $ele.next('.tips').css('display', 'block');
+    }
+}
+
 function search() {
 function search() {
     if (searching || end) {
     if (searching || end) {
         return;
         return;
     }
     }
     searching = true;
     searching = true;
 
 
+    // alert($('#reference-swiper-container .swiper-wrapper').width());
+
     loading.showLoadingMask();
     loading.showLoadingMask();
 
 
     $.ajax({
     $.ajax({
@@ -47,6 +62,9 @@ function search() {
                 slidesPerView: 'auto'
                 slidesPerView: 'auto'
             });
             });
 
 
+            hiddenTips($('#size-swiper-container'));
+            hiddenTips($('#reference-swiper-container'));
+
             searching = false;
             searching = false;
             end = true;
             end = true;
             loading.hideLoadingMask();
             loading.hideLoadingMask();

@@ -13,6 +13,7 @@ require('./desc');
 require('./comments-consults');
 require('./comments-consults');
 
 
 
 
+
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));
 
 
 //顶部swiper
 //顶部swiper

@@ -19,6 +19,14 @@
             font-weight: bold;
             font-weight: bold;
         }
         }
 
 
+        .name {
+            display: inline-block;
+            max-width: pxToRem(380px);
+            overflow: hidden;
+            text-overflow: ellipsis;   
+            white-space: nowrap;
+        }
+
         .tel {
         .tel {
             float: right;
             float: right;
         }
         }

@@ -3,7 +3,7 @@
         <input type="hidden" name="id" value="">
         <input type="hidden" name="id" value="">
         <label class="username">
         <label class="username">
             收件人姓名
             收件人姓名
-            <input type="text" name="consignee" value="">
+            <input type="text" name="consignee" maxlength="20" value="">
         </label>
         </label>
         <label class="mobile">
         <label class="mobile">
             手机号码
             手机号码
@@ -17,7 +17,7 @@
         </label>
         </label>
         <label class="address">
         <label class="address">
             详细地址   
             详细地址   
-            <textarea name="address"></textarea>
+            <textarea name="address" maxlength="100"></textarea>
         </label>
         </label>
 
 
     </form>
     </form>