From f889ba70aa7599b064a830e7c02997cc02deb681 Mon Sep 17 00:00:00 2001 From: HelloWorld Date: Wed, 8 Apr 2020 11:45:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4=E5=89=8D=E7=AB=AF=E6=9C=AA?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=96=87=E7=AC=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/images/developing.png | Bin 0 -> 10135 bytes www/scripts/controllers/note-controller.js | 15 +++++++++------ .../controllers/weixin-article-controller.js | 4 ++-- www/views/advice.html | 2 +- www/views/bookmark-info.html | 2 +- www/views/bookmarks.html | 6 ++++-- www/views/note.html | 6 +++--- www/views/tags.html | 2 +- www/views/weixin-article.html | 2 +- 9 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 www/images/developing.png diff --git a/www/images/developing.png b/www/images/developing.png new file mode 100644 index 0000000000000000000000000000000000000000..f52ca91369209af1ff04cfc45f9528e8ea10395a GIT binary patch literal 10135 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 200 ? " ......" : ""); + let tag = $scope.tags.find(tag => tag.id == note.tagId); + tag && (note.tagName = tag.name); }) $scope.notes = notes; $scope.totalPages = reply.totalPages; $scope.totalItems = reply.count; - timeagoInstance.cancel(); - timeagoInstance.render(document.querySelectorAll('.need_to_be_rendered'), 'zh_CN'); // 如果需要增加书签 if ($scope.key == 'A') { $scope.key = null; @@ -343,6 +341,11 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind $(".js-note").removeClass("hidden"); } }) + + $timeout(() => { + timeagoInstance.cancel(); + timeagoInstance.render(document.querySelectorAll('.need_to_be_rendered'), 'zh_CN'); + }, 50); } async function updateTags(_tags) { diff --git a/www/scripts/controllers/weixin-article-controller.js b/www/scripts/controllers/weixin-article-controller.js index 4ae112c..5f89a43 100644 --- a/www/scripts/controllers/weixin-article-controller.js +++ b/www/scripts/controllers/weixin-article-controller.js @@ -225,8 +225,8 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$filter', '$win } } b.favCount = bookmark.favCount; - 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.createdAt = $filter('date')(new Date(bookmark.createtime < bookmark.updatetime ? bookmark.createtime : bookmark.updatetime), "yyyy-MM-dd HH:mm:ss"); + b.lastClick = $filter('date')(new Date(bookmark.createtime > bookmark.updatetime ? bookmark.createtime : bookmark.updatetime), "yyyy-MM-dd HH:mm:ss"); b.id = bookmark.articleId; b.index = $scope.bookmarks.length - 1; $scope.bookmarks.push(b); diff --git a/www/views/advice.html b/www/views/advice.html index d3a0ef6..fc6daf8 100644 --- a/www/views/advice.html +++ b/www/views/advice.html @@ -21,7 +21,7 @@
{{ advice.username }}
- {{ advice.created_at }} + {{ advice.createdAt }}
{{ advice.comment }}
diff --git a/www/views/bookmark-info.html b/www/views/bookmark-info.html index 5d28c51..4a5c915 100644 --- a/www/views/bookmark-info.html +++ b/www/views/bookmark-info.html @@ -18,7 +18,7 @@
创建日期： - {{bookmark.created_at}} + {{bookmark.createdAt}}
最后点击： diff --git a/www/views/bookmarks.html b/www/views/bookmarks.html index cdba54e..48a3ff2 100644 --- a/www/views/bookmarks.html +++ b/www/views/bookmarks.html @@ -1,3 +1,5 @@ -
- 正在开发中... +
+ +
正在开发中...
+
diff --git a/www/views/note.html b/www/views/note.html index 9a15d10..73c5dfc 100644 --- a/www/views/note.html +++ b/www/views/note.html @@ -37,16 +37,16 @@
-
{{ note.tagName || "未分类" }}
+
{{ note.tagName || "未分类" }}
- + 添加 diff --git a/www/views/tags.html b/www/views/tags.html index 59a8ca4..5db0370 100644 --- a/www/views/tags.html +++ b/www/views/tags.html @@ -78,7 +78,7 @@ {{ bookmark.click_count }} - + diff --git a/www/views/weixin-article.html b/www/views/weixin-article.html index 085d85b..65b8f07 100644 --- a/www/views/weixin-article.html +++ b/www/views/weixin-article.html @@ -42,7 +42,7 @@    {{bookmark.account}}        - {{bookmark.created_at}} + {{bookmark.createdAt}}