liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新搜索分页显示的小问题

This commit is contained in:
luchenqun 2017-02-28 23:01:51 +08:00
parent 7290a6b9a7
commit c7dcd73871
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/scripts/controllers/search-controller.js
View File

@ -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);

6
public/views/search.html
View File

@ -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">