fe / yohobuy-frontend · Commits

Go to a project

Authored by 2586703@qq.com
Commit af95d147fae701c7a5a530419e13148979f40dda 2 parents 7c1ad9aa 42952d3a

Merge branch 'feature/h5detail' of http://git.dev.yoho.cn/web/yohobuy-frontend into feature/h5detail

Inline Side-by-side
Showing 3 changed files with 106 additions and 264 deletions
@@ -17,263 +17,105 @@ module.exports = function() { @@ -17,263 +17,105 @@ module.exports = function() {
17 } 17 }
18 }, 18 },
19 { 19 {
  20 + smallImage: {
  21 + imgs: [
  22 + {
  23 + src: 'http://7xidk0.com1.z0.glb.clouddn.com/clothe.png',
  24 + alt: '复古fashion'
  25 + },
  26 + {
  27 + src: 'http://7xidk0.com1.z0.glb.clouddn.com/sm.png',
  28 + alt: '复古fashion'
  29 + }
  30 + ]
  31 + }
  32 + },
  33 + {
20 text: { 34 text: {
21 - deps: '复古风劲吹，在各路复古跑鞋嚣张跋扈的当下，历史悠久的Onitsuka Tiger鬼冢' +  
22 - '虎也动作频频，于北京时间3.14日在北京发布其与意大利' 35 + deps: '复古风劲吹，在各路复古跑鞋嚣张跋扈的当下，历史悠久的Onitsuka也动作频频'
23 } 36 }
24 }, 37 },
25 { 38 {
26 - collocation: { 39 + recommendation: {
27 list: [ 40 list: [
28 { 41 {
29 - thumb: 'http://7xidk0.com1.z0.glb.clouddn.com/clothe.png',  
30 - type: 'shoe',  
31 - products: [  
32 - {  
33 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
34 - name: 'GAWS DIGI 丛林数码印花拼接卫衣',  
35 - isLike: false,  
36 - price: 1268,  
37 - salePrice: 589,  
38 - isSale: true,  
39 - isFew: true,  
40 - isNew: false,  
41 - url: ''  
42 - },  
43 - {  
44 - thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
45 - name: 'CLOTtee 撞色连帽外套',  
46 - isLike: false,  
47 - price: 488,  
48 - salePrice: 139,  
49 - isSale: true,  
50 - isFew: true,  
51 - isNew: false,  
52 - url: ''  
53 - },  
54 - {  
55 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
56 - name: 'HALFGIRL 插肩棒球服短裙套装',  
57 - isLike: true,  
58 - price: 478,  
59 - salePrice: 208,  
60 - isSale: true,  
61 - isFew: true,  
62 - isNew: false,  
63 - url: ''  
64 - },  
65 - {  
66 - thumb: 'http://img10.static.yhbimg.com/goodsimg/2015/01/08/07/012f23fc2390ccd634082d34cc2982bf4c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
67 - name: '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',  
68 - isLike: false,  
69 - price: 589,  
70 - salePrice: 148,  
71 - isSale: false,  
72 - isFew: false,  
73 - isNew: true,  
74 - url: ''  
75 - }  
76 - ] 42 + thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  43 + name: 'GAWS DIGI 丛林数码印花拼接卫衣',
  44 + isLike: false,
  45 + price: 1268,
  46 + salePrice: 589,
  47 + isSale: true,
  48 + isFew: true,
  49 + isNew: false,
  50 + url: ''
77 }, 51 },
78 { 52 {
79 - thumb: 'http://7xidk0.com1.z0.glb.clouddn.com/sm.png',  
80 - type: 'lamp',  
81 - products: [  
82 - {  
83 - thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
84 - name: 'GAWS DIGI 丛林数码印花拼接卫衣',  
85 - isLike: false,  
86 - price: 1268,  
87 - salePrice: 589,  
88 - isSale: true,  
89 - isFew: true,  
90 - isNew: false,  
91 - url: ''  
92 - },  
93 - {  
94 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
95 - name: 'CLOTtee 撞色连帽外套',  
96 - isLike: false,  
97 - price: 488,  
98 - salePrice: 139,  
99 - isSale: true,  
100 - isFew: true,  
101 - isNew: false,  
102 - url: ''  
103 - },  
104 - {  
105 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/09/0139514beb37bf2bf321eafd1a915117f5.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
106 - name: 'HALFGIRL 插肩棒球服短裙套装',  
107 - isLike: true,  
108 - price: 478,  
109 - salePrice: 208,  
110 - isSale: true,  
111 - isFew: true,  
112 - isNew: false,  
113 - url: ''  
114 - },  
115 - {  
116 - thumb: 'http://img10.static.yhbimg.com/goodsimg/2015/01/08/07/012f23fc2390ccd634082d34cc2982bf4c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
117 - name: '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',  
118 - isLike: false,  
119 - price: 589,  
120 - salePrice: 148,  
121 - isSale: false,  
122 - isFew: false,  
123 - isNew: true,  
124 - url: ''  
125 - }  
126 - ] 53 + thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/023d70c59e81ccbfb39404487aaf642da2.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  54 + name: 'CLOTtee 撞色连帽外套',
  55 + isLike: false,
  56 + price: 488,
  57 + salePrice: 139,
  58 + isSale: true,
  59 + isFew: true,
  60 + isNew: false,
  61 + url: ''
127 }, 62 },
128 { 63 {
129 - thumb: 'http://7xidk0.com1.z0.glb.clouddn.com/clothe.png',  
130 - type: 'dress',  
131 - products: [  
132 - {  
133 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/09/0139514beb37bf2bf321eafd1a915117f5.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
134 - name: 'GAWS DIGI 丛林数码印花拼接卫衣',  
135 - isLike: false,  
136 - price: 1268,  
137 - salePrice: 589,  
138 - isSale: true,  
139 - isFew: true,  
140 - isNew: false,  
141 - url: ''  
142 - },  
143 - {  
144 - thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
145 - name: 'CLOTtee 撞色连帽外套',  
146 - isLike: false,  
147 - price: 488,  
148 - salePrice: 139,  
149 - isSale: true,  
150 - isFew: true,  
151 - isNew: false,  
152 - url: ''  
153 - },  
154 - {  
155 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
156 - name: 'HALFGIRL 插肩棒球服短裙套装',  
157 - isLike: true,  
158 - price: 478,  
159 - salePrice: 208,  
160 - isSale: true,  
161 - isFew: true,  
162 - isNew: false,  
163 - url: ''  
164 - },  
165 - {  
166 - thumb: 'http://img10.static.yhbimg.com/goodsimg/2015/01/08/07/012f23fc2390ccd634082d34cc2982bf4c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
167 - name: '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',  
168 - isLike: false,  
169 - price: 589,  
170 - salePrice: 148,  
171 - isSale: false,  
172 - isFew: false,  
173 - isNew: true,  
174 - url: ''  
175 - }  
176 - ] 64 + thumb: 'http://img12.static.yhbimg.com/goodsimg/2015/03/02/08/02e2d44125e95495e3152aa459fa6b9b0c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  65 + name: 'HALFGIRL 插肩棒球服短裙套装',
  66 + isLike: true,
  67 + price: 478,
  68 + salePrice: 208,
  69 + isSale: true,
  70 + isFew: true,
  71 + isNew: false,
  72 + url: ''
177 }, 73 },
178 { 74 {
179 - thumb: 'http://7xidk0.com1.z0.glb.clouddn.com/sm.png',  
180 - type: 'watch',  
181 - products: [  
182 - {  
183 - thumb: 'http://img10.static.yhbimg.com/goodsimg/2015/01/08/07/012f23fc2390ccd634082d34cc2982bf4c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
184 - name: 'GAWS DIGI 丛林数码印花拼接卫衣',  
185 - isLike: false,  
186 - price: 1268,  
187 - salePrice: 589,  
188 - isSale: true,  
189 - isFew: true,  
190 - isNew: false,  
191 - url: ''  
192 - },  
193 - {  
194 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/09/0139514beb37bf2bf321eafd1a915117f5.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
195 - name: 'CLOTtee 撞色连帽外套',  
196 - isLike: false,  
197 - price: 488,  
198 - salePrice: 139,  
199 - isSale: true,  
200 - isFew: true,  
201 - isNew: false,  
202 - url: ''  
203 - },  
204 - {  
205 - thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
206 - name: 'HALFGIRL 插肩棒球服短裙套装',  
207 - isLike: true,  
208 - price: 478,  
209 - salePrice: 208,  
210 - isSale: true,  
211 - isFew: true,  
212 - isNew: false,  
213 - url: ''  
214 - },  
215 - {  
216 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
217 - name: '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',  
218 - isLike: false,  
219 - price: 589,  
220 - salePrice: 148,  
221 - isSale: false,  
222 - isFew: false,  
223 - isNew: true,  
224 - url: ''  
225 - }  
226 - ] 75 + thumb: 'http://img12.static.yhbimg.com/goodsimg/2015/03/03/08/022f25fbe177ee12803c522f04fcce06d0.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  76 + name: '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',
  77 + isLike: false,
  78 + price: 589,
  79 + salePrice: 148,
  80 + isSale: false,
  81 + isFew: false,
  82 + isNew: true,
  83 + url: ''
  84 + }
  85 + ],
  86 + moreProds: ''
  87 + }
  88 + },
  89 + {
  90 + bigImage: {
  91 + src: 'http://7xidk0.com1.z0.glb.clouddn.com/bg.png',
  92 + alt: '复古风'
  93 + }
  94 + },
  95 + {
  96 + text: {
  97 + deps: '复古风劲吹，在各路复古跑鞋嚣张跋扈的当下，历史悠久的Onitsuka Tiger鬼冢' +
  98 + '虎也动作频频，于北京时间3.14日在东京发布其与意大利设计师AndreaPompilio合作的' +
  99 + '第2波--ONITSUKATIGER X ANDEREAPOMPILIO 2015秋冬新品便是其中之一。Yoho！Boy也' +
  100 + '为获取第一手的东宝特地来到东京并抢到了头排的“赏秀位”'
  101 + }
  102 + },
  103 + {
  104 + bigImage: {
  105 + src: 'http://7xidk0.com1.z0.glb.clouddn.com/bg.png',
  106 + alt: '复古风'
  107 + }
  108 + },
  109 + {
  110 + smallImage: {
  111 + imgs: [
  112 + {
  113 + src: 'http://7xidk0.com1.z0.glb.clouddn.com/clothe.png',
  114 + alt: '复古fashion'
227 }, 115 },
228 { 116 {
229 - thumb: 'http://7xidk0.com1.z0.glb.clouddn.com/clothe.png',  
230 - type: 'pent',  
231 - products: [  
232 - {  
233 - thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
234 - name: 'GAWS DIGI 丛林数码印花拼接卫衣',  
235 - isLike: false,  
236 - price: 1268,  
237 - salePrice: 589,  
238 - isSale: true,  
239 - isFew: true,  
240 - isNew: false,  
241 - url: ''  
242 - },  
243 - {  
244 - thumb: 'http://img10.static.yhbimg.com/goodsimg/2015/01/08/07/012f23fc2390ccd634082d34cc2982bf4c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
245 - name: 'CLOTtee 撞色连帽外套',  
246 - isLike: false,  
247 - price: 488,  
248 - salePrice: 139,  
249 - isSale: true,  
250 - isFew: true,  
251 - isNew: false,  
252 - url: ''  
253 - },  
254 - {  
255 - thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/0244a127c89c1f77ab47f55891e45be1e6.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
256 - name: 'HALFGIRL 插肩棒球服短裙套装',  
257 - isLike: true,  
258 - price: 478,  
259 - salePrice: 208,  
260 - isSale: true,  
261 - isFew: true,  
262 - isNew: false,  
263 - url: ''  
264 - },  
265 - {  
266 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/09/0139514beb37bf2bf321eafd1a915117f5.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
267 - name: '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',  
268 - isLike: false,  
269 - price: 589,  
270 - salePrice: 148,  
271 - isSale: false,  
272 - isFew: false,  
273 - isNew: true,  
274 - url: ''  
275 - }  
276 - ] 117 + src: 'http://7xidk0.com1.z0.glb.clouddn.com/sm.png',
  118 + alt: '复古fashion'
277 } 119 }
278 ] 120 ]
279 } 121 }
@@ -293,6 +135,12 @@ module.exports = function() { @@ -293,6 +135,12 @@ module.exports = function() {
293 } 135 }
294 }, 136 },
295 { 137 {
  138 + bigImage: {
  139 + src: 'http://7xidk0.com1.z0.glb.clouddn.com/bg.png',
  140 + alt: '复古风'
  141 + }
  142 + },
  143 + {
296 recommendation: { 144 recommendation: {
297 list: [ 145 list: [
298 { 146 {
@@ -344,6 +192,20 @@ module.exports = function() { @@ -344,6 +192,20 @@ module.exports = function() {
344 } 192 }
345 }, 193 },
346 { 194 {
  195 + bigImage: {
  196 + src: 'http://7xidk0.com1.z0.glb.clouddn.com/bg.png',
  197 + alt: '复古风'
  198 + }
  199 + },
  200 + {
  201 + text: {
  202 + deps: '复古风劲吹，在各路复古跑鞋嚣张跋扈的当下，历史悠久的Onitsuka Tiger鬼冢' +
  203 + '虎也动作频频，于北京时间3.14日在东京发布其与意大利设计师AndreaPompilio合作的' +
  204 + '第2波--ONITSUKATIGER X ANDEREAPOMPILIO 2015秋冬新品便是其中之一。Yoho！Boy也' +
  205 + '为获取第一手的东宝特地来到东京并抢到了头排的“赏秀位”'
  206 + }
  207 + },
  208 + {
347 collocation: { 209 collocation: {
348 list: [ 210 list: [
349 { 211 {
@@ -598,26 +460,6 @@ module.exports = function() { @@ -598,26 +460,6 @@ module.exports = function() {
598 } 460 }
599 ] 461 ]
600 } 462 }
601 - },  
602 - {  
603 - smallImage: {  
604 - imgs: [  
605 - {  
606 - src: 'http://7xidk0.com1.z0.glb.clouddn.com/clothe.png',  
607 - alt: '复古fashion'  
608 - },  
609 - {  
610 - src: 'http://7xidk0.com1.z0.glb.clouddn.com/sm.png',  
611 - alt: '复古fashion'  
612 - }  
613 - ]  
614 - }  
615 - },  
616 - {  
617 - text: {  
618 - deps: '复古风劲吹，在各路复古跑鞋嚣张跋扈的当下，历史悠久的Onitsuka Tiger鬼冢' +  
619 - '虎也动作频频，于北京时间3.14日在北京发布其与意大利'  
620 - }  
621 } 463 }
622 ] 464 ]
623 }, 465 },
@@ -73,7 +73,7 @@ $pxConvertRem : 40; @@ -73,7 +73,7 @@ $pxConvertRem : 40;
73 position: absolute; 73 position: absolute;
74 right: 6rem / $pxConvertRem; 74 right: 6rem / $pxConvertRem;
75 bottom: 34rem / $pxConvertRem; 75 bottom: 34rem / $pxConvertRem;
76 - background: url('../img/clothes-type-s6453a814c2.png') no-repeat; 76 + background: url('../img/clothes-type-s77e599c373.png') no-repeat;
77 width: 20px; 77 width: 20px;
78 height: 20px; 78 height: 20px;
79 background-size: 100%; 79 background-size: 100%;