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

 <template>
     <div class="top-box clearfix" v-bind:class='{"top-box-left" : this.$parent.$refs.filter.isVisible,"top-change" : topChange || !shareData.isBlkShop}' v-infinite-scroll="changeTopStatus()">
         <span class="icon icon-back back" @click="goBack()"></span>
-        <span v-if="!shareData.isBlkShop">{{shareData.brandName}}</span>
+        <span class="brand-name" v-if="!shareData.isBlkShop">{{shareData.brandName}}</span>
         <div class="right">
             <span v-if="shareData.isBlkShop" v-show="shareData.isFav" class="icon" @click="collectShop()">&#xe60d;</span>
             <span v-if="shareData.isBlkShop" v-show="!shareData.isFav" class="icon" @click="collectShop()">&#xe60c;</span>
@@ -28,6 +28,16 @@
             width: 60px;
             height: 60px;
             float: left;
+            font-size: 52px;
+        }
+
+        .brand-name {
+            display: inline-block;
+            max-width: 80%;
+            height: 60px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
         }
 
         .right {