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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 {{> layout/header}}
 <div class="newarrival-page yoho-page">
-        {{# headerBanner}}
-            {{> product/banner_swipe_and_single}}
-        {{/ headerBanner}}
-  
-        <ul id="list-nav" class="list-nav clearfix">
-            <li id="today" class="today active">
-                <a  href="javascript:void(0);">
-                </a>
-            </li>
-            <li class="week">
-                <a href="javascript:void(0);">
-                    本周上新
-                </a>
-            </li>
-            <li class="sale">
-                <a href="javascript:void(0);">
-                    销量
-                </a>
-            </li>
-            <li class="filter">
-                <a href="javascript:void(0);">
-                    筛选
-                </a>
-                <span class="iconfont">&#xe613;</span>
-            </li>
-        </ul>
- 
-        <div id="goods-container" class="goods-container">
-            <div class="container clearfix">
-                {{# goods}}
-                    {{> good}}
-                {{/ goods}}
-            </div>
-           <div class="container hide clearfix"></div>
-            <div class="container hide clearfix"></div>
-            {{> filter}}
+    {{# headerBanner}}
+        {{> product/banner_swipe_and_single}}
+    {{/ headerBanner}}
+
+    <ul id="list-nav" class="list-nav clearfix">
+        <li id="today" class="today active">
+            <a  href="javascript:void(0);">
+            </a>
+        </li>
+        <li class="week">
+            <a href="javascript:void(0);">
+                本周上新
+            </a>
+        </li>
+        <li class="sale">
+            <a href="javascript:void(0);">
+                销量
+            </a>
+        </li>
+        <li class="filter">
+            <a href="javascript:void(0);">
+                筛选
+            </a>
+            <span class="iconfont">&#xe613;</span>
+        </li>
+    </ul>
+
+    <div id="goods-container" class="goods-container">
+        <div class="container clearfix">
+            {{# goods}}
+                {{> good}}
+            {{/ goods}}
         </div>
-     
-        {{#if brand}}
-            <input id="brand" type="hidden" value={{brand}}>
-        {{/if}}
+       <div class="container hide clearfix"></div>
+        <div class="container hide clearfix"></div>
+        {{> filter}}
+    </div>
+ 
+    {{#if brand}}
+        <input id="brand" type="hidden" value={{brand}}>
+    {{/if}}
 
-        {{#if gender}}
-            <input id="gender" type="hidden" value={{gender}}>
-        {{/if}}
+    {{#if gender}}
+        <input id="gender" type="hidden" value={{gender}}>
+    {{/if}}
 
-        {{#if sort}}
-            <input id="sort" type="hidden" value={{sort}}>
-        {{/if}}
+    {{#if sort}}
+        <input id="sort" type="hidden" value={{sort}}>
+    {{/if}}
 
-        {{#if color}}
-            <input id="color" type="hidden" value={{color}}>
-        {{/if}}
+    {{#if color}}
+        <input id="color" type="hidden" value={{color}}>
+    {{/if}}
 
-        {{#if size}}
-            <input id="size" type="hidden" value={{size}}>
-        {{/if}}
+    {{#if size}}
+        <input id="size" type="hidden" value={{size}}>
+    {{/if}}
 
-        {{#if price}}
-            <input id="price" type="hidden" value={{price}}>
-        {{/if}}
+    {{#if price}}
+        <input id="price" type="hidden" value={{price}}>
+    {{/if}}
 
-        {{#if p_d}}
-            <input id="p_d" type="hidden" value={{p_d}}>
-        {{/if}}
+    {{#if p_d}}
+        <input id="p_d" type="hidden" value={{p_d}}>
+    {{/if}}
 
-        {{#if channel}}
-            <input id="channel" type="hidden" value={{channel}}>
-        {{/if}}
+    {{#if channel}}
+        <input id="channel" type="hidden" value={{channel}}>
+    {{/if}}
 
-        {{#if dayLimit}}
-            <input id="dayLimit" type="hidden" value={{dayLimit}}>
-        {{/if}}
+    {{#if dayLimit}}
+        <input id="dayLimit" type="hidden" value={{dayLimit}}>
+    {{/if}}
 
-        {{#if limit}}
-            <input id="limit" type="hidden" value={{limit}}>
-        {{/if}}
+    {{#if limit}}
+        <input id="limit" type="hidden" value={{limit}}>
+    {{/if}}
 
-        {{#if page}}
-            <input id="page" type="hidden" value={{page}}>
-        {{/if}}
+    {{#if page}}
+        <input id="page" type="hidden" value={{page}}>
+    {{/if}}
     
+    {{> product/suspend-cart}}
 </div>
 {{> layout/footer}}
 {{> layout/download_app}}
\ No newline at end of file

 {{> layout/header}}
 <div class="discount-page yoho-page">
-        {{# headerBanner}}
-            {{> product/banner_swipe_and_single}}
-        {{/ headerBanner}}
-  
-           <ul id="list-nav" class="list-nav clearfix">
-            <li class="new active">
-                <a href="javascript:void(0);">
-                    <span class="spanTest">最新</span>
-                    <span class="iconfont cur">&#xe616;</span>
-                </a>
-            </li>
-            <li class="price">
-                <a href="javascript:void(0);">
-                    <span class="spanTest">价格</span>
-                    <span class="icon">
-                        <i class="iconfont up">&#xe615;</i>
-                        <i class="iconfont down cur">&#xe616;</i>
-                    </span>
-                </a>
-            </li>
-            <li class="discount">
-                <a href="javascript:void(0);">
-                    <span class="spanTest">折扣</span>
-                    <span class="icon">
-                        <i class="iconfont up">&#xe615;</i>
-                        <i class="iconfont down cur">&#xe616;</i>
-                    </span>
-                </a>
-            </li>
-            <li class="filter">
-                <a href="javascript:void(0);">
-                    <span class="spanTest">筛选</span>
-                    <span class="iconfont">&#xe613;</span>
-                </a>
-            </li>
-        </ul>
+    {{# headerBanner}}
+        {{> product/banner_swipe_and_single}}
+    {{/ headerBanner}}
 
-        <div id="goods-container" class="goods-container">
-            <div class="new-goods container clearfix">
-                {{# goods}}
-                    {{> good}}
-                {{/ goods}}
-            </div>
-            <div class="price-goods container hide clearfix"></div>
-            <div class="discount-goods container hide clearfix"></div>
- 
-            {{> filter}}
+       <ul id="list-nav" class="list-nav clearfix">
+        <li class="new active">
+            <a href="javascript:void(0);">
+                <span class="spanTest">最新</span>
+                <span class="iconfont cur">&#xe616;</span>
+            </a>
+        </li>
+        <li class="price">
+            <a href="javascript:void(0);">
+                <span class="spanTest">价格</span>
+                <span class="icon">
+                    <i class="iconfont up">&#xe615;</i>
+                    <i class="iconfont down cur">&#xe616;</i>
+                </span>
+            </a>
+        </li>
+        <li class="discount">
+            <a href="javascript:void(0);">
+                <span class="spanTest">折扣</span>
+                <span class="icon">
+                    <i class="iconfont up">&#xe615;</i>
+                    <i class="iconfont down cur">&#xe616;</i>
+                </span>
+            </a>
+        </li>
+        <li class="filter">
+            <a href="javascript:void(0);">
+                <span class="spanTest">筛选</span>
+                <span class="iconfont">&#xe613;</span>
+            </a>
+        </li>
+    </ul>
+
+    <div id="goods-container" class="goods-container">
+        <div class="new-goods container clearfix">
+            {{# goods}}
+                {{> good}}
+            {{/ goods}}
         </div>
-     
-        {{#if brand}}
-            <input id="brand" type="hidden" value={{brand}}>
-        {{/if}}
+        <div class="price-goods container hide clearfix"></div>
+        <div class="discount-goods container hide clearfix"></div>
+
+        {{> filter}}
+    </div>
+ 
+    {{#if brand}}
+        <input id="brand" type="hidden" value={{brand}}>
+    {{/if}}
+
+    {{#if gender}}
+        <input id="gender" type="hidden" value={{gender}}>
+    {{/if}}
 
-        {{#if gender}}
-            <input id="gender" type="hidden" value={{gender}}>
-        {{/if}}
+    {{#if sort}}
+        <input id="sort" type="hidden" value={{sort}}>
+    {{/if}}
 
-        {{#if sort}}
-            <input id="sort" type="hidden" value={{sort}}>
-        {{/if}}
+    {{#if color}}
+        <input id="color" type="hidden" value={{color}}>
+    {{/if}}
 
-        {{#if color}}
-            <input id="color" type="hidden" value={{color}}>
-        {{/if}}
+    {{#if size}}
+        <input id="size" type="hidden" value={{size}}>
+    {{/if}}
 
-        {{#if size}}
-            <input id="size" type="hidden" value={{size}}>
-        {{/if}}
+    {{#if price}}
+        <input id="price" type="hidden" value={{price}}>
+    {{/if}}
 
-        {{#if price}}
-            <input id="price" type="hidden" value={{price}}>
-        {{/if}}
+    {{#if p_d}}
+        <input id="p_d" type="hidden" value={{p_d}}>
+    {{/if}}
 
-        {{#if p_d}}
-            <input id="p_d" type="hidden" value={{p_d}}>
-        {{/if}}
+    {{#if channel}}
+        <input id="channel" type="hidden" value={{channel}}>
+    {{/if}}
 
-        {{#if channel}}
-            <input id="channel" type="hidden" value={{channel}}>
-        {{/if}}
+    {{#if limit}}
+        <input id="limit" type="hidden" value={{limit}}>
+    {{/if}}
 
-        {{#if limit}}
-            <input id="limit" type="hidden" value={{limit}}>
-        {{/if}}
+    {{#if page}}
+        <input id="page" type="hidden" value={{page}}>
+    {{/if}}
 
-        {{#if page}}
-            <input id="page" type="hidden" value={{page}}>
-        {{/if}}
+    {{#if discount}}
+        <input id="discount" type="hidden" value={{discount}}>
+    {{/if}}
 
-        {{#if discount}}
-            <input id="discount" type="hidden" value={{discount}}>
-        {{/if}}
-    
+    {{> product/suspend-cart}}
 </div>
 {{> layout/footer}}
 {{> layout/download_app}}
\ No newline at end of file