Merge branch 'feature/hotrank' into 'web'

Feature/hotrank

hotrank html css js
js主要功能： 1.Banner图片轮播 2.品牌列表切换 3.一周热卖点击导航切换商品列表（后端提供接口） 4.一周热卖下拉加载商品列表（后端提供接口）
Review by @徐祁

See merge request !69

-.hotrank-page {
-    width: 1150px;
+.hotrank-page { 
+    width: 990px;
     margin: 0 auto;
     margin: 0 auto;
 
 
-    .popular-goods {
-        .popular-list {
-            width: 1160px;
-        }
+    .popular-list {
+        width: 1160px;
 
 
         li {
         li {
             position: relative;
             position: relative;
             float: left;
             float: left;
-            width: 378px;
-            height: 596px;
+            width: 324px;
+            height: 521px;
             overflow: hidden;
             overflow: hidden;
             list-style: none;
             list-style: none;
             margin: 0 8px 0 0;
             margin: 0 8px 0 0;
 
 
             .item-img {
             .item-img {
-                width: 378px;
-                height: 506px;
-                line-height: 506px;
+                width: 100%;
+                height: 434px;
+                line-height: 434px;
                 text-align: center;
                 text-align: center;
                 overflow: hidden;
                 overflow: hidden;
             }
             }
@@ -44,7 +42,7 @@
             }
             }
 
 
             .item-content {
             .item-content {
-                width: 378px;
+                width: 100%;
                 padding: 14px 0 0 0;
                 padding: 14px 0 0 0;
                 height: 77px;
                 height: 77px;
                 overflow: hidden;
                 overflow: hidden;
@@ -84,20 +82,16 @@
         .popular-item7, 
         .popular-item7, 
         .popular-item8, 
         .popular-item8, 
         .popular-item9 {
         .popular-item9 {
-            width: 280px;
-            height: 464px;
+            width: 240px;
+            height: 408px;
             margin: 0 10px 0 0;
             margin: 0 10px 0 0;
             overflow: hidden;
             overflow: hidden;
 
 
             .item-img {
             .item-img {
-                width: 280px;
-                height: 374px;
-                line-height: 374px;
+                height: 320px;
+                line-height: 320px;
             }
             }
 
 
-            .item-content {
-                width: 280px;
-            }
         }
         }
     }
     }
 
 
@@ -145,8 +139,8 @@
         width: 1160px;
         width: 1160px;
 
 
         .good-info {
         .good-info {
-            width: 280px;
-            height: 464px;
+            width: 240px;
+            height: 408px;
             margin: 10px 10px 0 0;
             margin: 10px 10px 0 0;
 
 
             .tag-container {
             .tag-container {
@@ -154,8 +148,8 @@
             }
             }
 
 
             .good-detail-img {
             .good-detail-img {
-                height: 374px;
-                line-height: 374px;
+                height: 320px;
+                line-height: 320px;
                 text-align: center;
                 text-align: center;
                 font-size: 0;
                 font-size: 0;
 
 
@@ -250,3 +244,46 @@
         }
         }
     }
     }
 }
 }
+
+@media screen and (min-width: 1150px) {
+.hotrank-page {
+    width: 1150px;
+
+    .popular-list {
+        li {
+            width: 378px;
+            height: 596px;
+            .item-img {
+                height: 506px;
+                line-height: 506px;
+            }
+        }
+
+        .popular-item6,  
+        .popular-item7, 
+        .popular-item8, 
+        .popular-item9 {
+            width: 280px;
+            height: 464px;
+
+            .item-img {
+                height: 374px;
+                line-height: 374px;
+            }
+
+        }
+    }
+
+    .hot-week-list {
+        .good-info {
+            width: 280px;
+            height: 464px;
+
+            .good-detail-img {
+                height: 374px;
+                line-height: 374px;
+            }
+        }
+    }
+}
+}