Merge branch 'feature/newfeature' into release/6.9.4

# Conflicts:
#	package.json

@@ -65,9 +65,9 @@ class featureModel extends global.yoho.BaseModel {
                     };
 
                     if (val.shop_id) {
-                        obj.brandurl = `//m.yohobuy.com/product/shop?domain=${val.brand_domain}&openby:yohobuy={"action":"go.shop","params":{"shop_id":${val.shop_id},"shop_template_type":${val.shop_template_type || "1"},"is_red_shop":${val.is_red_shop || 1}}}`; // eslint-disable-line
+                        obj.brandurl = `//m.yohobuy.com/product/index/brand?domain=${val.brand_domain}&openby:yohobuy={"action":"go.shop","params":{"shop_id":${val.shop_id},"shop_template_type":${val.shop_template_type || "1"},"is_red_shop":${val.is_red_shop || 1}}}`; // eslint-disable-line
                     } else {
-                        obj.brandurl = `//m.yohobuy.com/product/shop?domain=${val.brand_domain}&openby:yohobuy={"action":"go.brand","params":{"brand_id":${val.brand_id}}}`; // eslint-disable-line
+                        obj.brandurl = `//m.yohobuy.com/product/index/brand?domain=${val.brand_domain}&openby:yohobuy={"action":"go.brand","params":{"brand_id":${val.brand_id}}}`; // eslint-disable-line
                     }
 
                     resList[val.product_skn] = obj;

 {
   "name": "yohobuywap-node",
-  "version": "6.9.4-2",
+  "version": "6.9.4-3",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -75,6 +75,27 @@
             width: 100%;
             transform: translateX(-50%);
         }
+
+        .new-brand-name {
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            background-color: #272829;
+            padding-top: 5px;
+            padding-bottom: 5px;
+
+            .brand-name {
+                display: -webkit-box;
+                -webkit-box-orient: vertical;
+                -webkit-line-clamp: 1;
+                text-align: center;
+                line-height: 30px;
+                overflow: hidden;
+                font-size: 26px;
+                color: #fff;
+            }
+        }
     }
 
     &.single-item3 {
@@ -343,8 +364,8 @@
         left: 0;
         right: 0;
         background-color: #272829;
-        padding-top: 5px;
-        padding-bottom: 5px;
+        padding-top: 10px;
+        padding-bottom: 10px;
 
         .brand-name {
             display: -webkit-box;