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

@@ -41,7 +41,8 @@ var defaultOpt = {
     size: $('#size').val(),
     price: $('#price').val(),
     discount: $('#discount').val(),
-    query: $('#query').val()
+    query: $('#query').val(),
+    style: $('#style').val()
 };
 
 var $listNav = $('#list-nav'),

@@ -34,7 +34,8 @@ var defaultOpt = {
     color: $('#color').val(),
     size: $('#size').val(),
     price: $('#price').val(),
-    discount: $('#discount').val()
+    discount: $('#discount').val(),
+    style: $('#style').val()
 };
 
 var $listNav = $('#list-nav'),

@@ -41,7 +41,8 @@ var defaultOpt = {
     limit: $('#limit').val(),
     channel: $('#channel').val(),
     p_d: $('#p_d').val(),
-    dayLimit: 1
+    dayLimit: 1,
+    style: $('#style').val()
 };
 
 var storeOpt = $.extend({}, defaultOpt); //存储默认筛选条件以便重置

@@ -85,11 +85,11 @@
     {{#if limit}}
         <input id="limit" type="hidden" value={{limit}}>
     {{/if}}
-
-    {{#if page}}
-        <input id="page" type="hidden" value={{page}}>
-    {{/if}}
     
+    {{#if style}}
+        <input id="style" type="hidden" value={{style}}>
+    {{/if}}
+
     {{> product/suspend-cart}}
 </div>
 {{> layout/footer}}
\ No newline at end of file

@@ -93,14 +93,14 @@
         <input id="limit" type="hidden" value={{limit}}>
     {{/if}}
 
-    {{#if page}}
-        <input id="page" type="hidden" value={{page}}>
-    {{/if}}
-
     {{#if discount}}
         <input id="discount" type="hidden" value={{discount}}>
     {{/if}}
 
+    {{#if style}}
+        <input id="style" type="hidden" value={{style}}>
+    {{/if}}
+
     {{> product/suspend-cart}}
 </div>
 {{> layout/footer}}
\ No newline at end of file

@@ -130,5 +130,9 @@
         <input id="query" type="hidden" value={{query}}>
     {{/if}}
 
+    {{#if style}}
+        <input id="style" type="hidden" value={{style}}>
+    {{/if}}
+
     {{> product/suspend-cart}}
 {{/ goodList}}
\ No newline at end of file