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

@@ -4,15 +4,13 @@
  * @date: 2015/10/28
  * @date: 2015/10/28
  */
  */
 var $ = require('jquery');
 var $ = require('jquery');
-
 var $searchBox = $('.search-box'),
 var $searchBox = $('.search-box'),
     $indexSearch = $('.index-search'),
     $indexSearch = $('.index-search'),
     $indexLogo = $('.index-logo');
     $indexLogo = $('.index-logo');
 
 
-$searchBox.find('input').on('focus', function () {
+$searchBox.find('input').on('focus', function() {
     $indexLogo.css({
     $indexLogo.css({
-        width: 0,
-        display: 'none'
+        width: 0
     });
     });
     $searchBox.css({
     $searchBox.css({
         width: '12.8rem'
         width: '12.8rem'
@@ -21,10 +19,9 @@ $searchBox.find('input').on('focus', function () {
         width: '15.5rem'
         width: '15.5rem'
     });
     });
     $('.clear-text, .no-search').show();
     $('.clear-text, .no-search').show();
-}).on('blur', function () {
+}).on('blur', function() {
     $indexLogo.css({
     $indexLogo.css({
-        width: '5.4rem',
-        display: 'block'
+        width: '5.4rem'
     });
     });
     $searchBox.css({
     $searchBox.css({
         width: '8.8rem'
         width: '8.8rem'
@@ -34,11 +31,10 @@ $searchBox.find('input').on('focus', function () {
     });
     });
     $('.clear-text, .no-search').hide();
     $('.clear-text, .no-search').hide();
 });
 });
-
-$searchBox.find('.clear-text').click(function () {
+$searchBox.find('.clear-text').click(function() {
     $searchBox.find('input').val('').trigger('focus');
     $searchBox.find('input').val('').trigger('focus');
 });
 });
-
-$searchBox.find('.search-icon').click(function () {
+$searchBox.find('.search-icon').click(function() {
     $indexSearch.submit();
     $indexSearch.submit();
 });
 });
+

@@ -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);
                 }
                 }

@@ -2,7 +2,7 @@
     position: absolute;
     position: absolute;
     left: 0;
     left: 0;
     right: 0;
     right: 0;
-    top: 2px;
+    top: 0;
 }
 }
 
 
 .filter-mask {
 .filter-mask {

@@ -13,11 +13,18 @@
             font-size: 50rem / $pxConvertRem;
             font-size: 50rem / $pxConvertRem;
             width: 216rem / $pxConvertRem;
             width: 216rem / $pxConvertRem;
             color: #343434;
             color: #343434;
+            overflow: hidden;
+            transition: width 400ms;
         }
         }
 
 
         .index-search {
         .index-search {
-            float: right;
+            position: absolute;
+            top: 0;
+            right: 0;
             width: 384rem / $pxConvertRem;
             width: 384rem / $pxConvertRem;
+            height: 112rem / $pxConvertRem;
+            overflow: hidden;
+            transition: width 400ms;
             .search-box {
             .search-box {
                 float: left;
                 float: left;
                 position: relative;
                 position: relative;

@@ -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}}