Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

@@ -504,9 +504,9 @@ export default {
 }
 }
 /deep/ .cube-scroll-nav-bar-item_active {
 /deep/ .cube-scroll-nav-bar-item_active {
   &:after {
   &:after {
-    width: 32px;
-    left: 50%;
-    transform: translateX(-16px)
+    width: 16px;
+    // left: 50%;
+    transform: translateX(-10px)
   }
   }
 }
 }
 .search-header {
 .search-header {

@@ -76,7 +76,9 @@ export default {
   }
   }
 
 
   .cube-scroll-nav-bar-item {
   .cube-scroll-nav-bar-item {
-    padding: 0 12px;
+    // padding: 0 12px;
+    padding: 0;
+    margin: 0 12px;
     line-height: 52px;
     line-height: 52px;
     font-size: 15px;
     font-size: 15px;
     color: #555;
     color: #555;

@@ -46,7 +46,7 @@
       { "image": "//cdn.yoho.cn/xianyuchao/xianyu_02.png?imageView2/2/w/750/format/jpg" },
       { "image": "//cdn.yoho.cn/xianyuchao/xianyu_02.png?imageView2/2/w/750/format/jpg" },
       { "image": "//cdn.yoho.cn/xianyuchao/xianyu_03.png?imageView2/2/w/750/format/jpg" },
       { "image": "//cdn.yoho.cn/xianyuchao/xianyu_03.png?imageView2/2/w/750/format/jpg" },
       { "image": "//cdn.yoho.cn/xianyuchao/xianyu_04.png?imageView2/2/w/750/format/jpg" },
       { "image": "//cdn.yoho.cn/xianyuchao/xianyu_04.png?imageView2/2/w/750/format/jpg" },
-      { "image": "//cdn.yoho.cn/xianyuchao/xianyu_05.png?imageView2/2/w/750/format/jpg",
+      { "image": "//cdn.yoho.cn/xianyuchao/xianyu_0501.jpeg?imageView2/2/w/750/format/jpg",
         "urls": [
         "urls": [
           {
           {
             "linkName": "strategySub",
             "linkName": "strategySub",
@@ -54,15 +54,15 @@
             "left": "1rem",
             "left": "1rem",
             "top": "0.4rem",
             "top": "0.4rem",
             "width": "17rem",
             "width": "17rem",
-            "height": "2.85rem"
+            "height": "2.9rem"
           },
           },
           {
           {
             "linkName": "strategySub",
             "linkName": "strategySub",
             "subName": "buyerPolicy",
             "subName": "buyerPolicy",
-            "left": "2.5rem",
+            "left": "2.45rem",
             "top": "5.3rem",
             "top": "5.3rem",
             "width": "6rem",
             "width": "6rem",
-            "height": "3rem"
+            "height": "3.2rem"
           },
           },
           {
           {
             "linkName": "strategySub",
             "linkName": "strategySub",
@@ -70,7 +70,15 @@
             "left": "10.8rem",
             "left": "10.8rem",
             "top": "5.3rem",
             "top": "5.3rem",
             "width": "6rem",
             "width": "6rem",
-            "height": "3rem"
+            "height": "3.2rem"
+          },
+          {
+            "linkName": "ChannelPage",
+            "subName": "",
+            "left": "0rem",
+            "top": "10.9rem",
+            "width": "18.75rem",
+            "height": "2.5rem"
           }
           }
         ]
         ]
       }
       }

@@ -35,12 +35,18 @@ export default {
     jumpTo(event) {
     jumpTo(event) {
       let linkItem = JSON.parse(event.currentTarget.dataset.item || '{}') || {};
       let linkItem = JSON.parse(event.currentTarget.dataset.item || '{}') || {};
 
 
-      this.$router.push({
-        name: linkItem.linkName,
-        params: {
-          subName: linkItem.subName,
-        },
-      });
+      if (linkItem.subName === '') {
+        this.$router.push({
+          name: linkItem.linkName
+        });
+      } else {
+        this.$router.push({
+          name: linkItem.linkName,
+          params: {
+            subName: linkItem.subName
+          }
+        });
+      }
     }
     }
   },
   },
   mounted() {
   mounted() {