From cdc35c22cd99669ccc79a82c98663b06a1c0c727 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Wed, 1 Mar 2017 12:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=80=E4=B8=8B=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/menus-controller.js  |  1 +
 public/scripts/controllers/search-controller.js | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js
index f2e38af..b87205f 100644
--- a/public/scripts/controllers/menus-controller.js
+++ b/public/scripts/controllers/menus-controller.js
@@ -44,6 +44,7 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', 'pubSubService',
         $state.go('search', {
             searchWord: searchWord,
         })
+        $scope.login = true;
         updateMenuActive($scope.selectLoginIndex = 0);
     }
 
diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js
index 1ce1634..e33f9d5 100644
--- a/public/scripts/controllers/search-controller.js
+++ b/public/scripts/controllers/search-controller.js
@@ -36,6 +36,11 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
             $scope.tags = data;
         })
         .catch((err) => console.log('getTags err', err));
+    // 默认登陆
+    pubSubService.publish('Common.menuActive', {
+        login: true,
+        index: 0
+    });
 
     var searchParams = {
         searchWord: $scope.searchWord,
@@ -46,7 +51,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
     if ($scope.searchWord) {
         searchBookmarks(searchParams);
     } else {
-        $state.go('/', {})
+        toastr.warning("请先登录然后再输入关键字进行查询", "提示");
     }
 
     $scope.jumpToUrl = function(url, id) {
@@ -171,12 +176,6 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
                 $scope.bookmarkCount = data.totalItems;
                 $scope.totalPages = Math.ceil($scope.bookmarkCount / perPageItems);
                 $scope.loading = false;
-
-                // 有点问题，暂时留在这里
-                // pubSubService.publish('Common.menuActive', {
-                //     login: true,
-                //     index: 0
-                // });
             })
             .catch((err) => {
                 console.log('getBookmarks err', err);