Merge branch 'feature/cart' into develop

@@ -113,6 +113,47 @@ class ShoppingCartController extends AbstractAction
 	}
 	}
 
 
 	/*
 	/*
+	 * 赠品页面
+	 */
+	public function giftAction()
+	{
+		$this->setTitle('赠品');
+		$this->setNavHeader('赠品');
+
+		$shoppingKey = Helpers::getShoppingKeyByCookie();
+		$uid = $this->getUid(true);
+
+		$data = array(
+			'shoppingCartPage' => true,
+			'shoppingCart' => CartModel::getCartData($uid, $shoppingKey, true)
+		);
+
+		// 渲染模板
+		$this->_view->display('gift-advance-good', $data);
+	}
+
+	/*
+	 * 加价购页面
+	 */
+	public function advanceBuyAction()
+	{
+		$this->setTitle('加价购');
+		$this->setNavHeader('加价购');
+
+		$shoppingKey = Helpers::getShoppingKeyByCookie();
+		$uid = $this->getUid(true);
+
+		$data = array(
+			'shoppingCartPage' => true,
+			'shoppingCart' => CartModel::getCartData($uid, $shoppingKey, false, true)
+		);
+		print_r($data);
+
+		// 渲染模板
+		$this->_view->display('gift-advance-good', $data);
+	}
+
+	/*
 	 * 获取购物车商品数据
 	 * 获取购物车商品数据
 	 */
 	 */
 	public function goodinfoAction()
 	public function goodinfoAction()