fe / yohobuy-node · Commits

Go to a project

Authored by 刘传洋
Commit 0cf8d00315ae37916ed555f96b1808470f0fb994 1 parent 7123047b

m

Inline Side-by-side
Showing 2 changed files with 8 additions and 4 deletions
@@ -433,7 +433,10 @@ const getCartData = (uid, shoppingKey, cartDelList) => { @@ -433,7 +433,10 @@ const getCartData = (uid, shoppingKey, cartDelList) => {
433 offShelves: chelper.formatOffShelves(_.get(advCartData, 'off_shelves_goods_list'), true, analysisData), 433 offShelves: chelper.formatOffShelves(_.get(advCartData, 'off_shelves_goods_list'), true, analysisData),
434 soldOuts: chelper.formatSoldOuts(_.get(advCartData, 'sold_out_goods_list'), true, analysisData), 434 soldOuts: chelper.formatSoldOuts(_.get(advCartData, 'sold_out_goods_list'), true, analysisData),
435 promotionInfos: chelper.formatPromotionInfos(_.get(advCartData, 'promotion_info')), 435 promotionInfos: chelper.formatPromotionInfos(_.get(advCartData, 'promotion_info')),
436 - stat: chelper.formatShoppingCartData(_.get(advCartData, 'shopping_cart_data')) 436 + stat: chelper.formatShoppingCartData(_.get(advCartData, 'shopping_cart_data')),
  437 + ensureUrl: helpers.urlFormat('/cart/ensure', {
  438 + type: 2
  439 + })
437 }; 440 };
438 441
439 let giftsList = chelper.formatPriceGifts(_.get(ordCartData, 'gift_list')); 442 let giftsList = chelper.formatPriceGifts(_.get(ordCartData, 'gift_list'));
@@ -454,7 +457,8 @@ const getCartData = (uid, shoppingKey, cartDelList) => { @@ -454,7 +457,8 @@ const getCartData = (uid, shoppingKey, cartDelList) => {
454 soldOuts: chelper.formatSoldOuts(_.get(ordCartData, 'sold_out_goods_list'), false, analysisData), 457 soldOuts: chelper.formatSoldOuts(_.get(ordCartData, 'sold_out_goods_list'), false, analysisData),
455 458
456 promotionInfos: chelper.formatPromotionInfos(_.get(ordCartData, 'promotion_info'), goodsList), 459 promotionInfos: chelper.formatPromotionInfos(_.get(ordCartData, 'promotion_info'), goodsList),
457 - stat: chelper.formatShoppingCartData(_.get(ordCartData, 'shopping_cart_data')) 460 + stat: chelper.formatShoppingCartData(_.get(ordCartData, 'shopping_cart_data')),
  461 + ensureUrl: helpers.urlFormat('/cart/ensure')
458 }; 462 };
459 463
460 let advStat = result.advanceCart.stat; 464 let advStat = result.advanceCart.stat;
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 </div> 33 </div>
34 </div> 34 </div>
35 </div> 35 </div>
36 - <a class="btn-account">去结算</a> 36 + <a class="btn-account" href="{{ensureUrl}}">去结算</a>
37 {{/advanceCart}} 37 {{/advanceCart}}
38 {{#ordinaryCart}} 38 {{#ordinaryCart}}
39 <div class="slide-img"> 39 <div class="slide-img">
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 </div> 62 </div>
63 </div> 63 </div>
64 </div> 64 </div>
65 - <a class="btn-account btn-account-black">去结算</a> 65 + <a class="btn-account btn-account-black" href="{{ensureUrl}}">去结算</a>
66 {{/ordinaryCart}} 66 {{/ordinaryCart}}
67 <p class="pre-sell-tip">温馨提示：您需要分开结算【预售商品】和【普通商品】</p> 67 <p class="pre-sell-tip">温馨提示：您需要分开结算【预售商品】和【普通商品】</p>
68 </div> 68 </div>