fe / yohobuy-node · Commits

Go to a project

Authored by 周少峰
Commit bc006561d034fd127996bb071627a77d84bdd259 2 parents 11dc4280 983ade0b

Merge branch 'hotfix/saleDiscount'

Inline Side-by-side
Showing 2 changed files with 6 additions and 4 deletions
@@ -371,7 +371,8 @@ exports.getSaleDiscountData = (params, channel) => { @@ -371,7 +371,8 @@ exports.getSaleDiscountData = (params, channel) => {
371 limit: '1', 371 limit: '1',
372 productPool: result[1].data[0].product_pool 372 productPool: result[1].data[0].product_pool
373 }), 373 }),
374 - saleApi.getSaleGoodsList(Object.assign(_.update(params, 'channel', null), { 374 + saleApi.getSaleGoodsList(Object.assign({}, params, {
  375 + channel: null,
375 productPool: result[1].data[0].product_pool 376 productPool: result[1].data[0].product_pool
376 })) 377 }))
377 ]).then(subResult => { 378 ]).then(subResult => {
@@ -564,9 +565,9 @@ exports.getSaleSpecialData = (id, params, channel) => { @@ -564,9 +565,9 @@ exports.getSaleSpecialData = (id, params, channel) => {
564 if (!_.isEmpty(result[1])) { 565 if (!_.isEmpty(result[1])) {
565 resData.leftContent = searchHandler.handleSortData(_.get(result[1], 566 resData.leftContent = searchHandler.handleSortData(_.get(result[1],
566 'data.sort', []), Object.assign({ 567 'data.sort', []), Object.assign({
567 - msort: params.msort || '',  
568 - misort: params.misort || ''  
569 - }, defaultParam)); 568 + msort: params.msort || '',
  569 + misort: params.misort || ''
  570 + }, defaultParam));
570 } 571 }
571 572
572 if (!_.isEmpty(result[2])) { 573 if (!_.isEmpty(result[2])) {
@@ -51,6 +51,7 @@ $shopFavor.on('click', function() { @@ -51,6 +51,7 @@ $shopFavor.on('click', function() {
51 }).then(function(res) { 51 }).then(function(res) {
52 if (res.code === 200) { 52 if (res.code === 200) {
53 $shopFavor.find('i').toggleClass('coled'); 53 $shopFavor.find('i').toggleClass('coled');
  54 + isFavorite = !isFavorite;
54 } else if (res.code === 401) { 55 } else if (res.code === 401) {
55 location.href = '//www.yohobuy.com/signin.html?refer=' + encodeURIComponent(location.href); 56 location.href = '//www.yohobuy.com/signin.html?refer=' + encodeURIComponent(location.href);
56 } 57 }