Authored by yyq

Merge branch 'feature/pieceGoods' into release/6.3

@@ -798,18 +798,12 @@ module.exports = class extends global.yoho.BaseModel { @@ -798,18 +798,12 @@ module.exports = class extends global.yoho.BaseModel {
798 798
799 return co(function * () { 799 return co(function * () {
800 let tabs; 800 let tabs;
801 - let allTab = {  
802 - price: '0,300',  
803 - priceTabName: '全部',  
804 - active: true  
805 - };  
806 801
807 if (!params.price) { 802 if (!params.price) {
808 tabs = _.get(yield cartApi.getTogetherProductPriceTabAsync(), 'data', []); 803 tabs = _.get(yield cartApi.getTogetherProductPriceTabAsync(), 'data', []);
809 - tabs = _.concat(allTab, tabs);  
810 } 804 }
811 805
812 - let price = params.price || _.get(tabs, '[0].price', allTab.price); 806 + let price = params.price || _.get(tabs, '[0].price', '0,300');
813 let productInfo = yield cartApi.getTogetherProductListAsync(price, page, limit); 807 let productInfo = yield cartApi.getTogetherProductListAsync(price, page, limit);
814 808
815 if (productInfo.code === 200) { 809 if (productInfo.code === 200) {