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

@@ -69,7 +69,7 @@ const handleBrandList = origin => {
 
 
     // 如果有数字，单独处理
     // 如果有数字，单独处理
     if (hasNum) {
     if (hasNum) {
-        let brands = {};
+        let brands = [];
 
 
         _.forEach(numTemp, (subValue) => {
         _.forEach(numTemp, (subValue) => {
             brands.push({
             brands.push({

@@ -151,8 +151,17 @@ const getBrandShopGoodsData = params => {
         return shopApi.getBrandInfoByDomain({
         return shopApi.getBrandInfoByDomain({
             domain: params.domain
             domain: params.domain
         }).then(result => {
         }).then(result => {
-            if (result.data && result.data.shop_id) {
-                Object.assign(params, {shopId: result.data.shop_id});
+            if (result.data) {
+                if (result.data.shop_id) {
+                    Object.assign(params, {
+                        shopId: result.data.shop_id
+                    });
+                }
+                if (result.data.id) {
+                    Object.assign(params, {
+                        brand: result.data.id
+                    });
+                }
             }
             }
             return _getGoodsList(params);
             return _getGoodsList(params);
         });
         });

@@ -8,7 +8,7 @@
                 </a>
                 </a>
                 <!--暂时隐藏收藏入口，下个版本使用-->
                 <!--暂时隐藏收藏入口，下个版本使用-->
                 <!--<a class="right-button no-intercept" href="javascript:void(0);" @click="favorite()">-->
                 <!--<a class="right-button no-intercept" href="javascript:void(0);" @click="favorite()">-->
-                    <!--<span class="icon" :class="{ 'icon-love': !isFavorite, 'icon-love-solid': isFavorite}"></span>-->
+                    <!--<span class="icon" :class="{ 'icon-focus': !isFavorite, 'icon-focused': isFavorite}"></span>-->
                 <!--</a>-->
                 <!--</a>-->
 
 
                 <a class="right-button no-intercept" href="javascript:void(0);" @click="share()">
                 <a class="right-button no-intercept" href="javascript:void(0);" @click="share()">

@@ -168,8 +168,8 @@
             </span>
             </span>
         </button>
         </button>
         <button class="button control-button" @click="toggleFavorite()">
         <button class="button control-button" @click="toggleFavorite()">
-            <span v-if="entity.isCollect === 'Y' " class="icon icon-love-solid"></span>
-            <span v-else class="icon icon-love"></span>
+            <span v-if="entity.isCollect === 'Y' " class="icon icon-focused"></span>
+            <span v-else class="icon icon-focus"></span>
         </button>
         </button>
         <button class="button button-solid add-to-cart"
         <button class="button button-solid add-to-cart"
                 @click="showAddToCart()"
                 @click="showAddToCart()"
@@ -223,6 +223,10 @@
             line-height: $lh;
             line-height: $lh;
             color: #b0b0b0;
             color: #b0b0b0;
         }
         }
+
+        .icon-right {
+            margin-left: 30px;
+        }
     }
     }
 
 
     .product-detail-desc {
     .product-detail-desc {