Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

 <template>
 <template>
     <div class="brand-share">
     <div class="brand-share">
         <img class="brand-top-box" v-bind:src="shopInfo.shopBg | resize 750 478">
         <img class="brand-top-box" v-bind:src="shopInfo.shopBg | resize 750 478">
-        <div class="brand-title">{{ shopInfo.shopName }}</div>
+        <div v-if="shopInfo.shopLogo" class="brand-logo"><img v-bind:src="shopInfo.shopLogo | resize 120 80"></div>
+        <div v-else class="brand-title">{{ shopInfo.shopName }}</div>
         <div class="brand-intro">{{ shopInfo.shopIntro }}</div>
         <div class="brand-intro">{{ shopInfo.shopIntro }}</div>
         <div class="tip">进入 BLK 选购潮品</div>
         <div class="tip">进入 BLK 选购潮品</div>
         <div class="icon arrow">&#xe602;</div>
         <div class="icon arrow">&#xe602;</div>
@@ -15,6 +16,17 @@
             width: 100%;
             width: 100%;
         }
         }
 
 
+        .brand-logo {
+            width: 120px;
+            height: 80px;
+            margin: 30px;
+
+            img {
+                width: 120px;
+                height: 80px;
+            }
+        }
+
         .brand-title {
         .brand-title {
             margin: 30px;
             margin: 30px;
             font-weight: 700;
             font-weight: 700;