fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by baoss
Commit bc1b56545cf6baef76cfe6dfd5ef03aefd5f197f 2 parents c1d0084a e9ca42f2

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

Inline Side-by-side
Showing 4 changed files with 27 additions and 11 deletions
@@ -504,9 +504,9 @@ export default { @@ -504,9 +504,9 @@ export default {
504 } 504 }
505 /deep/ .cube-scroll-nav-bar-item_active { 505 /deep/ .cube-scroll-nav-bar-item_active {
506 &:after { 506 &:after {
507 - width: 32px;  
508 - left: 50%;  
509 - transform: translateX(-16px) 507 + width: 16px;
  508 + // left: 50%;
  509 + transform: translateX(-10px)
510 } 510 }
511 } 511 }
512 .search-header { 512 .search-header {
@@ -76,7 +76,9 @@ export default { @@ -76,7 +76,9 @@ export default {
76 } 76 }
77 77
78 .cube-scroll-nav-bar-item { 78 .cube-scroll-nav-bar-item {
79 - padding: 0 12px; 79 + // padding: 0 12px;
  80 + padding: 0;
  81 + margin: 0 12px;
80 line-height: 52px; 82 line-height: 52px;
81 font-size: 15px; 83 font-size: 15px;
82 color: #555; 84 color: #555;
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 { "image": "//cdn.yoho.cn/xianyuchao/xianyu_02.png?imageView2/2/w/750/format/jpg" }, 46 { "image": "//cdn.yoho.cn/xianyuchao/xianyu_02.png?imageView2/2/w/750/format/jpg" },
47 { "image": "//cdn.yoho.cn/xianyuchao/xianyu_03.png?imageView2/2/w/750/format/jpg" }, 47 { "image": "//cdn.yoho.cn/xianyuchao/xianyu_03.png?imageView2/2/w/750/format/jpg" },
48 { "image": "//cdn.yoho.cn/xianyuchao/xianyu_04.png?imageView2/2/w/750/format/jpg" }, 48 { "image": "//cdn.yoho.cn/xianyuchao/xianyu_04.png?imageView2/2/w/750/format/jpg" },
49 - { "image": "//cdn.yoho.cn/xianyuchao/xianyu_05.png?imageView2/2/w/750/format/jpg", 49 + { "image": "//cdn.yoho.cn/xianyuchao/xianyu_0501.jpeg?imageView2/2/w/750/format/jpg",
50 "urls": [ 50 "urls": [
51 { 51 {
52 "linkName": "strategySub", 52 "linkName": "strategySub",
@@ -54,15 +54,15 @@ @@ -54,15 +54,15 @@
54 "left": "1rem", 54 "left": "1rem",
55 "top": "0.4rem", 55 "top": "0.4rem",
56 "width": "17rem", 56 "width": "17rem",
57 - "height": "2.85rem" 57 + "height": "2.9rem"
58 }, 58 },
59 { 59 {
60 "linkName": "strategySub", 60 "linkName": "strategySub",
61 "subName": "buyerPolicy", 61 "subName": "buyerPolicy",
62 - "left": "2.5rem", 62 + "left": "2.45rem",
63 "top": "5.3rem", 63 "top": "5.3rem",
64 "width": "6rem", 64 "width": "6rem",
65 - "height": "3rem" 65 + "height": "3.2rem"
66 }, 66 },
67 { 67 {
68 "linkName": "strategySub", 68 "linkName": "strategySub",
@@ -70,7 +70,15 @@ @@ -70,7 +70,15 @@
70 "left": "10.8rem", 70 "left": "10.8rem",
71 "top": "5.3rem", 71 "top": "5.3rem",
72 "width": "6rem", 72 "width": "6rem",
73 - "height": "3rem" 73 + "height": "3.2rem"
  74 + },
  75 + {
  76 + "linkName": "ChannelPage",
  77 + "subName": "",
  78 + "left": "0rem",
  79 + "top": "10.9rem",
  80 + "width": "18.75rem",
  81 + "height": "2.5rem"
74 } 82 }
75 ] 83 ]
76 } 84 }
@@ -35,13 +35,19 @@ export default { @@ -35,13 +35,19 @@ export default {
35 jumpTo(event) { 35 jumpTo(event) {
36 let linkItem = JSON.parse(event.currentTarget.dataset.item || '{}') || {}; 36 let linkItem = JSON.parse(event.currentTarget.dataset.item || '{}') || {};
37 37
  38 + if (linkItem.subName === '') {
  39 + this.$router.push({
  40 + name: linkItem.linkName
  41 + });
  42 + } else {
38 this.$router.push({ 43 this.$router.push({
39 name: linkItem.linkName, 44 name: linkItem.linkName,
40 params: { 45 params: {
41 - subName: linkItem.subName,  
42 - }, 46 + subName: linkItem.subName
  47 + }
43 }); 48 });
44 } 49 }
  50 + }
45 }, 51 },
46 mounted() { 52 mounted() {
47 let result = data.result; 53 let result = data.result;