修复购物车赠品有关bug（价格显示，赠品数量显示）

Code Review By Rock Zhang

@@ -12,7 +12,7 @@
     {{else}}
     {{else}}
         {{# freebie}}
         {{# freebie}}
             <div class="advance-block gift-block" data-promotion-id="{{promotionId}}">
             <div class="advance-block gift-block" data-promotion-id="{{promotionId}}">
-                <p class="title">{{title}}</p>
+                <p class="title">{{promotionTitle}}</p>
                 {{#goods}}
                 {{#goods}}
                     {{> cart/gift-advance-good}}
                     {{> cart/gift-advance-good}}
                 {{/goods}}
                 {{/goods}}

@@ -17,7 +17,7 @@
                 <span class="iconfont">&#xe620;</span>
                 <span class="iconfont">&#xe620;</span>
                 赠品
                 赠品
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
-                    <span class="count">{{count}}</span>
+                    <span class="count">{{giftCount}}</span>
                 </a>
                 </a>
             </li>
             </li>
         {{/ freebie}}
         {{/ freebie}}

@@ -73,8 +73,7 @@ class CartModel
 
 
             $cart = $cartData['data'];
             $cart = $cartData['data'];
 
 
-            $cartTypes = array('ordinary', 'advance', 'all');
-            if (!in_array($cartType, $cartTypes)) { // 加价购或者赠品数据
+            if ($onlyGift || $onlyAdvanceBuy) { // 加价购或者赠品数据
                 $result = self::procCartData($cart['ordinary_cart_data'], $onlyGift, $onlyAdvanceBuy);
                 $result = self::procCartData($cart['ordinary_cart_data'], $onlyGift, $onlyAdvanceBuy);
                 break;
                 break;
             }
             }