From f049bb2b39d514566823aa1adc28650e0cc25e1c Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Thu, 20 Oct 2016 23:25:28 +0800
Subject: [PATCH] =?UTF-8?q?http=20get=20=E8=8E=B7=E5=8F=96=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/bookmarks-controller.js | 3 ++-
 public/scripts/controllers/menu-controller.js      | 7 +++++++
 public/scripts/services/bookmark-services.js       | 4 ++--
 routes/api.js                                      | 4 +++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js
index 07cfad9..eaeb430 100644
--- a/public/scripts/controllers/bookmarks-controller.js
+++ b/public/scripts/controllers/bookmarks-controller.js
@@ -2,7 +2,8 @@ app.controller('bookmarksCtr', ['$scope', '$filter', 'bookmarkService', function
     $scope.bookmarks = [];  // 书签数据
 
     // 获取书签数据
-    bookmarkService.getBookmarks().then(
+    var pageId = 1;
+    bookmarkService.getBookmarks(pageId).then(
         function(data) {
             console.log(data);
             $scope.bookmarks = data;
diff --git a/public/scripts/controllers/menu-controller.js b/public/scripts/controllers/menu-controller.js
index 7cb92d8..8b65049 100644
--- a/public/scripts/controllers/menu-controller.js
+++ b/public/scripts/controllers/menu-controller.js
@@ -3,6 +3,13 @@ app.controller('menuCtr', ['$scope', '$state', function($scope, $state) {
     $scope.selectLoginIndex = 0;        /**< 默认登陆之后的选择的菜单索引，下表从 0 开始 */
     $scope.selectNotLoginIndex = 0;     /**< 默认未登陆之后的选择的菜单索引，下表从 0 开始 */
 
+    /**
+    * @todo http://stackoverflow.com/questions/31449948/ui-router-state-go-not-working
+    */
+    if($scope.login){
+        setTimeout(()=>{ $state.go('bookmarks') }, 0);
+    }
+
     // 登陆之后显示的菜单数据。uiSerf：内部跳转链接。
     $scope.loginMenus = [
         {uiSref:'bookmarks', title:'我的书签'},
diff --git a/public/scripts/services/bookmark-services.js b/public/scripts/services/bookmark-services.js
index 787fa5c..1300ad8 100644
--- a/public/scripts/services/bookmark-services.js
+++ b/public/scripts/services/bookmark-services.js
@@ -11,10 +11,10 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
     };
 
     // Return a promise object.
-    function getBookmarks() {
+    function getBookmarks(pageId) {
         var def = $q.defer();
 
-        $http.get('/api/bookmarks')
+        $http.get('/api/bookmarks/'+pageId)
             .success(function(data) {
                 def.resolve(data);
             })
diff --git a/routes/api.js b/routes/api.js
index e849d40..b5620a4 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -1,7 +1,9 @@
 
 var api = require('express').Router();
 
-api.get('/bookmarks', function (req, res) {
+api.get('/bookmarks/:pageId', function (req, res) {
+	console.log('hello query', JSON.stringify(req.params.pageId));
+
 	var data = [
 		{title:'谷歌', description:'一个网站', url:'https://www.google.com.hk/', tags:['搜索','常用']},
 		{title:'百度', description:'二个网站', url:'https://www.baidu.com/', tags:['搜索','常用']},