Showing
38 changed files
with
221 additions
and
39 deletions
@@ -26,7 +26,7 @@ const index = (req, res, next) => { | @@ -26,7 +26,7 @@ const index = (req, res, next) => { | ||
26 | pic: 'https://feature.yoho.cn/300x300.png', | 26 | pic: 'https://feature.yoho.cn/300x300.png', |
27 | title: title, | 27 | title: title, |
28 | url: sUrl, | 28 | url: sUrl, |
29 | - content: 'YOHO!2016潮流轨迹' | 29 | + content: 'YOHO!BUY有货2016潮流轨迹' |
30 | }); | 30 | }); |
31 | } | 31 | } |
32 | 32 |
@@ -31,12 +31,7 @@ | @@ -31,12 +31,7 @@ | ||
31 | <div class="purdah2"> | 31 | <div class="purdah2"> |
32 | <div class="month-4"></div> | 32 | <div class="month-4"></div> |
33 | <div class="month-list"> | 33 | <div class="month-list"> |
34 | - <ul> | ||
35 | - <li class="month-5"></li> | ||
36 | - <li class="month-8"></li> | ||
37 | - <li class="month-10"></li> | ||
38 | - <li class="month-12"></li> | ||
39 | - </ul> | 34 | + <ul></ul> |
40 | </div> | 35 | </div> |
41 | </div> | 36 | </div> |
42 | </div> | 37 | </div> |
@@ -17,21 +17,21 @@ module.exports = { | @@ -17,21 +17,21 @@ module.exports = { | ||
17 | assetUrl: '//127.0.0.1:5001', | 17 | assetUrl: '//127.0.0.1:5001', |
18 | testCode: 'yoho4946abcdef#$%&!@', | 18 | testCode: 'yoho4946abcdef#$%&!@', |
19 | domains: { | 19 | domains: { |
20 | - // api: 'http://api-test3.yohops.com:9999/', | ||
21 | - // service: 'http://service-test3.yohops.com:9999/', | ||
22 | - // liveApi: 'http://testapi.live.yohops.com:9999/', | ||
23 | - // singleApi: 'http://api-test3.yohops.com:9999/', | ||
24 | - // imSocket: 'ws://im.yohobuy.com:10240', | ||
25 | - // imCs: 'http://im.yohobuy.com/api', | ||
26 | - // imServer: 'http://im.yohobuy.com/server' | 20 | + api: 'http://api-test3.yohops.com:9999/', |
21 | + service: 'http://service-test3.yohops.com:9999/', | ||
22 | + liveApi: 'http://testapi.live.yohops.com:9999/', | ||
23 | + singleApi: 'http://api-test3.yohops.com:9999/', | ||
24 | + imSocket: 'ws://im.yohobuy.com:10240', | ||
25 | + imCs: 'http://im.yohobuy.com/api', | ||
26 | + imServer: 'http://im.yohobuy.com/server' | ||
27 | 27 | ||
28 | - api: 'http://api.yoho.cn/', | ||
29 | - service: 'http://192.168.102.14:8090', | ||
30 | - liveApi: 'http://api.live.yoho.cn/', | ||
31 | - singleApi: 'http://single.yoho.cn/', | ||
32 | - imSocket: 'wss://imsocket.yohobuy.com:443', | ||
33 | - imCs: 'https://imhttp.yohobuy.com/api', | ||
34 | - imServer: 'https://imhttp.yohobuy.com/server' | 28 | + // api: 'http://api.yoho.cn/', |
29 | + // service: 'http://192.168.102.14:8090', | ||
30 | + // liveApi: 'http://api.live.yoho.cn/', | ||
31 | + // singleApi: 'http://single.yoho.cn/', | ||
32 | + // imSocket: 'wss://imsocket.yohobuy.com:443', | ||
33 | + // imCs: 'https://imhttp.yohobuy.com/api', | ||
34 | + // imServer: 'https://imhttp.yohobuy.com/server' | ||
35 | }, | 35 | }, |
36 | subDomains: { | 36 | subDomains: { |
37 | host: '.m.yohobuy.com', | 37 | host: '.m.yohobuy.com', |

22.1 KB

14.5 KB

16 KB

24.3 KB

17.3 KB

21.3 KB

22.9 KB

31.2 KB

33.7 KB

22 KB

27.5 KB

20.5 KB

26.3 KB

15.2 KB

30.6 KB

29.9 KB

14.9 KB

35.8 KB

17.9 KB

34 KB

35 KB

21.1 KB

20.7 KB

28 KB

28.4 KB

29 KB

15.3 KB

18.9 KB

16.9 KB

94.2 KB

9.11 KB

13.1 KB

12.2 KB
@@ -79,13 +79,14 @@ $(function() { | @@ -79,13 +79,14 @@ $(function() { | ||
79 | imgUrl: 'https://feature.yoho.cn/300x300.png', | 79 | imgUrl: 'https://feature.yoho.cn/300x300.png', |
80 | title: 'YOHO!BUY有货年度潮流账单——快来看看你的潮流形象!速戳>>', | 80 | title: 'YOHO!BUY有货年度潮流账单——快来看看你的潮流形象!速戳>>', |
81 | link: $('#s-url').val(), | 81 | link: $('#s-url').val(), |
82 | - desc: 'YOHO!2016潮流轨迹' | 82 | + desc: 'YOHO!BUY有货2016潮流轨迹' |
83 | }); | 83 | }); |
84 | 84 | ||
85 | mySwiper = new Swiper('.swiper-container', { | 85 | mySwiper = new Swiper('.swiper-container', { |
86 | direction: 'vertical', | 86 | direction: 'vertical', |
87 | - onSlideChangeEnd: function(swiper) { | 87 | + onTransitionEnd: function(swiper) { |
88 | var aIndex = swiper.activeIndex; | 88 | var aIndex = swiper.activeIndex; |
89 | + var i = 1; | ||
89 | 90 | ||
90 | if (aIndex === 1) { | 91 | if (aIndex === 1) { |
91 | setTimeout(function() { | 92 | setTimeout(function() { |
@@ -97,6 +98,15 @@ $(function() { | @@ -97,6 +98,15 @@ $(function() { | ||
97 | if (aIndex === 2) { | 98 | if (aIndex === 2) { |
98 | $purdahLeft.addClass('purdah-l-animation'); | 99 | $purdahLeft.addClass('purdah-l-animation'); |
99 | $purdahRight.addClass('purdah-r-animation'); | 100 | $purdahRight.addClass('purdah-r-animation'); |
101 | + if ($monthList.find('li').length === 0) { | ||
102 | + for (i; i <= 32; i++) { | ||
103 | + if (i === 7) { | ||
104 | + $monthList.find('ul').append('<li class="goods-' + i + '"><div class="goods-gif-' + i + '"></div></li>'); | ||
105 | + } else { | ||
106 | + $monthList.find('ul').append('<li class="goods-' + i + '"></li>'); | ||
107 | + } | ||
108 | + } | ||
109 | + } | ||
100 | $monthList.fadeIn(); | 110 | $monthList.fadeIn(); |
101 | } | 111 | } |
102 | 112 | ||
@@ -138,6 +148,7 @@ $(function() { | @@ -138,6 +148,7 @@ $(function() { | ||
138 | $purdahLeft.removeClass('purdah-l-animation'); | 148 | $purdahLeft.removeClass('purdah-l-animation'); |
139 | $purdahRight.removeClass('purdah-r-animation'); | 149 | $purdahRight.removeClass('purdah-r-animation'); |
140 | $monthList.fadeOut(); | 150 | $monthList.fadeOut(); |
151 | + $monthList.find('ul').scrollLeft(0); | ||
141 | } | 152 | } |
142 | 153 | ||
143 | if (aIndex === 0 || aIndex === 2) { | 154 | if (aIndex === 0 || aIndex === 2) { |
@@ -240,10 +240,10 @@ | @@ -240,10 +240,10 @@ | ||
240 | .month-list { | 240 | .month-list { |
241 | position: absolute; | 241 | position: absolute; |
242 | left: 40px; | 242 | left: 40px; |
243 | - top: 520px; | 243 | + top: 535px; |
244 | z-index: 1; | 244 | z-index: 1; |
245 | width: 550px; | 245 | width: 550px; |
246 | - height: 287px; | 246 | + height: 370px; |
247 | overflow: hidden; | 247 | overflow: hidden; |
248 | display: none; | 248 | display: none; |
249 | 249 | ||
@@ -251,38 +251,214 @@ | @@ -251,38 +251,214 @@ | ||
251 | white-space: nowrap; | 251 | white-space: nowrap; |
252 | overflow-x: scroll; | 252 | overflow-x: scroll; |
253 | width: 570px; | 253 | width: 570px; |
254 | - height: 320px; | 254 | + height: 390px; |
255 | padding-right: 20px; | 255 | padding-right: 20px; |
256 | } | 256 | } |
257 | 257 | ||
258 | li { | 258 | li { |
259 | display: inline-block; | 259 | display: inline-block; |
260 | - height: 287px; | 260 | + height: 370px; |
261 | } | 261 | } |
262 | 262 | ||
263 | - .month-5 { | 263 | + .goods-1 { |
264 | + width: 222px; | ||
265 | + background: resolve("activity/annual-account/annual-goods-1.png") no-repeat; | ||
266 | + background-size: contain; | ||
267 | + margin-left: 35px; | ||
268 | + } | ||
269 | + | ||
270 | + .goods-2 { | ||
271 | + width: 250px; | ||
272 | + background: resolve("activity/annual-account/annual-goods-2.png") no-repeat; | ||
273 | + background-size: contain; | ||
274 | + } | ||
275 | + | ||
276 | + .goods-3 { | ||
277 | + width: 259px; | ||
278 | + background: resolve("activity/annual-account/annual-goods-3.png") no-repeat; | ||
279 | + background-size: contain; | ||
280 | + } | ||
281 | + | ||
282 | + .goods-4 { | ||
283 | + width: 267px; | ||
284 | + background: resolve("activity/annual-account/annual-goods-4.png") no-repeat; | ||
285 | + background-size: contain; | ||
286 | + } | ||
287 | + | ||
288 | + .goods-5 { | ||
289 | + width: 261px; | ||
290 | + background: resolve("activity/annual-account/annual-goods-5.png") no-repeat; | ||
291 | + background-size: contain; | ||
292 | + } | ||
293 | + | ||
294 | + .goods-6 { | ||
264 | width: 262px; | 295 | width: 262px; |
265 | - background: resolve("activity/annual-account/5month.png") no-repeat; | 296 | + background: resolve("activity/annual-account/annual-goods-6.png") no-repeat; |
297 | + background-size: contain; | ||
298 | + } | ||
299 | + | ||
300 | + .goods-7 { | ||
301 | + width: 315px; | ||
302 | + background: resolve("activity/annual-account/annual-goods-7.png") no-repeat; | ||
303 | + background-size: contain; | ||
304 | + } | ||
305 | + | ||
306 | + .goods-gif-7 { | ||
307 | + width: 251px; | ||
308 | + height: 182px; | ||
309 | + background-image: resolve("activity/annual-account/annual-goods-7.gif"); | ||
310 | + background-size: contain; | ||
311 | + margin: 108px auto 0; | ||
312 | + } | ||
313 | + | ||
314 | + .goods-8 { | ||
315 | + width: 266px; | ||
316 | + background: resolve("activity/annual-account/annual-goods-8.png") no-repeat; | ||
317 | + background-size: contain; | ||
318 | + } | ||
319 | + | ||
320 | + .goods-9 { | ||
321 | + width: 283px; | ||
322 | + background: resolve("activity/annual-account/annual-goods-9.png") no-repeat; | ||
323 | + background-size: contain; | ||
324 | + } | ||
325 | + | ||
326 | + .goods-10 { | ||
327 | + width: 299px; | ||
328 | + background: resolve("activity/annual-account/annual-goods-10.png") no-repeat; | ||
329 | + background-size: contain; | ||
330 | + } | ||
331 | + | ||
332 | + .goods-11 { | ||
333 | + width: 292px; | ||
334 | + background: resolve("activity/annual-account/annual-goods-11.png") no-repeat; | ||
335 | + background-size: contain; | ||
336 | + } | ||
337 | + | ||
338 | + .goods-12 { | ||
339 | + width: 232px; | ||
340 | + background: resolve("activity/annual-account/annual-goods-12.png") no-repeat; | ||
341 | + background-size: contain; | ||
342 | + } | ||
343 | + | ||
344 | + .goods-13 { | ||
345 | + width: 293px; | ||
346 | + background: resolve("activity/annual-account/annual-goods-13.png") no-repeat; | ||
347 | + background-size: contain; | ||
348 | + } | ||
349 | + | ||
350 | + .goods-14 { | ||
351 | + width: 297px; | ||
352 | + background: resolve("activity/annual-account/annual-goods-14.png") no-repeat; | ||
353 | + background-size: contain; | ||
354 | + } | ||
355 | + | ||
356 | + .goods-15 { | ||
357 | + width: 291px; | ||
358 | + background: resolve("activity/annual-account/annual-goods-15.png") no-repeat; | ||
359 | + background-size: contain; | ||
360 | + } | ||
361 | + | ||
362 | + .goods-16 { | ||
363 | + width: 303px; | ||
364 | + background: resolve("activity/annual-account/annual-goods-16.png") no-repeat; | ||
365 | + background-size: contain; | ||
366 | + } | ||
367 | + | ||
368 | + .goods-17 { | ||
369 | + width: 274px; | ||
370 | + background: resolve("activity/annual-account/annual-goods-17.png") no-repeat; | ||
371 | + background-size: contain; | ||
372 | + } | ||
373 | + | ||
374 | + .goods-18 { | ||
375 | + width: 336px; | ||
376 | + background: resolve("activity/annual-account/annual-goods-18.png") no-repeat; | ||
377 | + background-size: contain; | ||
378 | + } | ||
379 | + | ||
380 | + .goods-19 { | ||
381 | + width: 346px; | ||
382 | + background: resolve("activity/annual-account/annual-goods-19.png") no-repeat; | ||
383 | + background-size: contain; | ||
384 | + } | ||
385 | + | ||
386 | + .goods-20 { | ||
387 | + width: 336px; | ||
388 | + background: resolve("activity/annual-account/annual-goods-20.png") no-repeat; | ||
389 | + background-size: contain; | ||
390 | + } | ||
391 | + | ||
392 | + .goods-21 { | ||
393 | + width: 274px; | ||
394 | + background: resolve("activity/annual-account/annual-goods-21.png") no-repeat; | ||
395 | + background-size: contain; | ||
396 | + } | ||
397 | + | ||
398 | + .goods-22 { | ||
399 | + width: 303px; | ||
400 | + background: resolve("activity/annual-account/annual-goods-22.png") no-repeat; | ||
401 | + background-size: contain; | ||
402 | + } | ||
403 | + | ||
404 | + .goods-23 { | ||
405 | + width: 319px; | ||
406 | + background: resolve("activity/annual-account/annual-goods-23.png") no-repeat; | ||
407 | + background-size: contain; | ||
408 | + } | ||
409 | + | ||
410 | + .goods-24 { | ||
411 | + width: 297px; | ||
412 | + background: resolve("activity/annual-account/annual-goods-24.png") no-repeat; | ||
413 | + background-size: contain; | ||
414 | + } | ||
415 | + | ||
416 | + .goods-25 { | ||
417 | + width: 332px; | ||
418 | + background: resolve("activity/annual-account/annual-goods-25.png") no-repeat; | ||
419 | + background-size: contain; | ||
420 | + } | ||
421 | + | ||
422 | + .goods-26 { | ||
423 | + width: 301px; | ||
424 | + background: resolve("activity/annual-account/annual-goods-26.png") no-repeat; | ||
425 | + background-size: contain; | ||
426 | + } | ||
427 | + | ||
428 | + .goods-27 { | ||
429 | + width: 276px; | ||
430 | + background: resolve("activity/annual-account/annual-goods-27.png") no-repeat; | ||
431 | + background-size: contain; | ||
432 | + } | ||
433 | + | ||
434 | + .goods-28 { | ||
435 | + width: 313px; | ||
436 | + background: resolve("activity/annual-account/annual-goods-28.png") no-repeat; | ||
437 | + background-size: contain; | ||
438 | + } | ||
439 | + | ||
440 | + .goods-29 { | ||
441 | + width: 320px; | ||
442 | + background: resolve("activity/annual-account/annual-goods-29.png") no-repeat; | ||
266 | background-size: contain; | 443 | background-size: contain; |
267 | } | 444 | } |
268 | 445 | ||
269 | - .month-8 { | ||
270 | - width: 210px; | ||
271 | - background: resolve("activity/annual-account/8month.png") no-repeat; | 446 | + .goods-30 { |
447 | + width: 331px; | ||
448 | + background: resolve("activity/annual-account/annual-goods-30.png") no-repeat; | ||
272 | background-size: contain; | 449 | background-size: contain; |
273 | } | 450 | } |
274 | 451 | ||
275 | - .month-10 { | ||
276 | - width: 233px; | ||
277 | - background: resolve("activity/annual-account/10month.png") no-repeat; | 452 | + .goods-31 { |
453 | + width: 316px; | ||
454 | + background: resolve("activity/annual-account/annual-goods-31.png") no-repeat; | ||
278 | background-size: contain; | 455 | background-size: contain; |
279 | } | 456 | } |
280 | 457 | ||
281 | - .month-12 { | ||
282 | - width: 187px; | ||
283 | - background: resolve("activity/annual-account/12month.png") no-repeat; | 458 | + .goods-32 { |
459 | + width: 304px; | ||
460 | + background: resolve("activity/annual-account/annual-goods-32.png") no-repeat; | ||
284 | background-size: contain; | 461 | background-size: contain; |
285 | - margin-right: 20px; | ||
286 | } | 462 | } |
287 | } | 463 | } |
288 | 464 |
-
Please register or login to post a comment