diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js index 95512e4..edc6f7b 100644 --- a/public/scripts/controllers/bookmarks-controller.js +++ b/public/scripts/controllers/bookmarks-controller.js @@ -39,7 +39,6 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', ' currentPage = parseInt(currentPage) || 0; console.log('currentPage = ', currentPage); if (currentPage <= $scope.totalPages && currentPage >= 1) { - $scope.loadBusy = true; $scope.currentPage = currentPage; $scope.inputPage = ''; getBookmarks(); @@ -273,8 +272,10 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', ' toastr.error('获取信息失败。错误信息:' + JSON.stringify(err), "错误"); }); } else { + $scope.loadBusy = true; bookmarkService.getBookmarks(params) .then((data) => { + $scope.loadBusy = false; if (params.showStyle != 'navigate') { $scope.bookmarkData = data; $scope.totalPages = Math.ceil(data.totalItems / perPageItems); @@ -289,7 +290,6 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', ' $scope.bookmarks.push(bookmark); } }) - $scope.loadBusy = false; } else if (params.showStyle == 'costomTag') { $scope.costomTags.forEach((tag) => { if (tag.clicked) { @@ -317,7 +317,10 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', ' transition(); } }) - .catch((err) => console.log('getBookmarks err', err)); + .catch((err) => { + console.log('getBookmarks err', err); + $scope.loadBusy = false; + }); } } diff --git a/public/scripts/controllers/hot-controller.js b/public/scripts/controllers/hot-controller.js index 31d4a0c..d12d6c5 100644 --- a/public/scripts/controllers/hot-controller.js +++ b/public/scripts/controllers/hot-controller.js @@ -166,6 +166,7 @@ app.controller('hotCtr', ['$scope', '$state', '$stateParams', '$filter', '$windo data: requireData, success: function(json) { // console.log('success............', json, JSON.stringify(json.data.list[0]) ); + $scope.loadBusy = false; var alterRex = "/mmbiz.qpic.cn|images.jianshu.io|zhimg.com/g"; var defaultSnap = "./images/snap/default.png" var defaultFavicon = "./images/favicon/default.ico" @@ -200,7 +201,6 @@ app.controller('hotCtr', ['$scope', '$state', '$stateParams', '$filter', '$windo $scope.bookmarks.push(b); }) $scope.curDay--; - $scope.loadBusy = false; updateEditPos(); } else { toastr.error('获取热门书签失败!失败原因:' + json.message + "。将尝试从缓存中获取!", "提示"); @@ -209,6 +209,7 @@ app.controller('hotCtr', ['$scope', '$state', '$stateParams', '$filter', '$windo }, 100); }, error: function(json) { + $scope.loadBusy = false; toastr.error('获取热门书签失败!失败原因:' + json.message + "。将尝试从缓存中获取!", "提示"); getHotBookmarksbyCache(); } @@ -216,16 +217,16 @@ app.controller('hotCtr', ['$scope', '$state', '$stateParams', '$filter', '$windo } function getHotBookmarksbyCache() { + $scope.loadBusy = true; var date = curentDate($scope.curDay, "yyyyMMdd"); if (date < "20160715") { - $scope.loadBusy = false; toastr.info('您已将将所有的热门标签都加载完了!', "提示"); + $scope.loadBusy = false; return; // 这是最早的了。 } var params = { date: date, } - $scope.loadBusy = true; bookmarkService.getHotBookmarks(params) .then((data) => { data.forEach((bookmark) => { diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js index 309d7cb..012dbb9 100644 --- a/public/scripts/controllers/menus-controller.js +++ b/public/scripts/controllers/menus-controller.js @@ -63,6 +63,8 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', 'pubSubService', $('.js-radio-' + showStyle).checkbox('set checked'); $state.go('bookmarks', { showStyle: showStyle, + }, { + reload: true, }) } diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html index c12d842..0d858da 100644 --- a/public/views/bookmarks.html +++ b/public/views/bookmarks.html @@ -10,7 +10,7 @@ -
+
@@ -47,7 +47,7 @@
-
+
@@ -78,7 +78,7 @@
- +
@@ -128,7 +128,7 @@
标题
-
+
@@ -159,6 +159,6 @@
-
- 正在加载中...
+
+ 正在加载中...
diff --git a/public/views/hot.html b/public/views/hot.html index 9247c82..728614e 100644 --- a/public/views/hot.html +++ b/public/views/hot.html @@ -1,5 +1,5 @@ -
+
@@ -27,6 +27,6 @@
-
- 正在加载中...
+
+ 正在加载中...