Showing
2 changed files
with
20 additions
and
5 deletions
@@ -135,7 +135,7 @@ const siteMap = (req, res, next) => { | @@ -135,7 +135,7 @@ const siteMap = (req, res, next) => { | ||
135 | let siteList = ['www', 'list', 'item'], | 135 | let siteList = ['www', 'list', 'item'], |
136 | subdomain = req.subdomains[0] || 'www'; | 136 | subdomain = req.subdomains[0] || 'www'; |
137 | 137 | ||
138 | - if (_.find(siteList, subdomain)) { | 138 | + if (_.indexOf(siteList, subdomain) === -1) { |
139 | res.end('end'); | 139 | res.end('end'); |
140 | return; | 140 | return; |
141 | } | 141 | } |
@@ -237,7 +237,7 @@ class FilterTools { | @@ -237,7 +237,7 @@ class FilterTools { | ||
237 | condition.name = sizeFind.size_name; | 237 | condition.name = sizeFind.size_name; |
238 | } | 238 | } |
239 | } else if (k === 'age_level') { | 239 | } else if (k === 'age_level') { |
240 | - if (filter.ageLevel.length > 1) { | 240 | + if (filter.ageLevel) { |
241 | const ageFind = _.find(filter.ageLevel, c => +c.id === _.parseInt(params.age_level)); | 241 | const ageFind = _.find(filter.ageLevel, c => +c.id === _.parseInt(params.age_level)); |
242 | 242 | ||
243 | if (ageFind) { | 243 | if (ageFind) { |
@@ -449,18 +449,33 @@ class FilterTools { | @@ -449,18 +449,33 @@ class FilterTools { | ||
449 | let {baseUrl, origin, params} = this; | 449 | let {baseUrl, origin, params} = this; |
450 | const standards = _.get(origin, 'standard', {}); | 450 | const standards = _.get(origin, 'standard', {}); |
451 | const filterStandars = []; | 451 | const filterStandars = []; |
452 | - const standarParam = params.standard || ''; | ||
453 | const href = handleFilterUrl(baseUrl, params, {standard: '${standard}'}); | 452 | const href = handleFilterUrl(baseUrl, params, {standard: '${standard}'}); |
453 | + let standarParam = {}; | ||
454 | + | ||
455 | + _.each(_.split(params.standard || '', ','), item => { | ||
456 | + const sps = _.split(item, '_'); | ||
457 | + | ||
458 | + if (sps.length === 2) { | ||
459 | + standarParam[sps[0]] = sps[1]; | ||
460 | + } | ||
461 | + }); | ||
454 | 462 | ||
455 | _.each(standards, standard => { | 463 | _.each(standards, standard => { |
456 | if (standard.sub.length > 1) { | 464 | if (standard.sub.length > 1) { |
457 | filterStandars.push({ | 465 | filterStandars.push({ |
458 | name: standard.standard_name, | 466 | name: standard.standard_name, |
459 | sub: _.map(standard.sub, sub => { | 467 | sub: _.map(standard.sub, sub => { |
468 | + const standarParamItem = Object.assign({}, standarParam, { | ||
469 | + [standard.standard_id]: sub.standard_id | ||
470 | + }); | ||
471 | + const standarParamStr = _.join(_.map(standarParamItem, (v, k) => { | ||
472 | + return `${k}_${v}`; | ||
473 | + }), ','); | ||
474 | + | ||
460 | return { | 475 | return { |
461 | name: sub.standard_name, | 476 | name: sub.standard_name, |
462 | - href: href.replace('${standard}', | ||
463 | - `${standarParam}${standarParam && ','}${standard.standard_id}_${sub.standard_id}`), | 477 | + href: href.replace('${standard}', standarParamStr), |
478 | + checked: _.parseInt(sub.standard_id) === _.parseInt(standarParam[standard.standard_id]), | ||
464 | id: sub.standard_id | 479 | id: sub.standard_id |
465 | }; | 480 | }; |
466 | }) | 481 | }) |
-
Please register or login to post a comment