Merge remote-tracking branch 'origin/hotfix'

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

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

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

@@ -77,7 +77,7 @@
     img {
     img {
         display: block;
         display: block;
         width: 100%;
         width: 100%;
-        max-height: 368rem / $pxConvertRem;
+        height: 368rem / $pxConvertRem;
     }
     }
 
 
     .few-tag {
     .few-tag {

@@ -13,7 +13,7 @@
             float: left;
             float: left;
             width: 216rem / $pxConvertRem;
             width: 216rem / $pxConvertRem;
             height: 96rem / $pxConvertRem;
             height: 96rem / $pxConvertRem;
-            background: url(../img/yohologo.png) left center no-repeat;
+            background: image-url("yohologo.png") left center no-repeat;
             background-size: 104px 25px;
             background-size: 104px 25px;
             opacity: 1;
             opacity: 1;
             transition: all 400ms;
             transition: all 400ms;

 .yoho-footer {
 .yoho-footer {
     font-size: 12px;
     font-size: 12px;
     background-color: #fff;
     background-color: #fff;
-    margin-bottom: 2.5rem;
 
 
     .op-row {
     .op-row {
         position: relative;
         position: relative;

@@ -181,6 +181,7 @@
     }
     }
 
 
     .list-nav {
     .list-nav {
+        border-top: 2px solid #fff;
         border-bottom: 1px solid #e6e6e6;
         border-bottom: 1px solid #e6e6e6;
 
 
         > li {
         > li {

@@ -86,8 +86,8 @@
         <input id="limit" type="hidden" value={{limit}}>
         <input id="limit" type="hidden" value={{limit}}>
     {{/if}}
     {{/if}}
     
     
-    {{#if page}}
-        <input id="page" type="hidden" value={{page}}>
+    {{#if style}}
+        <input id="style" type="hidden" value={{style}}>
     {{/if}}
     {{/if}}
 
 
     {{> product/suspend-cart}}
     {{> product/suspend-cart}}

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

@@ -130,5 +130,9 @@
         <input id="query" type="hidden" value={{query}}>
         <input id="query" type="hidden" value={{query}}>
     {{/if}}
     {{/if}}
 
 
+    {{#if style}}
+        <input id="style" type="hidden" value={{style}}>
+    {{/if}}
+
     {{> product/suspend-cart}}
     {{> product/suspend-cart}}
 {{/ goodList}}
 {{/ goodList}}