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

@@ -12,7 +12,6 @@ var $ = require('jquery'),
 
 var navHammer,
     winH = $(window).height(),
-    loadMoreH = $('#load-more').height(),
     $goodList = $('#goods-list'),
     searching = false,
     page = 0,
@@ -140,7 +139,7 @@ $('.maybe-like p').on('touchstart', function (e) {
 
 //srcoll to load more
 $(window).scroll(function () {
-    if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH - 50) {
+    if ($(window).scrollTop() + winH >= $(document).height()) {
         search();
     }
 });
\ No newline at end of file

@@ -31,6 +31,8 @@ var defaultOpt = {
     gender: $('#gender').val(),
     brand: $('#brand').val(),
     sort: $('#sort').val(),
+    msort: $('#msort').val(),
+    misort: $('#misort').val(),
     color: $('#color').val(),
     size: $('#size').val(),
     price: $('#price').val(),

@@ -29,6 +29,8 @@ var defaultOpt = {
     gender: $('#gender').val(),
     brand: $('#brand').val(),
     sort: $('#sort').val(),
+    msort: $('#msort').val(),
+    misort: $('#misort').val(),
     color: $('#color').val(),
     size: $('#size').val(),
     price: $('#price').val(),

@@ -32,6 +32,8 @@ var defaultOpt = {
     gender: $('#gender').val(),
     brand: $('#brand').val(),
     sort: $('#sort').val(),
+    msort: $('#msort').val(),
+    misort: $('#misort').val(),
     color: $('#color').val(),
     size: $('#size').val(),
     price: $('#price').val(),

@@ -13,7 +13,7 @@ $.ajax({
     url: '/cart/index/count',
     success: function(data) {
         if (data.code === 200) {
-            $cart.find('.cart-count').html(data.data.cart_good_count).removeClass('hide');
+            $cart.find('.cart-count').html(data.data.cart_goods_count).removeClass('hide');
         }
     }
 });
\ No newline at end of file

@@ -50,6 +50,14 @@
         <input id="sort" type="hidden" value={{sort}}>
     {{/if}}
 
+    {{#if msort}}
+        <input id="msort" type="hidden" value={{msort}}>
+    {{/if}}
+
+    {{#if misort}}
+        <input id="misort" type="hidden" value={{misort}}>
+    {{/if}}
+
     {{#if color}}
         <input id="color" type="hidden" value={{color}}>
     {{/if}}

@@ -61,6 +61,14 @@
         <input id="sort" type="hidden" value={{sort}}>
     {{/if}}
 
+    {{#if msort}}
+        <input id="msort" type="hidden" value={{msort}}>
+    {{/if}}
+
+    {{#if misort}}
+        <input id="misort" type="hidden" value={{misort}}>
+    {{/if}}
+
     {{#if color}}
         <input id="color" type="hidden" value={{color}}>
     {{/if}}

@@ -101,6 +101,14 @@
         <input id="sort" type="hidden" value={{sort}}>
     {{/if}}
 
+    {{#if msort}}
+        <input id="msort" type="hidden" value={{msort}}>
+    {{/if}}
+
+    {{#if misort}}
+        <input id="misort" type="hidden" value={{misort}}>
+    {{/if}}
+
     {{#if color}}
         <input id="color" type="hidden" value={{color}}>
     {{/if}}

@@ -2,5 +2,5 @@
     <a href={{cartUrl}}>
         <span class="iconfont">&#xe62c;</span>
     </a>
-    <span class="cart-count hide">1</span>
+    <span class="cart-count hide">0</span>
 </div>
\ No newline at end of file