cart doest not group by brand
Showing
3 changed files
with
12 additions
and
11 deletions
| @@ -294,12 +294,13 @@ const filterCartData = (result, uid) => { | @@ -294,12 +294,13 @@ const filterCartData = (result, uid) => { | ||
| 294 | }); | 294 | }); |
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | + // _.groupBy(_.concat(advancedGoods, advancedSoldOutGoods), 'brand_id') | ||
| 297 | return _.merge(resData, { | 298 | return _.merge(resData, { |
| 298 | hasGoods: advancedGoods.length || ordinaryGoods.length || invalidGoods.length, | 299 | hasGoods: advancedGoods.length || ordinaryGoods.length || invalidGoods.length, |
| 299 | - preSalePros: (advancedSoldOutGoods.length || advancedGoods.length) ? | ||
| 300 | - _.groupBy(_.concat(advancedGoods, advancedSoldOutGoods), 'brand_id') : [], | 300 | + preSalePros: (advancedSoldOutGoods.length || advancedGoods.length) ? |
| 301 | + _.concat(advancedGoods, advancedSoldOutGoods) : [], | ||
| 301 | commonPros: (ordinarySoldOutGoods.length || ordinaryGoods.length) ? | 302 | commonPros: (ordinarySoldOutGoods.length || ordinaryGoods.length) ? |
| 302 | - _.groupBy(_.concat(ordinaryGoods, ordinarySoldOutGoods), 'brand_id') : [], | 303 | + _.concat(ordinaryGoods, ordinarySoldOutGoods) : [], |
| 303 | invalidPros: invalidGoods, | 304 | invalidPros: invalidGoods, |
| 304 | selectedNum: selectedAdvanceNum + selectedOrdinaryNum, | 305 | selectedNum: selectedAdvanceNum + selectedOrdinaryNum, |
| 305 | checkAll: totalNum === (selectedAdvanceNum + selectedOrdinaryNum), | 306 | checkAll: totalNum === (selectedAdvanceNum + selectedOrdinaryNum), |
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | <div class="pro-list"> | 7 | <div class="pro-list"> |
| 8 | {{#each preSalePros}} | 8 | {{#each preSalePros}} |
| 9 | <div class="pros-group"> | 9 | <div class="pros-group"> |
| 10 | - {{# each this}} | 10 | + {{!-- {{# each this}} --}} |
| 11 | <ul> | 11 | <ul> |
| 12 | <li class="chk" data-product_info='{"goods_type": "advance", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'> | 12 | <li class="chk" data-product_info='{"goods_type": "advance", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'> |
| 13 | <label class="toggle-chk-item {{#isEqual selected 'Y'}}chk-group{{/isEqual}}"> | 13 | <label class="toggle-chk-item {{#isEqual selected 'Y'}}chk-group{{/isEqual}}"> |
| @@ -49,7 +49,7 @@ | @@ -49,7 +49,7 @@ | ||
| 49 | </div> | 49 | </div> |
| 50 | </li> | 50 | </li> |
| 51 | </ul> | 51 | </ul> |
| 52 | - {{/each}} | 52 | + {{!-- {{/each}} --}} |
| 53 | </div> | 53 | </div> |
| 54 | {{/each}} | 54 | {{/each}} |
| 55 | </div> | 55 | </div> |
| @@ -64,7 +64,7 @@ | @@ -64,7 +64,7 @@ | ||
| 64 | <div class="pro-list"> | 64 | <div class="pro-list"> |
| 65 | {{#each commonPros}} | 65 | {{#each commonPros}} |
| 66 | <div class="pros-group"> | 66 | <div class="pros-group"> |
| 67 | - {{# each this}} | 67 | + {{!-- {{# each this}} --}} |
| 68 | <ul> | 68 | <ul> |
| 69 | <li class="chk" data-product_info='{"goods_type": "ordinary", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'> | 69 | <li class="chk" data-product_info='{"goods_type": "ordinary", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'> |
| 70 | <label class="toggle-chk-item {{#isEqual selected 'Y'}}chk-group{{/isEqual}}"> | 70 | <label class="toggle-chk-item {{#isEqual selected 'Y'}}chk-group{{/isEqual}}"> |
| @@ -103,7 +103,7 @@ | @@ -103,7 +103,7 @@ | ||
| 103 | </div> | 103 | </div> |
| 104 | </li> | 104 | </li> |
| 105 | </ul> | 105 | </ul> |
| 106 | - {{/each}} | 106 | + {{!-- {{/each}} --}} |
| 107 | </div> | 107 | </div> |
| 108 | {{/each}} | 108 | {{/each}} |
| 109 | </div> | 109 | </div> |
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | <div class="pro-list"> | 23 | <div class="pro-list"> |
| 24 | {{#each preSalePros}} | 24 | {{#each preSalePros}} |
| 25 | <div class="pros-group"> | 25 | <div class="pros-group"> |
| 26 | - {{# each this}} | 26 | + {{!-- {{# each this}} --}} |
| 27 | <ul> | 27 | <ul> |
| 28 | <li class="chk" data-product_info='{"goods_type": "advance", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'> | 28 | <li class="chk" data-product_info='{"goods_type": "advance", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'> |
| 29 | <label class="toggle-chk-item {{#isEqual selected 'Y'}}chk-group{{/isEqual}}"> | 29 | <label class="toggle-chk-item {{#isEqual selected 'Y'}}chk-group{{/isEqual}}"> |
| @@ -78,7 +78,7 @@ | @@ -78,7 +78,7 @@ | ||
| 78 | </div> | 78 | </div> |
| 79 | </li> | 79 | </li> |
| 80 | </ul> | 80 | </ul> |
| 81 | - {{/each}} | 81 | + {{!-- {{/each}} --}} |
| 82 | </div> | 82 | </div> |
| 83 | {{/each}} | 83 | {{/each}} |
| 84 | </div> | 84 | </div> |
| @@ -93,7 +93,7 @@ | @@ -93,7 +93,7 @@ | ||
| 93 | <div class="pro-list"> | 93 | <div class="pro-list"> |
| 94 | {{#each commonPros}} | 94 | {{#each commonPros}} |
| 95 | <div class="pros-group"> | 95 | <div class="pros-group"> |
| 96 | - {{# each this}} | 96 | + {{!-- {{# each this}} --}} |
| 97 | <ul> | 97 | <ul> |
| 98 | <li class="chk" data-product_info='{"goods_type": "ordinary", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'> | 98 | <li class="chk" data-product_info='{"goods_type": "ordinary", "buy_number": {{buy_number}}, "selected": "{{selected}}", "product_sku": "{{product_sku}}", "promotion_id": 0}'> |
| 99 | <label class="toggle-chk-item {{#isEqual selected 'Y'}}chk-group{{/isEqual}}"> | 99 | <label class="toggle-chk-item {{#isEqual selected 'Y'}}chk-group{{/isEqual}}"> |
| @@ -145,7 +145,7 @@ | @@ -145,7 +145,7 @@ | ||
| 145 | </div> | 145 | </div> |
| 146 | </li> | 146 | </li> |
| 147 | </ul> | 147 | </ul> |
| 148 | - {{/each}} | 148 | + {{!-- {{/each}} --}} |
| 149 | </div> | 149 | </div> |
| 150 | {{/each}} | 150 | {{/each}} |
| 151 | </div> | 151 | </div> |
-
Please register or login to post a comment