Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
Showing
9 changed files
with
33 additions
and
4 deletions
| @@ -12,7 +12,6 @@ var $ = require('jquery'), | @@ -12,7 +12,6 @@ var $ = require('jquery'), | ||
| 12 | 12 | ||
| 13 | var navHammer, | 13 | var navHammer, |
| 14 | winH = $(window).height(), | 14 | winH = $(window).height(), |
| 15 | - loadMoreH = $('#load-more').height(), | ||
| 16 | $goodList = $('#goods-list'), | 15 | $goodList = $('#goods-list'), |
| 17 | searching = false, | 16 | searching = false, |
| 18 | page = 0, | 17 | page = 0, |
| @@ -140,7 +139,7 @@ $('.maybe-like p').on('touchstart', function (e) { | @@ -140,7 +139,7 @@ $('.maybe-like p').on('touchstart', function (e) { | ||
| 140 | 139 | ||
| 141 | //srcoll to load more | 140 | //srcoll to load more |
| 142 | $(window).scroll(function () { | 141 | $(window).scroll(function () { |
| 143 | - if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH - 50) { | 142 | + if ($(window).scrollTop() + winH >= $(document).height()) { |
| 144 | search(); | 143 | search(); |
| 145 | } | 144 | } |
| 146 | }); | 145 | }); |
| @@ -31,6 +31,8 @@ var defaultOpt = { | @@ -31,6 +31,8 @@ var defaultOpt = { | ||
| 31 | gender: $('#gender').val(), | 31 | gender: $('#gender').val(), |
| 32 | brand: $('#brand').val(), | 32 | brand: $('#brand').val(), |
| 33 | sort: $('#sort').val(), | 33 | sort: $('#sort').val(), |
| 34 | + msort: $('#msort').val(), | ||
| 35 | + misort: $('#misort').val(), | ||
| 34 | color: $('#color').val(), | 36 | color: $('#color').val(), |
| 35 | size: $('#size').val(), | 37 | size: $('#size').val(), |
| 36 | price: $('#price').val(), | 38 | price: $('#price').val(), |
| @@ -29,6 +29,8 @@ var defaultOpt = { | @@ -29,6 +29,8 @@ var defaultOpt = { | ||
| 29 | gender: $('#gender').val(), | 29 | gender: $('#gender').val(), |
| 30 | brand: $('#brand').val(), | 30 | brand: $('#brand').val(), |
| 31 | sort: $('#sort').val(), | 31 | sort: $('#sort').val(), |
| 32 | + msort: $('#msort').val(), | ||
| 33 | + misort: $('#misort').val(), | ||
| 32 | color: $('#color').val(), | 34 | color: $('#color').val(), |
| 33 | size: $('#size').val(), | 35 | size: $('#size').val(), |
| 34 | price: $('#price').val(), | 36 | price: $('#price').val(), |
| @@ -32,6 +32,8 @@ var defaultOpt = { | @@ -32,6 +32,8 @@ var defaultOpt = { | ||
| 32 | gender: $('#gender').val(), | 32 | gender: $('#gender').val(), |
| 33 | brand: $('#brand').val(), | 33 | brand: $('#brand').val(), |
| 34 | sort: $('#sort').val(), | 34 | sort: $('#sort').val(), |
| 35 | + msort: $('#msort').val(), | ||
| 36 | + misort: $('#misort').val(), | ||
| 35 | color: $('#color').val(), | 37 | color: $('#color').val(), |
| 36 | size: $('#size').val(), | 38 | size: $('#size').val(), |
| 37 | price: $('#price').val(), | 39 | price: $('#price').val(), |
| @@ -13,7 +13,7 @@ $.ajax({ | @@ -13,7 +13,7 @@ $.ajax({ | ||
| 13 | url: '/cart/index/count', | 13 | url: '/cart/index/count', |
| 14 | success: function(data) { | 14 | success: function(data) { |
| 15 | if (data.code === 200) { | 15 | if (data.code === 200) { |
| 16 | - $cart.find('.cart-count').html(data.data.cart_good_count).removeClass('hide'); | 16 | + $cart.find('.cart-count').html(data.data.cart_goods_count).removeClass('hide'); |
| 17 | } | 17 | } |
| 18 | } | 18 | } |
| 19 | }); | 19 | }); |
| @@ -50,6 +50,14 @@ | @@ -50,6 +50,14 @@ | ||
| 50 | <input id="sort" type="hidden" value={{sort}}> | 50 | <input id="sort" type="hidden" value={{sort}}> |
| 51 | {{/if}} | 51 | {{/if}} |
| 52 | 52 | ||
| 53 | + {{#if msort}} | ||
| 54 | + <input id="msort" type="hidden" value={{msort}}> | ||
| 55 | + {{/if}} | ||
| 56 | + | ||
| 57 | + {{#if misort}} | ||
| 58 | + <input id="misort" type="hidden" value={{misort}}> | ||
| 59 | + {{/if}} | ||
| 60 | + | ||
| 53 | {{#if color}} | 61 | {{#if color}} |
| 54 | <input id="color" type="hidden" value={{color}}> | 62 | <input id="color" type="hidden" value={{color}}> |
| 55 | {{/if}} | 63 | {{/if}} |
| @@ -61,6 +61,14 @@ | @@ -61,6 +61,14 @@ | ||
| 61 | <input id="sort" type="hidden" value={{sort}}> | 61 | <input id="sort" type="hidden" value={{sort}}> |
| 62 | {{/if}} | 62 | {{/if}} |
| 63 | 63 | ||
| 64 | + {{#if msort}} | ||
| 65 | + <input id="msort" type="hidden" value={{msort}}> | ||
| 66 | + {{/if}} | ||
| 67 | + | ||
| 68 | + {{#if misort}} | ||
| 69 | + <input id="misort" type="hidden" value={{misort}}> | ||
| 70 | + {{/if}} | ||
| 71 | + | ||
| 64 | {{#if color}} | 72 | {{#if color}} |
| 65 | <input id="color" type="hidden" value={{color}}> | 73 | <input id="color" type="hidden" value={{color}}> |
| 66 | {{/if}} | 74 | {{/if}} |
| @@ -101,6 +101,14 @@ | @@ -101,6 +101,14 @@ | ||
| 101 | <input id="sort" type="hidden" value={{sort}}> | 101 | <input id="sort" type="hidden" value={{sort}}> |
| 102 | {{/if}} | 102 | {{/if}} |
| 103 | 103 | ||
| 104 | + {{#if msort}} | ||
| 105 | + <input id="msort" type="hidden" value={{msort}}> | ||
| 106 | + {{/if}} | ||
| 107 | + | ||
| 108 | + {{#if misort}} | ||
| 109 | + <input id="misort" type="hidden" value={{misort}}> | ||
| 110 | + {{/if}} | ||
| 111 | + | ||
| 104 | {{#if color}} | 112 | {{#if color}} |
| 105 | <input id="color" type="hidden" value={{color}}> | 113 | <input id="color" type="hidden" value={{color}}> |
| 106 | {{/if}} | 114 | {{/if}} |
-
Please register or login to post a comment