From e9df59b56009a868cd1dec0fc8bd8d20955d01f8 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Wed, 22 Feb 2017 20:48:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=90=9C=E7=B4=A2=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E4=B8=AAload=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/search-controller.js | 10 ++++++++--
 public/scripts/controllers/tags-controller.js   |  5 +++++
 public/views/search.html                        |  6 ++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js
index 911038f..51e4a18 100644
--- a/public/scripts/controllers/search-controller.js
+++ b/public/scripts/controllers/search-controller.js
@@ -17,6 +17,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
     $scope.totalPages = 0;
     $scope.currentPage = 1;
     $scope.inputPage = '';
+    $scope.loading = false;
     $scope.changeCurrentPage = function(currentPage) {
         currentPage = parseInt(currentPage) || 0;
         console.log(currentPage);
@@ -152,18 +153,23 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
     }
 
     function searchBookmarks(params) {
+        $scope.loading = true;
         bookmarkService.searchBookmarks(params)
             .then((data) => {
                 $scope.bookmarks = data.bookmarks;
                 $scope.bookmarkCount = data.totalItems;
                 $scope.totalPages = Math.ceil($scope.bookmarkCount / perPageItems);
-                toastr.success('搜索书签成功，共为您找到相关书签约 ' + $scope.bookmarkCount + ' 个', "提示");
+                $scope.loading = false;
+
                 // 有点问题，暂时留在这里
                 // pubSubService.publish('Common.menuActive', {
                 //     login: true,
                 //     index: 0
                 // });
             })
-            .catch((err) => console.log('getBookmarks err', err));
+            .catch((err) => {
+                console.log('getBookmarks err', err);
+                $scope.loading = false;
+            });
     }
 }]);
diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js
index 05d4f21..026fba6 100644
--- a/public/scripts/controllers/tags-controller.js
+++ b/public/scripts/controllers/tags-controller.js
@@ -45,6 +45,11 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', 'book
 
                 $scope.inputPage = '';
                 $scope.loadBookmarks = false;
+
+                pubSubService.publish('Common.menuActive', {
+                    login: true,
+                    index: 1
+                });
             })
             .catch((err) => {
                 console.log('getTags err', err);
diff --git a/public/views/search.html b/public/views/search.html
index 1157175..119ddf2 100644
--- a/public/views/search.html
+++ b/public/views/search.html
@@ -1,4 +1,6 @@
-<div class="ui grid" style="height:45px">
+<div class="ui huge text centered inline loader" ng-class="{active:loading, disabled: !loading}">
+    加载中，请稍候...</div>
+<div class="ui grid" style="height:45px" ng-show="!loading">
     <div class="fourteen wide column" ng-show="!showSearch">
         共为您找到相关书签约{{bookmarkCount}}个
     </div>
@@ -113,7 +115,7 @@
         </div>
     </div>
 </div>
-<table class="ui celled table">
+<table class="ui celled table" ng-show="!loading">
     <thead>
         <tr>
             <th>标题</th>