Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

@@ -238,7 +238,7 @@ class HomeController extends AbstractAction
 
 
         $uid = $this->getUid();
         $uid = $this->getUid();
         $coupons = array(
         $coupons = array(
-            'couponsUrl' => UserModel::getCouponData($uid),
+            'couponsUrl' => UserModel::getCouponData($uid, 1),
             'couponsPage' => true
             'couponsPage' => true
         );
         );
         $coupons['pageFooter'] = true;
         $coupons['pageFooter'] = true;

@@ -304,14 +304,15 @@ class UserModel
 	 * 处理优惠券数据
 	 * 处理优惠券数据
 	 *
 	 *
 	 * @param int $uid 用户ID
 	 * @param int $uid 用户ID
+	 * @param int $page 第几页
 	 * @return array|mixed 处理之后的优惠券数据
 	 * @return array|mixed 处理之后的优惠券数据
 	 */
 	 */
-	public static function getCouponData($uid)
+	public static function getCouponData($uid, $page)
 	{
 	{
 		$result = array();
 		$result = array();
 
 
 		// 调用接口获取优惠券数据
 		// 调用接口获取优惠券数据
-		$coupons = UserData::couponData($uid);
+		$coupons = UserData::couponData($uid, $page);
 
 
 		// 处理优惠券数据
 		// 处理优惠券数据
 		if (!empty($coupons['unused'])) {
 		if (!empty($coupons['unused'])) {