From b3a908e0fab68b876a8e2a48dbbb47857ed2c776 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Tue, 21 Mar 2017 16:43:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A6=96=E9=A1=B5table?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=8A=A8=E7=94=BB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/bookmarks-controller.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js
index edc6f7b..54f721a 100644
--- a/public/scripts/controllers/bookmarks-controller.js
+++ b/public/scripts/controllers/bookmarks-controller.js
@@ -273,9 +273,11 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
                 });
         } else {
             $scope.loadBusy = true;
+            if (params.showStyle == 'table') {
+                $('.js-table-bookmarks').transition('hide');
+            }
             bookmarkService.getBookmarks(params)
                 .then((data) => {
-                    $scope.loadBusy = false;
                     if (params.showStyle != 'navigate') {
                         $scope.bookmarkData = data;
                         $scope.totalPages = Math.ceil(data.totalItems / perPageItems);
@@ -308,14 +310,16 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
                             toastr.info('您还没有书签，请点击菜单栏的添加按钮进行添加', "提示");
                         }
                     }
+
                     pubSubService.publish('Common.menuActive', {
                         login: true,
                         index: 0
                     });
-                    if (!($scope.forbidTransition && $scope.forbidTransition == true)) {
+                    if (!$scope.forbidTransition) {
                         $scope.forbidTransition = false;
                         transition();
                     }
+                    $scope.loadBusy = false;
                 })
                 .catch((err) => {
                     console.log('getBookmarks err', err);