Authored by dongjunjie

Merge branch 'grey' into testBLK

@@ -656,7 +656,7 @@ var goodsgird = new common.grid({ @@ -656,7 +656,7 @@ var goodsgird = new common.grid({
656 query: common.util.__input('skns'), 656 query: common.util.__input('skns'),
657 price: price, 657 price: price,
658 color: Bll2.getIds(Bll.sorts[0].list), 658 color: Bll2.getIds(Bll.sorts[0].list),
659 - style: getIds(Bll.sorts[1].list),//风格先不管 659 + style: Bll2.getIds(Bll.sorts[1].list),//风格先不管
660 msort: Bll2.getIds(Bll.sorts[2].list), 660 msort: Bll2.getIds(Bll.sorts[2].list),
661 brand: Bll2.getIds(Bll.sorts[3].list), 661 brand: Bll2.getIds(Bll.sorts[3].list),
662 gender: Bll2.getIds(Bll.sorts[4].list) 662 gender: Bll2.getIds(Bll.sorts[4].list)