fe / yohobuywap-node · Commits

Go to a project

Authored by 王水玲
Commit 9574c43c667365093438aebb15f3442cb12fe76a 1 parent cf1b5aef

mip

Inline Side-by-side
Showing 4 changed files with 13 additions and 13 deletions
@@ -33,12 +33,12 @@ const _formatJumpUrl = (params) => { @@ -33,12 +33,12 @@ const _formatJumpUrl = (params) => {
33 opt.union_type = '100000000013130'; 33 opt.union_type = '100000000013130';
34 34
35 return { 35 return {
36 - default: listParamsProcess.generatePathUrl(_.assign(opt, {type: 'default'})),  
37 - new: listParamsProcess.generatePathUrl(_.assign(opt, {type: 'new'})),  
38 - popularity: listParamsProcess.generatePathUrl(_.assign(opt, {type: 'popularity'})),  
39 - price: listParamsProcess.generatePathUrl(_.assign(opt, {type: 'price', order: order})),  
40 - discount0: listParamsProcess.generatePathUrl(_.assign(opt, {type: 'discount', order: 0})),  
41 - discount1: listParamsProcess.generatePathUrl(_.assign(opt, {type: 'discount', order: 1})), 36 + default: listParamsProcess.generatePathUrl(_.merge({}, opt, {type: 'default'})),
  37 + new: listParamsProcess.generatePathUrl(_.merge({}, opt, {type: 'new'})),
  38 + popularity: listParamsProcess.generatePathUrl(_.merge({}, opt, {type: 'popularity'})),
  39 + price: listParamsProcess.generatePathUrl(_.merge({}, opt, {type: 'price', order: order})),
  40 + discount0: listParamsProcess.generatePathUrl(_.merge({}, opt, {type: 'discount', order: 0})),
  41 + discount1: listParamsProcess.generatePathUrl(_.merge({}, opt, {type: 'discount', order: 1})),
42 curUrl: listParamsProcess.generatePathUrl(opt) 42 curUrl: listParamsProcess.generatePathUrl(opt)
43 }; 43 };
44 }; 44 };
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <li class="filter-li {{#isEqualOr goodList.type 'price'}}selected-filter{{/isEqualOr}}"> 20 <li class="filter-li {{#isEqualOr goodList.type 'price'}}selected-filter{{/isEqualOr}}">
21 <a href="{{jumpUrls.price}}" m-bind:data-filterColorGray="filterColorGray">价格 21 <a href="{{jumpUrls.price}}" m-bind:data-filterColorGray="filterColorGray">价格
22 <span class="icon"> 22 <span class="icon">
23 - <i class="up-icon {{#isEqualOr goodList.order '0'}}{{else}}cur{{/isEqualOr}}"></i> 23 + <i class="up-icon {{#notEqualEither goodList.order '0'}}cur{{/notEqualEither}}"></i>
24 <i class="down-icon {{#isEqualOr goodList.order '0'}}cur{{/isEqualOr}}"></i> 24 <i class="down-icon {{#isEqualOr goodList.order '0'}}cur{{/isEqualOr}}"></i>
25 </span> 25 </span>
26 </a> 26 </a>
@@ -31,9 +31,9 @@ @@ -31,9 +31,9 @@
31 </ul> 31 </ul>
32 32
33 <div class="hide filter-nav1" m-bind:data-filterClickedNav1="filterClickedNav1"> 33 <div class="hide filter-nav1" m-bind:data-filterClickedNav1="filterClickedNav1">
34 - <p class="selected"><a href="{{jumpUrls.default}}">默认<span class="select-icon"></span></a></p>  
35 - <p><a href="{{jumpUrls.discount0}}">折扣从高到低<span class="select-icon"></span></a></p>  
36 - <p><a href="{{jumpUrls.discount1}}">折扣从低到高<span class="select-icon"></span></a></p> 34 + <p class="{{#notEqualEither @root.goodList.type 'discount'}}selected{{/notEqualEither}}"><a href="{{jumpUrls.default}}">默认<span class="select-icon"></span></a></p>
  35 + <p class="{{#isEqualOr @root.goodList.order '0'}}selected{{/isEqualOr}}"><a href="{{jumpUrls.discount0}}">折扣从高到低<span class="select-icon"></span></a></p>
  36 + <p class="{{#isEqualOr @root.goodList.order '1'}}selected{{/isEqualOr}}"><a href="{{jumpUrls.discount1}}">折扣从低到高<span class="select-icon"></span></a></p>
37 </div> 37 </div>
38 </div> 38 </div>
39 39
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <a href="javascript:void(0);"> 23 <a href="javascript:void(0);">
24 <span class="nav-txt">价格</span> 24 <span class="nav-txt">价格</span>
25 <span class="icon"> 25 <span class="icon">
26 - <i class="iconfont up {{#isEqualOr @root.goodList.order '0'}}{{else}}cur{{/isEqualOr}}">&#xe615;</i> 26 + <i class="iconfont up {{#notEqualEither @root.goodList.order '0'}}cur{{/notEqualEither}}">&#xe615;</i>
27 <i class="iconfont down {{#isEqualOr @root.goodList.order '0'}}cur{{/isEqualOr}}">&#xe616;</i> 27 <i class="iconfont down {{#isEqualOr @root.goodList.order '0'}}cur{{/isEqualOr}}">&#xe616;</i>
28 </span> 28 </span>
29 </a> 29 </a>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 </ul> 37 </ul>
38 38
39 <ul class="drop-list hide"> 39 <ul class="drop-list hide">
40 - <li class="default {{#isEqualOr @root.goodList.type 'default'}}active{{/isEqualOr}}" data-bp-id="shop_listnav_default_1" data-text="默认"> 40 + <li class="default {{#notEqualEither @root.goodList.type 'discount'}}active{{/notEqualEither}}" data-bp-id="shop_listnav_default_1" data-text="默认">
41 <span>默认</span> 41 <span>默认</span>
42 <span class="chose"></span> 42 <span class="chose"></span>
43 </li> 43 </li>
@@ -411,7 +411,7 @@ exports.processFilter = (list, options) => { @@ -411,7 +411,7 @@ exports.processFilter = (list, options) => {
411 } 411 }
412 } 412 }
413 413
414 - if (options[key] + '' === subs.dataId + '') { 414 + if (options[classify.dataType] + '' === subs.dataId + '') {
415 subs.chosed = true; 415 subs.chosed = true;
416 classify.subs[0].chosed = false; 416 classify.subs[0].chosed = false;
417 } 417 }