Authored by 郭成尧

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

 the commit.
@@ -412,6 +412,103 @@ exports.other = () => { @@ -412,6 +412,103 @@ exports.other = () => {
412 412
413 }, 413 },
414 414
  415 + filters: {
  416 + checkedConditions: {
  417 + conditions: [
  418 + {
  419 + herf: 'www.baidu.com',
  420 + name: 'BOYS',
  421 + color: 'black'
  422 + },
  423 + {
  424 + herf: 'www.baidu.com',
  425 + name: 'Girls',
  426 + color: 'black'
  427 + }
  428 + ],
  429 + clearUrl: 'www.baid.com'
  430 + },
  431 +
  432 + // channel gender sort misort 都一样
  433 + channel: [
  434 + {
  435 + checked: true,
  436 + href: 'www.baodu.com',
  437 + name: '男生'
  438 + },
  439 + {
  440 + checked: true,
  441 + href: 'www.baodu.com',
  442 + name: '女生'
  443 + }
  444 + ],
  445 +
  446 + brand: {
  447 + default: [
  448 + {
  449 + checked: true,
  450 + href: 'asdad',
  451 + name: '品牌1'
  452 + },
  453 + {
  454 + checked: true,
  455 + href: 'asdad',
  456 + name: '品牌2'
  457 + }
  458 + ]
  459 + },
  460 +
  461 + price: [
  462 + {
  463 + checked: true,
  464 + href: 'asdad',
  465 + name: '品牌1'
  466 + },
  467 + {
  468 + checked: true,
  469 + href: 'asdad',
  470 + name: '品牌2'
  471 + }
  472 + ]
  473 +
  474 + },
  475 +
  476 +
  477 +
  478 +
  479 + opts: {
  480 + sortType: [
  481 + {
  482 + href: 'www.baidu.com',
  483 + name: '折扣',
  484 + hasSortOrient: {
  485 + active: {
  486 + desc: {
  487 +
  488 + }
  489 + }
  490 + }
  491 + },
  492 + {
  493 + href: 'www.baidu.com',
  494 + name: '价格',
  495 + hasSortOrient: {
  496 +
  497 + }
  498 + },
  499 + {
  500 +
  501 + }
  502 + ],
  503 + countPerPage: 60,
  504 + pageCounts: {
  505 + href: 'wda',
  506 + count: '12'
  507 + },
  508 + start: 1,
  509 + end: 20
  510 + },
  511 +
415 goods: [ 512 goods: [
416 { 513 {
417 tags: 514 tags:
@@ -443,7 +540,16 @@ exports.other = () => { @@ -443,7 +540,16 @@ exports.other = () => {
443 }, 540 },
444 marketPrice: '231' 541 marketPrice: '231'
445 } 542 }
446 - ] 543 + ],
  544 +
  545 + totalCount: 1233,
  546 + hasNextPage: {
  547 + href: '13',
  548 + src: '231'
  549 + },
  550 +
  551 + // pager 的html
  552 + pager: ''
447 553
448 } 554 }
449 }; 555 };
@@ -4,6 +4,7 @@ var $ = require('yoho-jquery'), @@ -4,6 +4,7 @@ var $ = require('yoho-jquery'),
4 4
5 require('../header'); 5 require('../header');
6 require('../index/slider'); 6 require('../index/slider');
  7 +require('product');
7 8
8 lazyLoad($('img.lazy')); 9 lazyLoad($('img.lazy'));
9 $('.slide-container').slider(); 10 $('.slide-container').slider();
1 var $ = require('yoho-jquery'), 1 var $ = require('yoho-jquery'),
2 $navItem = $('.sale-nav li'), 2 $navItem = $('.sale-nav li'),
3 lazyLoad = require('yoho-jquery-lazyload'); 3 lazyLoad = require('yoho-jquery-lazyload');
  4 +var product = require('./product');
4 5
5 require('../header'); 6 require('../header');
6 require('../index/slider'); 7 require('../index/slider');
  8 +product.init();
7 9
8 lazyLoad($('img.lazy')); 10 lazyLoad($('img.lazy'));
9 $('.slide-container').slider(); 11 $('.slide-container').slider();