Merge remote-tracking branch 'origin/develop'

@@ -80,9 +80,6 @@ function loadData($parent, url, page) {
             page: page
             page: page
         },
         },
         success: function(data) {
         success: function(data) {
-
-            //setTimeout(function() { //模拟延时
-
             if (url === 'favBrand') {
             if (url === 'favBrand') {
                 $brandLoadMore.addClass('hide');
                 $brandLoadMore.addClass('hide');
             } else {
             } else {
@@ -95,7 +92,6 @@ function loadData($parent, url, page) {
             } else if (data === 'end') {
             } else if (data === 'end') {
                 $parent.closest('.fav-type').find('.fav-load-background')
                 $parent.closest('.fav-type').find('.fav-load-background')
                     .removeClass('fav-load-background').html('没有更多了');
                     .removeClass('fav-load-background').html('没有更多了');
-
             } else if (data.length > 10) {
             } else if (data.length > 10) {
                 $parent.append(data);
                 $parent.append(data);
                 $parent.closest('.fav-type').find('.fav-content-loading').remove();
                 $parent.closest('.fav-type').find('.fav-content-loading').remove();
@@ -106,14 +102,8 @@ function loadData($parent, url, page) {
                 } else {
                 } else {
                     lockId = false;//请求成功后解锁商品收藏page++
                     lockId = false;//请求成功后解锁商品收藏page++
                 }
                 }
-
-                window.rePosFooter();
-
-            } else {
-                return;
             }
             }
-
-            //},1000);
+            window.rePosFooter();
         }
         }
     });
     });
 }
 }