Merge branch 'hotfix/brand-url' into 'master'

Hotfix/brand url



See merge request !383

@@ -352,7 +352,7 @@ const _formShopData = (data, shopId, isApp) => {
                     _.forEach(resData, (item) => {
                     _.forEach(resData, (item) => {
                         if (item.brandDomain) {
                         if (item.brandDomain) {
                             brand.list.push({
                             brand.list.push({
-                                url: helpers.urlFormat('', '', item.brandDomain) + (isApp ? `?openby:yohobuy={"action":"go.brand","params":{"shop_id":${shopId},"brand_id":${item.id}}}` : ''), //eslint-disable-line
+                                url: helpers.urlFormat('/', {brand: item.id, shop_id: shopId}, 'list') + (isApp ? `?openby:yohobuy={"action":"go.brand","params":{"shop_id":${shopId},"brand_id":${item.id}}}` : ''), //eslint-disable-line
                                 img: helpers.image(item.brandIco, 640, 400),
                                 img: helpers.image(item.brandIco, 640, 400),
                                 brandName: item.brandName
                                 brandName: item.brandName
                             });
                             });

@@ -186,13 +186,14 @@
 
 
     .multi-brands {
     .multi-brands {
         width: 100%;
         width: 100%;
-        height: 270px;
+        height: 290px;
         background: #fff;
         background: #fff;
         border: 1px solid #e0e0e0;
         border: 1px solid #e0e0e0;
         border-top: none;
         border-top: none;
         font-size: 20px;
         font-size: 20px;
         text-align: center;
         text-align: center;
         padding-top: 25px;
         padding-top: 25px;
+        padding-bottom: 20px;
         margin-bottom: 30px;
         margin-bottom: 30px;
         overflow: hidden;
         overflow: hidden;