Merge branch 'feature/wap325' of http://git.dev.yoho.cn/web/yohobuy into feature/wap325

-<div class="shopping-cart-good clearfix" data-id="{{id}}">
+<div class="shopping-cart-good clearfix" data-id="{{id}}" data-skn="{{skn}}">
     {{#if inValid}}
         <span class="few-tag-expire">失效</span>
     {{/if}}

@@ -224,8 +224,7 @@ class CartModel
 
         $product = CartData::cartProductData($uid, $skn);
         if (isset($product['code']) && $product['code'] === 200) {
-            $result['code'] = 200;
-            $result['data'] = self::procGoodsDetail($product['data'], $num);
+            $result = self::procGoodsDetail($product['data'], $num);
         }
 
         return $result;
@@ -244,7 +243,7 @@ class CartModel
 
         $product = CartData::giftProductData($skn, $promotionId);
         if (isset($product['code']) && $product['code'] === 200) {
-            $result['data'] = self::procGoodsDetail($product['data']);
+            $result = self::procGoodsDetail($product['data']);
         }
 
         return $result;

@@ -195,7 +195,9 @@ class IndexController extends AbstractAction
             $result['num'] = $num;
         }
 
-        $this->echoJson($result);
+        $this->_view->display('gift-info', array(
+            'cartInfo' => $result
+        ));
     }
 
 //    /*
@@ -223,7 +225,7 @@ class IndexController extends AbstractAction
 
         $this->_view->display('gift-info', array(
             'promotionId' => $promotionId,
-            'cartInfo' => $result['data']
+            'cartInfo' => $result
         ));
     }