Merge branch 'hotfix/outlets' into hotfix/brandSaleBug

@@ -5,7 +5,7 @@
         <label class="time" data-limit="{{limit}}"></label>
     </div>
     <div class="special-name">
-        <img src="{{image logo 100 40}}">
+        <img src="{{image logo 86 40}}">
         {{special}}
         <span><i>{{discount}}</i>{{discountText}}</span>
     </div>

@@ -4,7 +4,7 @@
         <div class="tpl-nav">
             <div class="tpl-keywords">
                 {{#each blocks}}
-                <a class="keywords{{@index}}" title="{{title}}" href="{{url}}" target= "_blank"><img src="{{image img 185 75}}"/></a>
+                <a class="keywords{{@index}}" title="{{title}}" href="{{url}}" target= "_blank"><img src="{{image img 185 76}}"/></a>
                 {{/each}}
             </div>
             <div class="tpl-category clearfix">
@@ -15,13 +15,13 @@
         </div>
         <div class="tpl-brands imgopacity clearfix">
             {{#each brands}}
-            <a title="{{title}}" href="{{url}}" target= "_blank"><img src="{{image img 375 505}}"/></a>
+            <a title="{{title}}" href="{{url}}" target= "_blank"><img src="{{image img 377 504}}"/></a>
             {{/each}}
         </div>
         <div class="tpl-types imgopacity clearfix">
             <ul>
                 {{#each types}}
-                <li><a title="{{title}}" href="{{url}}" target= "_blank"><img src="{{image img 185 245}}"/></a></li>
+                <li><a title="{{title}}" href="{{url}}" target= "_blank"><img src="{{image img 185 248}}"/></a></li>
                 {{/each}}
             </ul>
         </div>

@@ -5,7 +5,7 @@
             <div class="list-page">
                 {{# brands}}
                     <div class="brand-item">
-                        <img class="lazy" data-original="{{image logo 112 77}}">
+                        <img class="lazy" data-original="{{image logo 140 65}}">
                     </div>
                 {{/ brands}}
             </div>

@@ -22,7 +22,7 @@
                     </a>
                     <div class="item-info">
                         <a href="{{href}}" target="_blank">
-                            <img class="logo-img" src="{{image logo 155 65}}">
+                            <img class="logo-img" src="{{image logo 140 65}}">
                             <p class="discount"><i>{{discount}}</i>{{discountText}}</p>
                             <p class="title">{{title}}</p>
                             <label class="time" data-limit="{{limit}}" data-pre="仅剩"></label>

@@ -10,7 +10,7 @@
                         </a>
                         <div class="item-info">
                             <a href="{{href}}" target="_blank">
-                                <img src="{{image logo 150 50}}" class="brand-logo">
+                                <img src="{{image logo 140 65}}" class="brand-logo">
                             </a>
                             <div class="activity-info">
                                 <p>

 <div class="floor-header clearfix">
-    <h2 class="floor-title">{{name}}</h2>
+    {{# name}}
+        <h2 class="floor-title">{{.}}</h2>
+    {{/ name}}
     {{#if navs}}
     <ul class="header-navs">
         {{# navs}}

@@ -575,8 +575,8 @@
         }
 
         .tpl-brands {
-            width: 378px;
-            height: 512px;
+            width: 377px;
+            height: 504px;
 
             li a {
                 height: 248px;

@@ -56,8 +56,8 @@
             }
 
             .logo-img {
-                width: 79%;
-                height: 25%;
+                width: 140px;
+                height: auto;
                 margin: 25px 0 40px;
                 float: none;
             }
@@ -136,7 +136,7 @@
 
             .brand-item img {
                 width: 90%;
-                margin-top: 6px;
+                margin-top: 19px;
             }
 
         }
@@ -276,7 +276,8 @@
         .brand-logo {
             width: 120px;
             float: right;
-            margin-top: 20px;
+            margin-top: 14px;
+            margin-right: 8px;
         }
 
         .activity-info {