{{ bookmark.description }}
diff --git a/database/db.js b/database/db.js index ab0d28e..683c417 100644 --- a/database/db.js +++ b/database/db.js @@ -421,7 +421,13 @@ db.getBookmarksTable = function(params) { params.currentPage = params.currentPage || 1; params.perPageItems = params.perPageItems || 20; - var sql = "SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d') as created_at, DATE_FORMAT(last_click, '%Y-%m-%d') as last_click FROM `bookmarks` WHERE 1=1"; + var sql = "SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, "; + if (params.showStyle == 'card') { + sql += "'%Y-%m-%d %H:%i:%s'"; + } else { + sql += "'%Y-%m-%d'"; + } + sql += ") as created_at, DATE_FORMAT(last_click, '%Y-%m-%d') as last_click FROM `bookmarks` WHERE 1=1"; if (user_id) { sql += " AND `user_id` = '" + user_id + "'"; if (params.showStyle == 'card') { diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js index d4880a9..8e5b7e8 100644 --- a/public/scripts/controllers/bookmarks-controller.js +++ b/public/scripts/controllers/bookmarks-controller.js @@ -75,6 +75,9 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', ' id: bookmark.tag_id, name: bookmark.tag_name }]; + } else if ($scope.showStyle == 'card') { + bookmark.last_click = bookmark.last_click.substring(0, 10); + bookmark.created_at = bookmark.created_at.substring(0, 10); } pubSubService.publish('TagCtr.showBookmarkInfo', bookmark); bookmarkService.clickBookmark({ diff --git a/public/views/bookmark-info.html b/public/views/bookmark-info.html index 2ab8697..1ec766d 100644 --- a/public/views/bookmark-info.html +++ b/public/views/bookmark-info.html @@ -21,7 +21,7 @@ 创建日期:{{bookmark.created_at}}
{{ bookmark.description }}
|
- |