Merge branch 'develop' into test

@@ -210,7 +210,7 @@ class UserModel
 		$result = array();
 
 		// 调用接口获取户收藏的品牌数据
-		$favBrand = UserData::favoriteBrandData($uid, $gender);
+		$favBrand = UserData::favoriteBrandData($uid, $gender, $page, $limit);
 
 		// 处理用户收藏的品牌数据
 		if (isset($favBrand['data']) && !empty($favBrand['data']['brand_list'])) {
@@ -247,6 +247,8 @@ class UserModel
 			}
 
             !empty($datas) && $result['hasFavBrand'] = $datas;
+		} else if ($page > 1 && isset($favBrand['code']) && $favBrand['code'] === 500) {
+			$result['end'] = true;
 		}
 
 		return $result;