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

@@ -5,9 +5,8 @@
  * @date: 2015/10/19
  * @date: 2015/10/19
  */
  */
 
 
-var $ = require('jquery');
-
-// Hammer = require('yoho.hammer');
+var $ = require('jquery'),
+    Hammer = require('yoho.hammer');
 
 
 var $filter;
 var $filter;
 
 
@@ -113,8 +112,7 @@ function subClassifyTapEvt($this) {
 
 
 //初始化筛选
 //初始化筛选
 function initFilter(opt) {
 function initFilter(opt) {
-
-    // var filterHammer;
+    var filterHammer;
 
 
     //注册回调
     //注册回调
     fCbFn = opt.fCbFn;
     fCbFn = opt.fCbFn;
@@ -127,8 +125,8 @@ function initFilter(opt) {
 
 
     $filter = $('.filter-mask');
     $filter = $('.filter-mask');
 
 
-    // filterHammer = new Hammer($filter[0]);
-    $filter.on('touchend', function(e) {
+    filterHammer = new Hammer($filter[0]);
+    filterHammer.on('tap', function(e) {
         var $this = $(e.target),
         var $this = $(e.target),
             $cur;
             $cur;
 
 
@@ -147,7 +145,7 @@ function initFilter(opt) {
                 //tap classify
                 //tap classify
                 $cur = $this.closest('.classify-item');
                 $cur = $this.closest('.classify-item');
 
 
-                e.stopPropagation();
+                e.srcEvent.stopPropagation();
 
 
                 classifyTapEvt($cur);
                 classifyTapEvt($cur);
             }
             }

@@ -157,6 +157,9 @@
                             margin-top: -$height / 2;
                             margin-top: -$height / 2;
 
 
                         }
                         }
+                        .del-fav {
+                            text-indent: 0;
+                        }
                     }
                     }
 
 
                     span {
                     span {

@@ -114,6 +114,10 @@ $basicBtnC:#eb0313;
             background-color: #000;
             background-color: #000;
             color: #fff;
             color: #fff;
         }
         }
+        .yohood-tag {
+            background-color: #000;
+            color: #fff;
+        }
         .limit-tag {
         .limit-tag {
             border: 1px solid #000;
             border: 1px solid #000;
             background-color: #fff;
             background-color: #fff;
@@ -131,7 +135,7 @@ $basicBtnC:#eb0313;
         // overflow: hidden;
         // overflow: hidden;
     }
     }
     .banner-top-single{
     .banner-top-single{
-        height:pxToRem(600px);
+        
         width: pxToRem(448px);
         width: pxToRem(448px);
         margin:pxToRem(30px) pxToRem(72px);
         margin:pxToRem(30px) pxToRem(72px);
         overflow: hidden;
         overflow: hidden;

@@ -130,9 +130,10 @@
                 div {
                 div {
                     text-align: center;
                     text-align: center;
                     &.cell {
                     &.cell {
+                        line-height: pxToRem(53px);
                         font-size: pxToRem(24px);
                         font-size: pxToRem(24px);
                         background-color: $tableCellC;
                         background-color: $tableCellC;
-                        padding: pxToRem(15px) pxToRem(40px);
+                        padding: 0 pxToRem(40px);
                         border: 1px solid #fff;
                         border: 1px solid #fff;
                     }
                     }
                 }
                 }
@@ -143,14 +144,15 @@
     #reference-swiper-container {
     #reference-swiper-container {
         .first-group {
         .first-group {
             width: pxToRem(70px);
             width: pxToRem(70px);
-            margin-top: pxToRem(66px);
+            margin-top: pxToRem(55px);
+            div{
+                height: pxToRem(55px);    
                 .avatar {
                 .avatar {
-                // line-height: pxToRem(40px);
                     display: inline-block;
                     display: inline-block;
                     width: pxToRem(40px);
                     width: pxToRem(40px);
                     border-radius: 50%;
                     border-radius: 50%;
-                height: pxToRem(40px);
-                margin: pxToRem(12px) 0;
+                    margin-top:pxToRem(7px);
+                }
             }
             }
         }
         }
     }
     }

@@ -13,7 +13,7 @@
                     <p class="good-tag sale-tag">SALE</p>
                     <p class="good-tag sale-tag">SALE</p>
                 {{/ is_discount}}
                 {{/ is_discount}}
                 {{# is_yohoood}}
                 {{# is_yohoood}}
-                    <div class="good-tag yohood-tag"></div>
+                    <div class="good-tag yohood-tag">新品节</div>
                 {{/ is_yohoood}}
                 {{/ is_yohoood}}
                 {{# is_limited}}
                 {{# is_limited}}
                     <p class="good-tag limit-tag">限量商品</p>
                     <p class="good-tag limit-tag">限量商品</p>
@@ -113,6 +113,7 @@
     {{/ enterStore}}
     {{/ enterStore}}
 
 
     <div id="productDesc"> </div>
     <div id="productDesc"> </div>
+    <!-- {{> product/product-description}} -->
     {{> product/recommend-for-you}}
     {{> product/recommend-for-you}}
 
 
     {{#cartInfo}}
     {{#cartInfo}}

@@ -72,7 +72,9 @@
                      {{#params}}
                      {{#params}}
                         {{#if @first}}
                         {{#if @first}}
                         {{else}}
                         {{else}}
+                        <div>
                             <img class="avatar lazy" data-original="{{param}}" alt="">
                             <img class="avatar lazy" data-original="{{param}}" alt="">
+                        </div>
                         {{/if}}
                         {{/if}}
                      {{/params}}
                      {{/params}}
                 </div>
                 </div>