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

Conflicts:
	yohobuy/m.yohobuy.com/application/models/Index/User.php

@@ -253,7 +253,7 @@ class UserModel
         // 处理用户收藏的品牌数据
         do {
             // 开始就没获取到数据或者获取的数据为空时的处理
-            if ((!$favBrand || isset($favProduct['data']['total']) && empty($favProduct['data']['total'])) && $page == 1) {
+            if ((!$favBrand || isset($favBrand['data']['total']) && empty($favBrand['data']['total'])) && $page == 1) {
                 break;
             }