Merge branch 'feature/shopStyle'

 {{# shopTopBanner}}
     <div class="shop-banner">
-        <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{banner}})"></div>
+        <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{banner}})">
+            <div class="banner-mark"></div>
+        </div>
         {{#if isShowShopName}}
         <div class="shop-name">
             {{brandIntro.brandName}}
@@ -46,12 +48,9 @@
 {{#if navigationBar}}
     <ul class="shop-nav clearfix">
         {{#navigationBar}}
-        <li class="nav-item {{#if @first}}first{{/if}} {{#if current}}current{{/if}}">
+        <li class="nav-item {{#if @first}}first{{/if}}{{#if current}}current{{/if}}">
             <a href="{{url}}">
                 {{name}}
-                {{#if arrow}}
-                    <span class="iconfont">&#xe63a;</span>
-                {{/if}}
             </a>
         </li>
         {{/navigationBar}}

@@ -18,6 +18,12 @@
             height: 150px;
         }
 
+        .banner-mark {
+            width: 100%;
+            height: 100%;
+            background: resolve('/product/banner-mark.png');
+        }
+
         .opt-wrap {
             position: absolute;
             top: 65%;
@@ -104,6 +110,11 @@
         }
     }
 
+    .sort-child-list a {
+        height: 28px;
+        line-height: 28px;
+    }
+
     .coupon {
         margin-top: 20px;
         width: 100%;
@@ -187,7 +198,6 @@
             margin-bottom: 20px;
             width: 235px;
             height: 315px;
-            font-size: 14px;
             text-align: center;
             line-height: 1.5;
             background: #f5f5f5;
@@ -201,10 +211,16 @@
             .title {
                 width: 220px;
                 padding: 0 5px;
+                font-size: 12px;
                 text-overflow: ellipsis;
                 white-space: nowrap;
                 overflow: hidden;
             }
+
+            .price {
+                font-size: 15px;
+                line-height: 32px;
+            }
         }
 
         .hat {
@@ -377,6 +393,7 @@
         position: relative;
         width: 100%;
         text-align: center;
+        margin-bottom: 20px;
 
         a {
             display: block;
@@ -394,6 +411,10 @@
     .trend-info {
         width: 100%;
 
+        .floor-header {
+            margin-top: 70px;
+        }
+
         .trend-list {
             width: 100%;
 
@@ -401,6 +422,7 @@
                 float: left;
                 width: 316px;
                 margin-left: 10px;
+                margin-bottom: 20px;
                 text-align: center;
 
                 &:first-child {
@@ -417,7 +439,7 @@
             .sub-title {
                 box-sizing: border-box;
                 font-size: 16px;
-                margin-top: 15px;
+                font-weight: bold;
                 padding: 0 10px;
                 width: 100%;
                 overflow: hidden;
@@ -426,8 +448,12 @@
                 line-height: 24px;
             }
 
+            .main-title {
+                padding-top: 20px;
+            }
+
             .sub-title {
-                margin-top: 0;
+                padding-bottom: 20px;
                 font-size: 14px;
             }
         }
@@ -500,14 +526,15 @@
             display: inline-block;
             line-height: 14px;
             vertical-align: middle;
-            font-weight: bold;
 
             .name {
                 font-size: 14px;
+                font-weight: bold;
             }
 
             .en-name {
                 font-size: 12px;
+                margin-top: 4px;
             }
         }
 

@@ -560,7 +560,7 @@ class ShopModel
                 'title' => $resource['productName'],
                 'productSkn' => $resource['productSkn'],
                 'price' => '￥' . number_format(trim($resource['salesPrice'], '￥'), 2, '.', ''),
-                'img' => self::imageView2($resource['src'], 250, 340),
+                'img' => self::imageView2($resource['src'], 250, 250),
                 'url' => Helpers::getProductUrl($resource['productId'], $resource['productSkn'], $resource['productName']),
             );
         }
@@ -582,7 +582,7 @@ class ShopModel
                 'title' => $resource['productName'],
                 'productSkn' => $resource['productSkn'],
                 'price' => '￥' . number_format(trim($resource['salesPrice'], '￥'), 2, '.', ''),
-                'img' => self::imageView2($resource['src'], 250, 340),
+                'img' => self::imageView2($resource['src'], 250, 250),
                 'url' => Helpers::getProductUrl($resource['productId'], $resource['productSkn'], $resource['productName']),
                 'index' => $key + 1
             );