From c7dcd73871a164456d6bce332b1529a1d194f7db Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Tue, 28 Feb 2017 23:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=90=9C=E7=B4=A2=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=98=BE=E7=A4=BA=E7=9A=84=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/search-controller.js | 8 +++++---
 public/views/search.html                        | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js
index 21dc004..1ce1634 100644
--- a/public/scripts/controllers/search-controller.js
+++ b/public/scripts/controllers/search-controller.js
@@ -98,7 +98,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
         pubSubService.publish('TagCtr.showBookmarkInfo', bookmark);
     }
 
-    $scope.search = function() {
+    $scope.search = function(page) {
         var params = {}
         params.userRange = $('.js-user-range').dropdown('get value');
         if (params.userRange == '1') {
@@ -132,10 +132,12 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
             params.dateClickBegin = $scope.dateClickBegin;
             params.dateClickEnd = $scope.dateClickEnd;
         }
-        params.currentPage = $scope.currentPage;
+        params.currentPage = page ? page : $scope.currentPage;
         params.perPageItems = perPageItems;
+
+        $scope.currentPage = params.currentPage;
         searchBookmarks(params)
-        console.log('search..', params)
+        console.log('search..', page, 'params = ', params)
     }
     $scope.updateCreateDate = function() {
         console.log($scope.dateCreateBegin, $scope.dateCreateEnd);
diff --git a/public/views/search.html b/public/views/search.html
index d1c27d8..c3f053c 100644
--- a/public/views/search.html
+++ b/public/views/search.html
@@ -86,7 +86,7 @@
     </div>
     <div class="two wide column" ng-show="showSearch">
         <div class="ui transparent icon input" ng-show="!showTags">
-            <input class="prompt" type="text" placeholder="用户账号" ng-model="username" ng-keypress="($event.which === 13)?search():0">
+            <input class="prompt" type="text" placeholder="用户账号" ng-model="username" ng-keypress="($event.which === 13)?search(1):0">
         </div>
         <div class="ui grid container" style="padding-top: 8px;">
             <div class="ui multiple dropdown js-search-tags" style="padding:0;" ng-show="showTags" js-dropdown-tags-init>
@@ -100,13 +100,13 @@
     </div>
     <div class="two wide column" ng-show="showSearch">
         <div class="ui transparent input">
-            <input type="text" placeholder="标题，链接..." ng-model="searchWord" ng-keypress="($event.which === 13)?search():0">
+            <input type="text" placeholder="标题，链接..." ng-model="searchWord" ng-keypress="($event.which === 13)?search(1):0">
         </div>
     </div>
     <div class=" left floated right aligned two wide column" ng-show=" showSearch">
         <div class="ui grid">
             <div class="four wide column">
-                <i class="search icon" title="搜索" ng-click="search()"></i>
+                <i class="search icon" title="搜索" ng-click="currentPage=1;search()"></i>
             </div>
             <div class="twelve wide column">
                 <img class="ui ui middle aligned tiny image" ng-src="./images/hide.png" style="width:16px;height:16px" ng-click="showSearch = !showSearch">