From 2494378ab6856c8f7fc7026f5f826a9c57a821c1 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Mon, 6 Mar 2017 17:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0=E4=B9=A6?=
 =?UTF-8?q?=E7=AD=BE=E6=82=84=E6=82=84=E6=9B=B4=E6=96=B0=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=81=9A=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js
index 0032b64..0cb8554 100644
--- a/public/scripts/controllers/bookmarks-controller.js
+++ b/public/scripts/controllers/bookmarks-controller.js
@@ -169,6 +169,7 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
         var menusScope = $('div[ng-controller="menuCtr"]').scope();
         if (menusScope.login && menusScope.selectLoginIndex == 0) {
             params.showStyle = $scope.showStyle;
+            params.forbidTransition = true;
             if ($scope.showStyle == 'card') {
                 $scope.currentPage = 1;
                 $scope.bookmarks = [];
@@ -210,8 +211,9 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
                     login: true,
                     index: 0
                 });
-
-                transition();
+                if (!(params.forbidTransition && params.forbidTransition == true)) {
+                    transition();
+                }
             })
             .catch((err) => console.log('getBookmarks err', err));
     }