fe / yohobuy-node · Commits

Go to a project

Authored by yyq
Commit 3b12207792808fbdfba12f010637051cae8b39d2 2 parents 64987a29 c076fde4

Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuy-node into release/4.6

Inline Side-by-side
Showing 2 changed files with 10 additions and 44 deletions
... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2016-06-02 15:50:47
* @Last Modified by: Targaryen
* @Last Modified time: 2016-06-17 16:42:51
* @Last Modified time: 2016-06-17 20:31:46
*/
'use strict';
... ... @@ -12,33 +12,16 @@ const helpers = require(`${library}/helpers`);
const queryString = require('querystring');
/**
* 处理用于筛选的 URL
* @param {[type]} originParam [description]
* @param {[type]} newParam [description]
* @return {[type]} [description]
* 处理用于筛选的 URL ， 拼接 URL 参数
* @param originParam 当前 URL 中的参数
* @param newParam 要拼接的 参数
* @returns {string}
*/
const handleFilterUrl = (originParam, newParam) => {
let dest = '?';
let tempOriginParam = {};
// 创建 originParam、newParam 键的数组
let originParamArray = _.keys(originParam);
let newParamArray = _.keys(newParam);
// 判断参数是否已经存在
let isExist = !_.isEmpty(_.find(originParamArray, function(o) {
return o === newParamArray[0];
}));
if (isExist) {
tempOriginParam = Object.assign(tempOriginParam, originParam);
_.forEach(newParam, function(value, key) {
tempOriginParam[key] = value;
});
} else {
tempOriginParam = Object.assign(tempOriginParam, originParam, newParam);
}
tempOriginParam = Object.assign(tempOriginParam, originParam, newParam);
_.forEach(tempOriginParam, function(value, key) {
dest = dest + key + '=' + value + '&';
... ... @@ -571,7 +554,7 @@ exports.handleSaleFilterData = (origin, params) => {
if (!_.isEmpty(origin.size) && params.saleType === '1') {
dest.size = handleSalebreakingYardsSortData(origin.size, params);
// 最新降价筛选数据处理
// 处理断码区尺码筛选数据
dest.checkedConditions.conditions = _.union(dest.checkedConditions.conditions,
handleCheckedData(params, dest.size, 'size'));
}
... ...
... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2016-05-25 18:16:59
* @Last Modified by: Targaryen
* @Last Modified time: 2016-06-17 16:43:38
* @Last Modified time: 2016-06-17 20:31:42
*/
'use strict';
... ... @@ -78,24 +78,7 @@ const handleFilterUrl = (originParam, newParam) => {
let dest = '?';
let tempOriginParam = {};
// 创建 originParam、newParam 键的数组
let originParamArray = _.keys(originParam);
let newParamArray = _.keys(newParam);
// 判断参数是否已经存在
let isExist = !_.isEmpty(_.find(originParamArray, function(o) {
return o === newParamArray[0];
}));
if (isExist) {
tempOriginParam = Object.assign(tempOriginParam, originParam);
_.forEach(newParam, function(value, key) {
tempOriginParam[key] = value;
});
} else {
tempOriginParam = Object.assign(tempOriginParam, originParam, newParam);
}
tempOriginParam = Object.assign(tempOriginParam, originParam, newParam);
_.forEach(tempOriginParam, function(value, key) {
dest = dest + key + '=' + value + '&';
... ... @@ -389,7 +372,7 @@ exports.handleSaleFilterData = (origin, params) => {
if (!_.isEmpty(origin.size) && params.saleType === '1') {
dest.size = handleSalebreakingYardsSortData(origin.size, params);
// 最新降价筛选数据处理
// 处理断码区尺码筛选数据
dest.checkedConditions.conditions = _.union(dest.checkedConditions.conditions,
handleCheckedData(params, dest.size, 'size'));
}
... ...