Showing
1 changed file
with
22 additions
and
9 deletions
@@ -72,21 +72,27 @@ const goodsTabBar = (data, shopId) => { | @@ -72,21 +72,27 @@ const goodsTabBar = (data, shopId) => { | ||
72 | new: [] | 72 | new: [] |
73 | }; | 73 | }; |
74 | 74 | ||
75 | - _.forEach(data.hot, (value) => { | ||
76 | - if (value.url) { | 75 | + _.forEach(_.sortBy(data.hot, o => { |
76 | + return -o.position; | ||
77 | + }), (value) => { | ||
78 | + value.url = '#'; | ||
79 | + if (value.url && value.position) { | ||
77 | dest.hot.push({ | 80 | dest.hot.push({ |
78 | name: value.name, | 81 | name: value.name, |
79 | - href: value.url | 82 | + url: value.url |
80 | }); | 83 | }); |
81 | } | 84 | } |
82 | 85 | ||
83 | }); | 86 | }); |
84 | 87 | ||
85 | - _.forEach(data.new, (value) => { | ||
86 | - if (value.url) { | 88 | + _.forEach(_.sortBy(data.new, o => { |
89 | + return -o.position; | ||
90 | + }), (value) => { | ||
91 | + value.url = '#'; | ||
92 | + if (value.url && value.position) { | ||
87 | dest.new.push({ | 93 | dest.new.push({ |
88 | name: value.name, | 94 | name: value.name, |
89 | - href: value.url | 95 | + url: value.url |
90 | }); | 96 | }); |
91 | } | 97 | } |
92 | }); | 98 | }); |
@@ -150,9 +156,16 @@ const navigationBar = (data, shopId) => { | @@ -150,9 +156,16 @@ const navigationBar = (data, shopId) => { | ||
150 | } | 156 | } |
151 | ]; | 157 | ]; |
152 | 158 | ||
153 | - return {navigationBar: _.union(shopNav, _.filter(data, (value) => { | ||
154 | - return value.url; | ||
155 | - }))}; | 159 | + _.forEach(data, (value) => { |
160 | + if (value.url) { | ||
161 | + shopNav.push({ | ||
162 | + name: value.name, | ||
163 | + url: `${value.url}&navBar=${shopNav.length}` | ||
164 | + }); | ||
165 | + } | ||
166 | + }); | ||
167 | + | ||
168 | + return {navigationBar: shopNav}; | ||
156 | }; | 169 | }; |
157 | 170 | ||
158 | /** | 171 | /** |
-
Please register or login to post a comment