Merge branch 'feature/brandJump' into 'release/5.6'

品牌入口样式



See merge request !490

@@ -18,7 +18,11 @@
             <div class="brand-enter">
                 {{# brandWay}}
                 <a  href={{url}} data-shopid="{{shopId}}" data-brandid="{{brandId}}">
+                    {{#if thumb}}
                     <img class="brand-thumb" src={{image2 thumb q=60}}>
+                    {{else}}
+                    <span class="occupy"></span>
+                    {{/if}}
                     <span class="brand-name">{{name}}</span>
                     {{#if brandId}}<span class="global"></span>{{/if}}
                     <span class="entry">

@@ -72,7 +72,7 @@
 
         a {
             display: block;
-            height: 84px;
+            height: 80px;
             line-height: 80px;
             padding: 0 20px;
             border-top: 1px solid #e6e6e6;
@@ -105,8 +105,15 @@
 
         .brand-thumb {
             float: left;
-            width: 110px;
-            height: 84px;
+            margin: 0;
+            display: inline-block;
+            margin-top: 5px;
+        }
+
+        .occupy {
+            float: left;
+            width: 130px;
+            height: 80px;
             margin: 0;
             display: inline-block;
         }
@@ -125,7 +132,7 @@
 
         .entry {
             color: #999;
-            font-size: 28px;
+            font-size: 24px;
             float: right;
             display: inline-block;
         }

@@ -191,7 +191,7 @@ exports.processProductList = (list, options) => {
                 product.is_solded = true;
             }
 
-            if (product.is_global === 'Y') {
+            if (product.is_global === 'Y' && product.tbl_country_name && product.tbl_country_name !== '') {
                 tags.is_global = true;
             }