chenchao / YOHOBUYPC · Commits

Go to a project

Authored by ccbikai
Commit f39524764bf0060da38ae3993156781ba4cbf09e 2 parents b05d2490 dc7c2865

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

Inline Side-by-side
Showing 6 changed files with 18 additions and 11 deletions
@@ -41,7 +41,8 @@ var defaultOpt = { @@ -41,7 +41,8 @@ var defaultOpt = {
41 size: $('#size').val(), 41 size: $('#size').val(),
42 price: $('#price').val(), 42 price: $('#price').val(),
43 discount: $('#discount').val(), 43 discount: $('#discount').val(),
44 - query: $('#query').val() 44 + query: $('#query').val(),
  45 + style: $('#style').val()
45 }; 46 };
46 47
47 var $listNav = $('#list-nav'), 48 var $listNav = $('#list-nav'),
@@ -34,7 +34,8 @@ var defaultOpt = { @@ -34,7 +34,8 @@ var defaultOpt = {
34 color: $('#color').val(), 34 color: $('#color').val(),
35 size: $('#size').val(), 35 size: $('#size').val(),
36 price: $('#price').val(), 36 price: $('#price').val(),
37 - discount: $('#discount').val() 37 + discount: $('#discount').val(),
  38 + style: $('#style').val()
38 }; 39 };
39 40
40 var $listNav = $('#list-nav'), 41 var $listNav = $('#list-nav'),
@@ -41,7 +41,8 @@ var defaultOpt = { @@ -41,7 +41,8 @@ var defaultOpt = {
41 limit: $('#limit').val(), 41 limit: $('#limit').val(),
42 channel: $('#channel').val(), 42 channel: $('#channel').val(),
43 p_d: $('#p_d').val(), 43 p_d: $('#p_d').val(),
44 - dayLimit: 1 44 + dayLimit: 1,
  45 + style: $('#style').val()
45 }; 46 };
46 47
47 var storeOpt = $.extend({}, defaultOpt); //存储默认筛选条件以便重置 48 var storeOpt = $.extend({}, defaultOpt); //存储默认筛选条件以便重置
@@ -85,11 +85,11 @@ @@ -85,11 +85,11 @@
85 {{#if limit}} 85 {{#if limit}}
86 <input id="limit" type="hidden" value={{limit}}> 86 <input id="limit" type="hidden" value={{limit}}>
87 {{/if}} 87 {{/if}}
88 -  
89 - {{#if page}}  
90 - <input id="page" type="hidden" value={{page}}>  
91 - {{/if}}  
92 88
  89 + {{#if style}}
  90 + <input id="style" type="hidden" value={{style}}>
  91 + {{/if}}
  92 +
93 {{> product/suspend-cart}} 93 {{> product/suspend-cart}}
94 </div> 94 </div>
95 {{> layout/footer}} 95 {{> layout/footer}}
@@ -93,14 +93,14 @@ @@ -93,14 +93,14 @@
93 <input id="limit" type="hidden" value={{limit}}> 93 <input id="limit" type="hidden" value={{limit}}>
94 {{/if}} 94 {{/if}}
95 95
96 - {{#if page}}  
97 - <input id="page" type="hidden" value={{page}}>  
98 - {{/if}}  
99 -  
100 {{#if discount}} 96 {{#if discount}}
101 <input id="discount" type="hidden" value={{discount}}> 97 <input id="discount" type="hidden" value={{discount}}>
102 {{/if}} 98 {{/if}}
103 99
  100 + {{#if style}}
  101 + <input id="style" type="hidden" value={{style}}>
  102 + {{/if}}
  103 +
104 {{> product/suspend-cart}} 104 {{> product/suspend-cart}}
105 </div> 105 </div>
106 {{> layout/footer}} 106 {{> layout/footer}}
@@ -130,5 +130,9 @@ @@ -130,5 +130,9 @@
130 <input id="query" type="hidden" value={{query}}> 130 <input id="query" type="hidden" value={{query}}>
131 {{/if}} 131 {{/if}}
132 132
  133 + {{#if style}}
  134 + <input id="style" type="hidden" value={{style}}>
  135 + {{/if}}
  136 +
133 {{> product/suspend-cart}} 137 {{> product/suspend-cart}}
134 {{/ goodList}} 138 {{/ goodList}}