fe / yohobuy-frontend · Commits

Go to a project

Authored by xuqi
Commit d2bffca44abf984f51416adbc3ca7907f4064f9b 1 parent 210ab68a

模板页面去除销量的排序

Inline Side-by-side
Showing 4 changed files with 49 additions and 250 deletions
@@ -332,168 +332,6 @@ module.exports = function(flag) { @@ -332,168 +332,6 @@ module.exports = function(flag) {
332 url: '' 332 url: ''
333 } 333 }
334 ] 334 ]
335 - },  
336 - {  
337 - thumb: 'http://7xidk0.com1.z0.glb.clouddn.com/clothe.png',  
338 - type: 'dress',  
339 - products: [  
340 - {  
341 - id: 1,  
342 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/09/0139514beb37bf2bf321eafd1a915117f5.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
343 - name: 'GAWS DIGI 丛林数码印花拼接卫衣',  
344 - isLike: false,  
345 - price: 1268,  
346 - salePrice: 589,  
347 - isSale: true,  
348 - isFew: true,  
349 - isNew: false,  
350 - url: ''  
351 - },  
352 - {  
353 - id: 2,  
354 - thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
355 - name: 'CLOTtee 撞色连帽外套',  
356 - isLike: false,  
357 - price: 488,  
358 - salePrice: 139,  
359 - isSale: true,  
360 - isFew: true,  
361 - isNew: false,  
362 - url: ''  
363 - },  
364 - {  
365 - id: 3,  
366 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
367 - name: 'HALFGIRL 插肩棒球服短裙套装',  
368 - isLike: true,  
369 - price: 478,  
370 - salePrice: 208,  
371 - isSale: true,  
372 - isFew: true,  
373 - isNew: false,  
374 - url: ''  
375 - },  
376 - {  
377 - id: 4,  
378 - thumb: 'http://img10.static.yhbimg.com/goodsimg/2015/01/08/07/012f23fc2390ccd634082d34cc2982bf4c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
379 - name: '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',  
380 - isLike: false,  
381 - price: 589,  
382 - salePrice: 148,  
383 - isSale: false,  
384 - isFew: false,  
385 - isNew: true,  
386 - url: ''  
387 - }  
388 - ]  
389 - },  
390 - {  
391 - thumb: 'http://7xidk0.com1.z0.glb.clouddn.com/sm.png',  
392 - type: 'watch',  
393 - products: [  
394 - {  
395 - id: 1,  
396 - thumb: 'http://img10.static.yhbimg.com/goodsimg/2015/01/08/07/012f23fc2390ccd634082d34cc2982bf4c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
397 - name: 'GAWS DIGI 丛林数码印花拼接卫衣',  
398 - isLike: false,  
399 - price: 1268,  
400 - salePrice: 589,  
401 - isSale: true,  
402 - isFew: true,  
403 - isNew: false,  
404 - url: ''  
405 - },  
406 - {  
407 - id: 2,  
408 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/09/0139514beb37bf2bf321eafd1a915117f5.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
409 - name: 'CLOTtee 撞色连帽外套',  
410 - isLike: false,  
411 - price: 488,  
412 - salePrice: 139,  
413 - isSale: true,  
414 - isFew: true,  
415 - isNew: false,  
416 - url: ''  
417 - },  
418 - {  
419 - id: 3,  
420 - thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
421 - name: 'HALFGIRL 插肩棒球服短裙套装',  
422 - isLike: true,  
423 - price: 478,  
424 - salePrice: 208,  
425 - isSale: true,  
426 - isFew: true,  
427 - isNew: false,  
428 - url: ''  
429 - },  
430 - {  
431 - id: 4,  
432 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/07/01ebfb219e22770ffb0c2c3a2cbb2b4bef.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
433 - name: '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',  
434 - isLike: false,  
435 - price: 589,  
436 - salePrice: 148,  
437 - isSale: false,  
438 - isFew: false,  
439 - isNew: true,  
440 - url: ''  
441 - }  
442 - ]  
443 - },  
444 - {  
445 - thumb: 'http://7xidk0.com1.z0.glb.clouddn.com/clothe.png',  
446 - type: 'pants',  
447 - products: [  
448 - {  
449 - id: 1,  
450 - thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
451 - name: 'GAWS DIGI 丛林数码印花拼接卫衣',  
452 - isLike: false,  
453 - price: 1268,  
454 - salePrice: 589,  
455 - isSale: true,  
456 - isFew: true,  
457 - isNew: false,  
458 - url: ''  
459 - },  
460 - {  
461 - id: 2,  
462 - thumb: 'http://img10.static.yhbimg.com/goodsimg/2015/01/08/07/012f23fc2390ccd634082d34cc2982bf4c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
463 - name: 'CLOTtee 撞色连帽外套',  
464 - isLike: false,  
465 - price: 488,  
466 - salePrice: 139,  
467 - isSale: true,  
468 - isFew: true,  
469 - isNew: false,  
470 - url: ''  
471 - },  
472 - {  
473 - id: 3,  
474 - thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/03/08/0244a127c89c1f77ab47f55891e45be1e6.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
475 - name: 'HALFGIRL 插肩棒球服短裙套装',  
476 - isLike: true,  
477 - price: 478,  
478 - salePrice: 208,  
479 - isSale: true,  
480 - isFew: true,  
481 - isNew: false,  
482 - url: ''  
483 - },  
484 - {  
485 - id: 4,  
486 - thumb: 'http://img11.static.yhbimg.com/goodsimg/2015/03/02/09/0139514beb37bf2bf321eafd1a915117f5.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
487 - name: '黄伟文Wyman X yohood联名商品YYYOHOOD连帽卫衣',  
488 - isLike: false,  
489 - price: 589,  
490 - salePrice: 148,  
491 - isSale: false,  
492 - isFew: false,  
493 - isNew: true,  
494 - url: ''  
495 - }  
496 - ]  
497 } 335 }
498 ] 336 ]
499 } 337 }
@@ -700,8 +538,6 @@ module.exports = function(flag) { @@ -700,8 +538,6 @@ module.exports = function(flag) {
700 '品牌而闻名，包括了CHANEL、ROLEX、Cartier等等。Ssur的创办人是艺术家' + 538 '品牌而闻名，包括了CHANEL、ROLEX、Cartier等等。Ssur的创办人是艺术家' +
701 'Russell, ssur就是其名字反过来写。剩余的位置为了测试文字截取功能是我不' + 539 'Russell, ssur就是其名字反过来写。剩余的位置为了测试文字截取功能是我不' +
702 '得以而添加的，呵呵哒', 540 '得以而添加的，呵呵哒',
703 - clientType: 'h5',  
704 - gender: 1,  
705 newArrival: { 541 newArrival: {
706 moreUrl: '', 542 moreUrl: '',
707 naList: [ 543 naList: [
@@ -782,82 +618,6 @@ module.exports = function(flag) { @@ -782,82 +618,6 @@ module.exports = function(flag) {
782 } 618 }
783 ] 619 ]
784 }; 620 };
785 - //ps异步加载的资讯  
786 - case 'dataInfo':  
787 - return [  
788 - {  
789 - id: 1,  
790 - img: 'http://7xidk0.com1.z0.glb.clouddn.com/bg.png',  
791 - title: '1.副线不知为何总是好看点',  
792 - content: '具有绅士气质的英伦风格是永走前沿的经典，在众多的Made ' +  
793 - 'In England中Panul Smith缔造了一个传奇',  
794 - publishTime: '2月13日 12:34',  
795 - pageView: 3445,  
796 - like: 23,  
797 - share: true,  
798 - url: ''  
799 - },  
800 - {  
801 - id: 2,  
802 - img: 'http://7xidk0.com1.z0.glb.clouddn.com/bg.png',  
803 - title: '2.副线不知为何总是好看点',  
804 - content: '具有绅士气质的英伦风格是永走前沿的经典，在众多的Made ' +  
805 - 'In England中Panul Smith缔造了一个传奇',  
806 - publishTime: '2月13日 12:34',  
807 - pageView: 3445,  
808 - like: 23,  
809 - share: true,  
810 - url: ''  
811 - },  
812 - {  
813 - id: 3,  
814 - img: 'http://7xidk0.com1.z0.glb.clouddn.com/bg.png',  
815 - title: '3.副线不知为何总是好看点',  
816 - content: '具有绅士气质的英伦风格是永走前沿的经典，在众多的Made ' +  
817 - 'In England中Panul Smith缔造了一个传奇',  
818 - publishTime: '2月13日 12:34',  
819 - pageView: 3445,  
820 - like: 23,  
821 - share: true,  
822 - url: ''  
823 - },  
824 - {  
825 - id: 4,  
826 - img: 'http://7xidk0.com1.z0.glb.clouddn.com/bg.png',  
827 - title: '4.副线不知为何总是好看点',  
828 - content: '具有绅士气质的英伦风格是永走前沿的经典，在众多的Made ' +  
829 - 'In England中Panul Smith缔造了一个传奇',  
830 - publishTime: '2月13日 12:34',  
831 - pageView: 3445,  
832 - like: 23,  
833 - share: true,  
834 - url: ''  
835 - },  
836 - {  
837 - id: 5,  
838 - img: 'http://7xidk0.com1.z0.glb.clouddn.com/bg.png',  
839 - title: '5.副线不知为何总是好看点',  
840 - content: '具有绅士气质的英伦风格是永走前沿的经典，在众多的Made ' +  
841 - 'In England中Panul Smith缔造了一个传奇',  
842 - publishTime: '2月13日 12:34',  
843 - pageView: 3445,  
844 - like: 23,  
845 - share: true,  
846 - url: ''  
847 - },  
848 - {  
849 - id: 6,  
850 - img: 'http://7xidk0.com1.z0.glb.clouddn.com/bg.png',  
851 - title: '6.副线不知为何总是好看点',  
852 - content: '具有绅士气质的英伦风格是永走前沿的经典，在众多的Made ' +  
853 - 'In England中Panul Smith缔造了一个传奇',  
854 - publishTime: '2月13日 12:34',  
855 - pageView: 3445,  
856 - like: 23,  
857 - share: true,  
858 - url: ''  
859 - }  
860 - ];  
861 //模板页数据 621 //模板页数据
862 case 'tpl': 622 case 'tpl':
863 return { 623 return {
@@ -900,6 +660,16 @@ module.exports = function(flag) { @@ -900,6 +660,16 @@ module.exports = function(flag) {
900 thumb: 'http://7xidk0.com1.z0.glb.clouddn.com/logo.png', 660 thumb: 'http://7xidk0.com1.z0.glb.clouddn.com/logo.png',
901 name: 'holymoly', 661 name: 'holymoly',
902 url: '' 662 url: ''
  663 + },
  664 + {
  665 + thumb: 'http://7xidk0.com1.z0.glb.clouddn.com/logo.png',
  666 + name: 'HALFGIRL',
  667 + url: ''
  668 + },
  669 + {
  670 + thumb: 'http://7xidk0.com1.z0.glb.clouddn.com/logo.png',
  671 + name: '黄伟文Wyman',
  672 + url: ''
903 } 673 }
904 ] 674 ]
905 } 675 }
@@ -934,6 +704,38 @@ module.exports = function(flag) { @@ -934,6 +704,38 @@ module.exports = function(flag) {
934 price: 488, 704 price: 488,
935 salePrice: 139, 705 salePrice: 139,
936 url: '' 706 url: ''
  707 + },
  708 + {
  709 + id: 1,
  710 + thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  711 + name: 'G-Star白色后腰拉链款男士牛仔裤',
  712 + price: 488,
  713 + salePrice: 139,
  714 + url: ''
  715 + },
  716 + {
  717 + id: 1,
  718 + thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  719 + name: 'G-Star白色后腰拉链款男士牛仔裤',
  720 + price: 488,
  721 + salePrice: 139,
  722 + url: ''
  723 + },
  724 + {
  725 + id: 1,
  726 + thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  727 + name: 'G-Star白色后腰拉链款男士牛仔裤',
  728 + price: 488,
  729 + salePrice: 139,
  730 + url: ''
  731 + },
  732 + {
  733 + id: 1,
  734 + thumb: 'http://img13.static.yhbimg.com/goodsimg/2015/03/02/08/023f696cf1ae78688bc6c8edeccc480c2c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  735 + name: 'G-Star白色后腰拉链款男士牛仔裤',
  736 + price: 488,
  737 + salePrice: 139,
  738 + url: ''
937 } 739 }
938 ] 740 ]
939 } 741 }
@@ -265,8 +265,7 @@ exports.init = function() { @@ -265,8 +265,7 @@ exports.init = function() {
265 $cur.toggleClass('focus'); 265 $cur.toggleClass('focus');
266 } else { 266 } else {
267 if ($cur.hasClass('focus')) { 267 if ($cur.hasClass('focus')) {
268 - if (!$cur.hasClass('new-patterns-nav')) {  
269 - //销量和价格 268 + if ($cur.hasClass('price-nav')) {
270 toggleSort($cur); 269 toggleSort($cur);
271 } 270 }
272 return; 271 return;
@@ -83,7 +83,11 @@ @@ -83,7 +83,11 @@
83 width: 140rem / $pxConvertRem; 83 width: 140rem / $pxConvertRem;
84 border-left: 1px solid #e0e0e0; 84 border-left: 1px solid #e0e0e0;
85 font-size: 35rem / $pxConvertRem; 85 font-size: 35rem / $pxConvertRem;
86 - 86 +
  87 + &.sales-volume-nav {
  88 + padding-left: 0.3rem;
  89 + }
  90 +
87 &:first-child { 91 &:first-child {
88 border-left: none; 92 border-left: none;
89 } 93 }
@@ -36,13 +36,7 @@ @@ -36,13 +36,7 @@
36 <div class="goods-container"> 36 <div class="goods-container">
37 <ul id="goods-nav" class="goods-nav"> 37 <ul id="goods-nav" class="goods-nav">
38 <li class="nav-item new-patterns-nav focus">最新</li> 38 <li class="nav-item new-patterns-nav focus">最新</li>
39 - <li class="nav-item sales-volume-nav">  
40 - 销量  
41 - <span class="sort">  
42 - <i class="up iconfont">&#xe608;</i>  
43 - <i class="down iconfont cur">&#xe609;</i>  
44 - </span>  
45 - </li> 39 + <li class="nav-item sales-volume-nav">销量</li>
46 <li class="nav-item price-nav"> 40 <li class="nav-item price-nav">
47 价格 41 价格
48 <span class="sort"> 42 <span class="sort">