Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -498,7 +498,7 @@ const setBrandIntro = brand => {
 
 
     if (brand) {
     if (brand) {
         let text = _.replace(brand.brandIntro, /<\/?[^>]*>|\s*|(\n)|(\t)|(\r)/g, ''),
         let text = _.replace(brand.brandIntro, /<\/?[^>]*>|\s*|(\n)|(\t)|(\r)/g, ''),
-            more = `... <a href="javascript:;" class="more-brand-intro blue">了解更多>></a>`;
+            more = '... <a href="javascript:;" class="more-brand-intro blue">了解更多>></a>';
 
 
         barndIntro = {
         barndIntro = {
             brand: {
             brand: {

@@ -14,6 +14,11 @@
 
 
         .brand-logo {
         .brand-logo {
             display: inline-block;
             display: inline-block;
+            height: 45px;
+
+            > img {
+                height: 100%;
+            }
         }
         }
 
 
         .opt > * {
         .opt > * {