Showing
8 changed files
with
10 additions
and
23 deletions
| @@ -3,14 +3,14 @@ | @@ -3,14 +3,14 @@ | ||
| 3 | {{# shoppingCart}} | 3 | {{# shoppingCart}} |
| 4 | {{#if gift}} | 4 | {{#if gift}} |
| 5 | {{# gift}} | 5 | {{# gift}} |
| 6 | - {{> shopping-cart/gift-advance-good}} | 6 | + {{> cart/gift-advance-good}} |
| 7 | {{/ gift}} | 7 | {{/ gift}} |
| 8 | {{^}} | 8 | {{^}} |
| 9 | {{# advance}} | 9 | {{# advance}} |
| 10 | <div class="advance-block"> | 10 | <div class="advance-block"> |
| 11 | <p class="title">{{title}}</p> | 11 | <p class="title">{{title}}</p> |
| 12 | {{# goods}} | 12 | {{# goods}} |
| 13 | - {{> shopping-cart/gift-advance-good}} | 13 | + {{> cart/gift-advance-good}} |
| 14 | {{/ goods}} | 14 | {{/ goods}} |
| 15 | </div> | 15 | </div> |
| 16 | {{/ advance}} | 16 | {{/ advance}} |
| @@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
| 27 | 27 | ||
| 28 | {{# commonCart}} | 28 | {{# commonCart}} |
| 29 | <div class="cart-content common"> | 29 | <div class="cart-content common"> |
| 30 | - {{> shopping-cart/cart-content}} | 30 | + {{> cart/cart-content}} |
| 31 | </div> | 31 | </div> |
| 32 | {{/ commonCart}} | 32 | {{/ commonCart}} |
| 33 | 33 | ||
| @@ -38,26 +38,12 @@ | @@ -38,26 +38,12 @@ | ||
| 38 | <span class="txt">预售商品全场包邮，到货后立即发货</span> | 38 | <span class="txt">预售商品全场包邮，到货后立即发货</span> |
| 39 | <span class="txt">预售商品不参加活动，不可使用优惠券</span> | 39 | <span class="txt">预售商品不参加活动，不可使用优惠券</span> |
| 40 | </p> | 40 | </p> |
| 41 | - {{> shopping-cart/cart-content}} | 41 | + {{> cart/cart-content}} |
| 42 | </div> | 42 | </div> |
| 43 | {{/ preSellCart}} | 43 | {{/ preSellCart}} |
| 44 | 44 | ||
| 45 | {{/ shoppingCart}} | 45 | {{/ shoppingCart}} |
| 46 | </div> | 46 | </div> |
| 47 | -<div id="advanceBuy" class="shopping-cart-page yoho-page hide"> | ||
| 48 | -{{# shoppingCart}} | ||
| 49 | - {{# commonCart}} | ||
| 50 | - {{# advanceBuy}} | ||
| 51 | - <span> | ||
| 52 | - {{promotionTitle}} | ||
| 53 | - </span> | ||
| 54 | - {{# goods}} | ||
| 55 | - {{> shopping-cart/gift-advance-good}} | ||
| 56 | - {{/ goods}} | ||
| 57 | - {{/ advanceBuy}} | ||
| 58 | - {{/ commonCart}} | ||
| 59 | -{{/ shoppingCart}} | ||
| 60 | -</div> | ||
| 61 | 47 | ||
| 62 | <div class="shopping-cart-zero yoho-page hide"> | 48 | <div class="shopping-cart-zero yoho-page hide"> |
| 63 | <div class="cart-zero"> | 49 | <div class="cart-zero"> |
| @@ -68,5 +54,5 @@ | @@ -68,5 +54,5 @@ | ||
| 68 | {{> product/recommend-for-you}} | 54 | {{> product/recommend-for-you}} |
| 69 | </div> | 55 | </div> |
| 70 | 56 | ||
| 71 | - {{> shopping-cart/chose-panel}} | 57 | + {{> cart/chose-panel}} |
| 72 | {{> layout/footer}} | 58 | {{> layout/footer}} |
| 1 | <div class="cart-goods"> | 1 | <div class="cart-goods"> |
| 2 | {{# goods}} | 2 | {{# goods}} |
| 3 | - {{> shopping-cart/good}} | 3 | + {{> cart/good}} |
| 4 | {{/ goods}} | 4 | {{/ goods}} |
| 5 | 5 | ||
| 6 | {{# $notValidGoods}} | 6 | {{# $notValidGoods}} |
| 7 | - {{> shopping-cart/good}} | 7 | + {{> cart/good}} |
| 8 | {{/ $notValidGoods}} | 8 | {{/ $notValidGoods}} |
| 9 | 9 | ||
| 10 | </div> | 10 | </div> |
| @@ -674,12 +674,12 @@ class CartModel | @@ -674,12 +674,12 @@ class CartModel | ||
| 674 | break; | 674 | break; |
| 675 | } | 675 | } |
| 676 | 676 | ||
| 677 | - if ($onlyAdvanceBuy) { | 677 | + if ($onlyGift) { |
| 678 | // 赠品 | 678 | // 赠品 |
| 679 | $result['freebie'] = Helpers::formatAdvanceGoods($data['gift_list']); | 679 | $result['freebie'] = Helpers::formatAdvanceGoods($data['gift_list']); |
| 680 | break; | 680 | break; |
| 681 | } | 681 | } |
| 682 | - if ($onlyGift) { | 682 | + if ($onlyAdvanceBuy) { |
| 683 | // 加价购 | 683 | // 加价购 |
| 684 | $result['advanceBuy'] = Helpers::formatAdvanceGoods($data['price_gift']); | 684 | $result['advanceBuy'] = Helpers::formatAdvanceGoods($data['price_gift']); |
| 685 | break; | 685 | break; |
| @@ -165,6 +165,7 @@ class IndexController extends AbstractAction | @@ -165,6 +165,7 @@ class IndexController extends AbstractAction | ||
| 165 | $data += CartModel::getCartData($uid, $shoppingKey, $cartType, false, true); | 165 | $data += CartModel::getCartData($uid, $shoppingKey, $cartType, false, true); |
| 166 | 166 | ||
| 167 | // 渲染模板 | 167 | // 渲染模板 |
| 168 | + var_dump($data); | ||
| 168 | $this->_view->display('gift-advance-good', $data); | 169 | $this->_view->display('gift-advance-good', $data); |
| 169 | } | 170 | } |
| 170 | 171 |
-
Please register or login to post a comment