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

@@ -95,12 +95,5 @@ $win.scroll(function() {
   updateLayerPosition();
 });
 
-$win.on('resize', function(){
-  console.log('resize');
-});
-
-$win.on('scrollstop', function(){
-  console.log('stop');
-});
 
 $doc.on('ready', updateLayerPosition);

@@ -3,6 +3,7 @@ var $ = require('jquery'),
 var employ;
 
 window.rePosFooter();
+$('.yoho-footer').css('border-top', '1px solid #e0e0e0');
 $('.employ span').each(function(index) {
     employ = new Hammer($('.employ span')[index]);
     employ.on('tap', function(e) {

@@ -20,12 +20,27 @@ var sizeSwiper,
 
 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() {
     if (searching || end) {
         return;
     }
     searching = true;
 
+    // alert($('#reference-swiper-container .swiper-wrapper').width());
+
     loading.showLoadingMask();
 
     $.ajax({
@@ -47,6 +62,9 @@ function search() {
                 slidesPerView: 'auto'
             });
 
+            hiddenTips($('#size-swiper-container'));
+            hiddenTips($('#reference-swiper-container'));
+
             searching = false;
             end = true;
             loading.hideLoadingMask();

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

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

@@ -101,10 +101,10 @@ $basicBtnC:#eb0313;
             display: inline-block;
             box-sizing: border-box;
             margin-left: .5px;
-            font-size: pxToRem(23px);
+            font-size: pxToRem(18px);
             text-align: center;
-            line-height: pxToRem(33px);
-            padding: 0 5px;
+            line-height: pxToRem(30px);
+            padding: 0 10px;
         }
         .new-tag {
             background-color: #78dc7e;

@@ -47,7 +47,7 @@
         {{#if periodOfMarket}}
         <div class="periodOfMarket">
             <h1>上市期：</h1>
-            <h1 >{{peridOfMarket}}</h1>
+            <h1 >{{periodOfMarket}}</h1>
         </div>
         {{/if}}
     </div>

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

@@ -11,7 +11,7 @@
                 {{userName}}
             </span>
             <span class="goods-spec">
-                {{desc}}
+                购买了{{desc}}
             </span>
             <p class="detail-content">
                 {{content}}