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

@@ -5,7 +5,7 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('hammer'),
+    Hammer = require('yoho.hammer'),
     Swiper = require('yoho.iswiper'),
     Swiper = require('yoho.iswiper'),
     lazyLoad = require('yoho.lazyload');
     lazyLoad = require('yoho.lazyload');
 
 

@@ -5,7 +5,7 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('hammer');
+    Hammer = require('yoho.hammer');
 
 
 var $nav = $('.category-nav'),
 var $nav = $('.category-nav'),
     $categoryContainer = $('.category-container'),
     $categoryContainer = $('.category-container'),

@@ -5,7 +5,7 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('hammer'),
+    Hammer = require('yoho.hammer'),
     Swiper = require('yoho.iswiper');
     Swiper = require('yoho.iswiper');
 
 
 var info = require('./info'),
 var info = require('./info'),

@@ -5,7 +5,7 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('hammer'),
+    Hammer = require('yoho.hammer'),
     ellipsis = require('mlellipsis'),
     ellipsis = require('mlellipsis'),
     lazyLoad = require('yoho.lazyload');
     lazyLoad = require('yoho.lazyload');
 
 

@@ -5,7 +5,7 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('hammer'),
+    Hammer = require('yoho.hammer'),
     ellipsis = require('mlellipsis'),
     ellipsis = require('mlellipsis'),
     lazyLoad = require('yoho.lazyload');
     lazyLoad = require('yoho.lazyload');
 
 

@@ -5,7 +5,7 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('hammer'),
+    Hammer = require('yoho.hammer'),
     lazyLoad = require('yoho.lazyload'),
     lazyLoad = require('yoho.lazyload'),
     Swiper = require('yoho.iswiper');
     Swiper = require('yoho.iswiper');
 
 

@@ -4,7 +4,7 @@
  * @date: 2015/10/12
  * @date: 2015/10/12
  */
  */
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('hammer'),
+    Hammer = require('yoho.hammer'),
     Swiper = require('yoho.iswiper'),
     Swiper = require('yoho.iswiper'),
     lazyLoad = require('yoho.lazyload'),
     lazyLoad = require('yoho.lazyload'),
     $mobileWrap = $('.mobile-wrap'),
     $mobileWrap = $('.mobile-wrap'),

@@ -5,7 +5,7 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('hammer'),
+    Hammer = require('yoho.hammer'),
     tip = require('../plugin/tip'),
     tip = require('../plugin/tip'),
     lazyLoad = require('yoho.lazyload');
     lazyLoad = require('yoho.lazyload');
 
 

@@ -5,7 +5,7 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('hammer');
+    Hammer = require('yoho.hammer');
 
 
 var floatLayerCloseHammer, floatLayerBtnHammer;
 var floatLayerCloseHammer, floatLayerBtnHammer;
 
 

@@ -5,7 +5,7 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('hammer');
+    Hammer = require('yoho.hammer');
 
 
 var $input = $('#search-input input');
 var $input = $('#search-input input');
 
 

@@ -6,7 +6,7 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('hammer');
+    Hammer = require('yoho.hammer');
 
 
 var $filter;
 var $filter;
 
 

@@ -5,7 +5,7 @@
  */
  */
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
-    Hammer = require('hammer'),
+    Hammer = require('yoho.hammer'),
     lazyLoad = require('yoho.lazyload');
     lazyLoad = require('yoho.lazyload');
 
 
 //品牌页参数
 //品牌页参数
@@ -398,6 +398,8 @@ if ($brandHeader.length > 0) {
             success: function(data) {
             success: function(data) {
                 if (data.code === 200) {
                 if (data.code === 200) {
                     $this.toggleClass('coled');
                     $this.toggleClass('coled');
+                } else if (data.code === 400 || data.code === 412) {
+                    tip.show('未登录');
                 } else {
                 } else {
                     tip.show(data.message);
                     tip.show(data.message);
                 }
                 }

@@ -6,7 +6,7 @@
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
     Swiper = require('yoho.iswiper'),
     Swiper = require('yoho.iswiper'),
-    Hammer = require('hammer'),
+    Hammer = require('yoho.hammer'),
     lazyLoad = require('yoho.lazyload');
     lazyLoad = require('yoho.lazyload');
 
 
 var swiper;
 var swiper;

@@ -6,7 +6,7 @@
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
     Swiper = require('yoho.iswiper'),
     Swiper = require('yoho.iswiper'),
-    Hammer = require('hammer'),
+    Hammer = require('yoho.hammer'),
     lazyLoad = require('yoho.lazyload');
     lazyLoad = require('yoho.lazyload');
 
 
 var swiper,
 var swiper,

@@ -23,7 +23,7 @@
       "import-style": "1.0.0",
       "import-style": "1.0.0",
       "yoho.lazyload": "1.1.0",
       "yoho.lazyload": "1.1.0",
       "yoho.handlebars": "3.0.3",
       "yoho.handlebars": "3.0.3",
-      "hammer": "2.0.4"
+      "yoho.hammer": "2.0.4"
     },
     },
     "devDependencies": {
     "devDependencies": {
       "expect.js": "0.3.1"
       "expect.js": "0.3.1"

@@ -17,9 +17,6 @@
         height: 192rem / $pxConvertRem;
         height: 192rem / $pxConvertRem;
         border-bottom: 1px solid #e0e0e0;
         border-bottom: 1px solid #e0e0e0;
         border-right: 1px solid #e0e0e0;
         border-right: 1px solid #e0e0e0;
-        &:nth-child(-n+3) {
-            border-bottom: none;
-        }
     }
     }
 
 
     .classify-logo {
     .classify-logo {

@@ -82,6 +82,7 @@
         <input id="page" type="hidden" value={{page}}>
         <input id="page" type="hidden" value={{page}}>
     {{/if}}
     {{/if}}
     
     
+    {{> product/suspend-cart}}
 </div>
 </div>
 {{> layout/footer}}
 {{> layout/footer}}
 {{> layout/download_app}}
 {{> layout/download_app}}

@@ -93,6 +93,7 @@
         <input id="discount" type="hidden" value={{discount}}>
         <input id="discount" type="hidden" value={{discount}}>
     {{/if}}
     {{/if}}
 
 
+    {{> product/suspend-cart}}
 </div>
 </div>
 {{> layout/footer}}
 {{> layout/footer}}
 {{> layout/download_app}}
 {{> layout/download_app}}