From 6043d064b1b37437f98298b266fdaa5304d56ebb Mon Sep 17 00:00:00 2001 From: luchenqun Date: Sun, 19 Mar 2017 19:29:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9A=84=E4=B9=A6=E7=AD=BE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9B=B4=E6=96=B0=E4=B8=80=E4=B8=8B=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/scripts/controllers/hot-controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/scripts/controllers/hot-controller.js b/public/scripts/controllers/hot-controller.js index f7913bd..1740f27 100644 --- a/public/scripts/controllers/hot-controller.js +++ b/public/scripts/controllers/hot-controller.js @@ -192,8 +192,8 @@ app.controller('hotCtr', ['$scope', '$state', '$stateParams', '$filter', '$windo } } b.fav_count = bookmark.favCount; - b.created_at = $filter('date')(new Date(bookmark.updatetime), "yyyy-MM-dd HH:mm:ss"); - b.last_click = $filter('date')(new Date(bookmark.createtime), "yyyy-MM-dd HH:mm:ss"); + b.created_at = $filter('date')(new Date(bookmark.createtime < bookmark.updatetime ? bookmark.createtime : bookmark.updatetime), "yyyy-MM-dd HH:mm:ss"); + b.last_click = $filter('date')(new Date(bookmark.createtime > bookmark.updatetime ? bookmark.createtime : bookmark.updatetime), "yyyy-MM-dd HH:mm:ss"); b.id = bookmark.id; b.edit = false;