Merge remote-tracking branch 'origin/develop' into test

@@ -752,7 +752,7 @@
             },
             brand: '',
             gender: '',
-            msort: '',
+            sort: '',
             color: '',
             size: '',
             price: '',

@@ -26,7 +26,7 @@ var winH = $(window).height();
 var defaultOpt = {
     gender: $('#gender').val(),
     brand: $('#brand').val(),
-    msort: $('#msort').val(),
+    sort: $('#sort').val(),
     color: $('#color').val(),
     size: $('#size').val(),
     price: $('#price').val(),
@@ -96,9 +96,9 @@ function search(opt) {
                     brand: opt.id
                 };
                 break;
-            case 'msort':
+            case 'sort':
                 ext = {
-                    msort: opt.id
+                    sort: opt.id
                 };
                 break;
             case 'color':

@@ -23,7 +23,7 @@ var winH = $(window).height();
 var defaultOpt = {
     gender: $('#gender').val(),
     brand: $('#brand').val(),
-    msort: $('#msort').val(),
+    sort: $('#sort').val(),
     color: $('#color').val(),
     size: $('#size').val(),
     price: $('#price').val(),
@@ -104,9 +104,9 @@ function search(opt) {
                     brand: opt.id
                 };
                 break;
-            case 'msort':
+            case 'sort':
                 ext = {
-                    msort: opt.id
+                    sort: opt.id
                 };
                 break;
             case 'color':

@@ -23,7 +23,7 @@ var winH = $(window).height();
 var defaultOpt = {
     gender: $('#gender').val(),
     brand: $('#brand').val(),
-    msort: $('#msort').val(),
+    sort: $('#sort').val(),
     color: $('#color').val(),
     size: $('#size').val(),
     price: $('#price').val(),
@@ -114,9 +114,9 @@ function search(opt) {
                     brand: opt.id
                 };
                 break;
-            case 'msort':
+            case 'sort':
                 ext = {
-                    msort: opt.id
+                    sort: opt.id
                 };
                 break;
             case 'color':

@@ -44,21 +44,20 @@
         float: left;
         width: 191rem / $pxConvertRem;
         height: 181rem / $pxConvertRem;
-        padding: (10rem / $pxConvertRem) 0 0;
+      
         border-left: 1px solid #e0e0e0;
-        border-bottom: 1px solid #e0e0e0;
+    
         .first-show {
             display: none;
         }
         .img-box {
-            display: flex;
-            display: -webkit-flex;
-            height: 140rem / $pxConvertRem;
-            align-items: center;
-            justify-content: center;
+            height: 100%;
+            line-height: 100%;
+            text-align: center;
             img {
-                max-width: 100%;
-                max-height: 100%;
+                width: 100%;
+                height: 100%;
+                vertical-align: middle;
             }
         }
         .category-name {
@@ -70,22 +69,7 @@
     }
     li:first-child {
         width: 253rem / $pxConvertRem;
-        height: 335rem / $pxConvertRem;
-        border-left: none;
-        padding: (48rem / $pxConvertRem) 0 0 0;
-        .first-show {
-            display: block;
-            line-height: 44rem / $pxConvertRem;
-            font-size: 30rem / $pxConvertRem;
-            color: #444;
-            text-align: center;
-        }
-        .img-box {
-            height: 220rem / $pxConvertRem;
-        }
-        .category-name {
-            line-height: 40rem / $pxConvertRem;
-            font-size: 22rem / $pxConvertRem;
-        }
+        height: 382rem / $pxConvertRem;
+        border-left: none;    
     }
 }
\ No newline at end of file

@@ -20,7 +20,8 @@
             border-left: 1px solid #e0e0e0;
             .img-box {
                 width: 100%;
-                height: 138rem / $pxConvertRem;
+                height: 100%;
+                line-height: 138rem / $pxConvertRem;
                 text-align: center;
                 vertical-align: middle;
                 img {

@@ -51,8 +51,8 @@
             <input id="gender" type="hidden" value={{gender}}>
         {{/if}}
 
-        {{#if msort}}
-            <input id="msort" type="hidden" value={{msort}}>
+        {{#if sort}}
+            <input id="sort" type="hidden" value={{sort}}>
         {{/if}}
 
         {{#if color}}

@@ -63,8 +63,8 @@
             <input id="gender" type="hidden" value={{gender}}>
         {{/if}}
 
-        {{#if msort}}
-            <input id="msort" type="hidden" value={{msort}}>
+        {{#if sort}}
+            <input id="sort" type="hidden" value={{sort}}>
         {{/if}}
 
         {{#if color}}

@@ -103,8 +103,8 @@
             <input id="gender" type="hidden" value={{gender}}>
         {{/if}}
 
-        {{#if msort}}
-            <input id="msort" type="hidden" value={{msort}}>
+        {{#if sort}}
+            <input id="sort" type="hidden" value={{sort}}>
         {{/if}}
 
         {{#if color}}

@@ -21,9 +21,8 @@
 		{{# list}}
 		<li>
 			<a href="{{url}}">
-				<p class="first-show">推荐品类</p>
 				<div class="img-box">
-					<img src="{{img}}" alt="">
+					 <img class="lazy" data-original="{{img}}" alt="">
 				</div>
 				<p class="category-name">{{textCn}}</p>
 			</a>

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