diff --git a/components/article-card/article-card.vue b/components/article-card/article-card.vue index 837e0f4..15b1897 100644 --- a/components/article-card/article-card.vue +++ b/components/article-card/article-card.vue @@ -16,7 +16,6 @@ {{ { d: article.spec.publishTime, f: 'yyyy-MM-dd' } | formatTime }} - 浏览 {{ article.stats.visit }} 次 diff --git a/pages.json b/pages.json index ecea263..793a4fe 100644 --- a/pages.json +++ b/pages.json @@ -259,6 +259,13 @@ } } } + }, + { + "path" : "test-page/test-page", + "style" : + { + "navigationBarTitleText" : "" + } }] }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index 98906a3..9e8ca58 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -20,6 +20,10 @@ uni.switchTab({ url: '/pages/tabbar/home/home' }); + + // uni.navigateTo({ + // url:'/pagesA/test-page/test-page' + // }) } else { uni.redirectTo({ url: '/pagesA/start/start' diff --git a/pages/tabbar/category/category.vue b/pages/tabbar/category/category.vue index f91f548..4c4420e 100644 --- a/pages/tabbar/category/category.vue +++ b/pages/tabbar/category/category.vue @@ -12,20 +12,19 @@ - - - - - - {{item.spec.displayName}} - 共 - {{item.postCount}} 篇文章 - + + + + + {{item.spec.displayName}} + 共 + {{item.postCount}} 篇文章 - - + + {{ loadMoreText }} @@ -57,7 +56,7 @@ size: 20, page: 1 }, - result: null, + hasNext: false, dataList: [], isLoadMore: false, loadMoreText: '加载中...' @@ -80,7 +79,7 @@ }, onReachBottom(e) { - if (this.result.hasNext) { + if (this.hasNext) { this.queryParams.page += 1; this.isLoadMore = true; this.fnGetData(); @@ -111,7 +110,7 @@ this.loading = 'success'; this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜,没有更多数据啦~'; // 处理数据 - this.result = res; + this.hasNext = res.hasNext; const tempItems = res.items.map(item => { item.spec.cover = this.$utils.checkThumbnailUrl(item.spec.cover, true) @@ -141,6 +140,11 @@ current: index, urls: list.map(item => item.url) }) + }, + handleToCategory(data) { + uni.navigateTo({ + url: `/pagesA/category-detail/category-detail?name=${data.metadata.name}&title=${data.spec.displayName}` + }) } } }; diff --git a/pages/tabbar/gallery/gallery.vue b/pages/tabbar/gallery/gallery.vue index 561227f..750cbb9 100644 --- a/pages/tabbar/gallery/gallery.vue +++ b/pages/tabbar/gallery/gallery.vue @@ -81,7 +81,7 @@ }, isLoadMore: false, loadMoreText: '', - result: {}, + hasNext: false, dataList: [] }; }, @@ -101,7 +101,7 @@ this.fnGetData(); }, onReachBottom(e) { - if (this.result.hasNext) { + if (this.hasNext) { this.queryParams.page += 1; this.isLoadMore = true; this.fnGetData(); @@ -150,7 +150,7 @@ .getPhotoListByGroupName(this.queryParams) .then(res => { console.log("相册 res", res) - this.result = res; + this.hasNext = res.hasNext; this.loading = 'success'; if (res.items.length != 0) { const _list = res.items.map((item, index) => { diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index 81ebce5..be78583 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -20,14 +20,12 @@ - - 精品分类 @@ -64,9 +62,9 @@ label="博主还没有发表任何文章~"> - - + {{ loadMoreText }} @@ -258,19 +256,16 @@ } this.loadMoreText = '加载中...'; - this.$httpApi.v2 .getPostList(this.queryParams) .then(res => { console.log('加载成功', res); - setTimeout(() => { - this.result = res; - if (this.isLoadMore) { - this.articleList = this.articleList.concat(res.items); - } else { - this.articleList = res.items; - } - }, 200) + this.result.hasNext = res.hasNext; + if (this.isLoadMore) { + this.articleList = this.articleList.concat(res.items); + } else { + this.articleList = res.items; + } this.loading = 'success'; this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜,没有更多数据啦~'; }) diff --git a/pages/tabbar/moments/moments.vue b/pages/tabbar/moments/moments.vue index 8bc3635..9b7fd66 100644 --- a/pages/tabbar/moments/moments.vue +++ b/pages/tabbar/moments/moments.vue @@ -79,7 +79,7 @@ size: 10, page: 1 }, - result: null, + hasNext: false, dataList: [], isLoadMore: false, loadMoreText: '加载中...' @@ -102,7 +102,7 @@ }, onReachBottom(e) { - if (this.result.hasNext) { + if (this.hasNext) { this.queryParams.page += 1; this.isLoadMore = true; this.fnGetData(); @@ -131,9 +131,8 @@ console.log(res); this.loading = 'success'; - this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜,没有更多数据啦~'; - // 处理数据 - this.result = res; + this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜,没有更多数据啦~'; + this.hasNext = res.hasNext; const tempItems = res.items.map(item => { item.spec.user = { diff --git a/pages/template.vue b/pages/template.vue index 2b58e2a..310ae76 100644 --- a/pages/template.vue +++ b/pages/template.vue @@ -47,6 +47,7 @@ export default { }, result: null, dataList: [], + hasNext:false, isLoadMore: false, loadMoreText: '加载中...' }; diff --git a/pagesA/articles/articles.vue b/pagesA/articles/articles.vue index c852ef1..36b68dc 100644 --- a/pagesA/articles/articles.vue +++ b/pagesA/articles/articles.vue @@ -29,8 +29,10 @@ - {{article.title}} - {{article.content}} + {{article.title}} + {{article.content}} 发布日期:{{ { d: article.publishTimestamp, f: 'yyyy年MM月dd日' } | formatTime }} @@ -80,16 +82,16 @@ dataList: [], total: 0 }, + hasNext: false, isLoadMore: false, loadMoreText: '加载中...', - result: {}, dataList: [] }; }, onLoad() { this.fnSetPageTitle('文章列表'); }, - created() { + created() { if (!this.queryParams.keyword) { this.loading = 'success' } else { @@ -145,7 +147,7 @@ this.loading = 'success'; this.loadMoreText = res.hasNext ? '上拉加载更多' : '呜呜,没有更多数据啦~'; - this.result = res; + this.hasNext = res.hasNext; if (this.isLoadMore) { this.dataList = this.dataList.concat(res.hits); } else { diff --git a/pagesA/category-detail/category-detail.vue b/pagesA/category-detail/category-detail.vue index 5a59f24..d1207c6 100644 --- a/pagesA/category-detail/category-detail.vue +++ b/pagesA/category-detail/category-detail.vue @@ -7,11 +7,13 @@ - + - + {{ loadMoreText }} @@ -44,7 +46,7 @@ }, name: '', pageTitle: '加载中...', - result: null, + hasNext: false, dataList: [], isLoadMore: false, loadMoreText: '' @@ -62,7 +64,7 @@ this.fnGetData(); }, onReachBottom(e) { - if (this.result.hasNext) { + if (this.hasNext) { this.queryParams.page += 1; this.isLoadMore = true; this.fnGetData(); @@ -87,9 +89,9 @@ this.$httpApi .getCategoryPostList(this.name, this.queryParams) .then(res => { - console.log("请求成功:",res) + console.log("请求成功:", res) this.fnSetPageTitle(`${this.pageTitle} (共${res.total}篇)`); - this.result = res; + this.hasNext = res.hasNext; if (this.isLoadMore) { this.dataList = this.dataList.concat(res.items); } else { diff --git a/pagesA/comment/comment.vue b/pagesA/comment/comment.vue index 95e32ce..9dd66c9 100644 --- a/pagesA/comment/comment.vue +++ b/pagesA/comment/comment.vue @@ -127,7 +127,7 @@ } this.$httpApi.v2.addPostComment(commentForm) .then(res => { - uni.$tm.toast('日志:提交成功!'); + uni.$tm.toast('提交成功!'); // 更新评论者信息 this.handleSetVisitor(); setTimeout(() => { @@ -135,7 +135,7 @@ }, 1500) }) .catch(err => { - uni.$tm.toast("提示:评论失败"); + uni.$tm.toast("评论失败"); }); return; } @@ -155,7 +155,7 @@ } this.$httpApi.v2.addPostCommentReply(this.form.postName, replyForm) .then(res => { - uni.$tm.toast('提示:提交成功!'); + uni.$tm.toast('提交成功!'); // 更新评论者信息 this.handleSetVisitor(); setTimeout(() => { @@ -163,7 +163,7 @@ }, 1500) }) .catch(err => { - uni.$tm.toast("提示:回复失败"); + uni.$tm.toast("回复失败"); }); } } diff --git a/pagesA/friend-links/friend-links.vue b/pagesA/friend-links/friend-links.vue index bf54cd6..55766cd 100644 --- a/pagesA/friend-links/friend-links.vue +++ b/pagesA/friend-links/friend-links.vue @@ -191,11 +191,11 @@ size: 10, page: 1 }, - result: {}, detail: { show: false, data: {} }, + hasNext:false, isLoadMore: false, loadMoreText: '', dataList: [], @@ -225,7 +225,7 @@ this.fnGetData(); }, onReachBottom(e) { - if (this.result.hasNext) { + if (this.hasNext) { this.queryParams.page += 1; this.isLoadMore = true; this.fnGetData(); @@ -252,7 +252,7 @@ .then(res => { console.log('请求结果:'); console.log(res); - this.result = res; + this.hasNext = res.hasNext; const list = res.items.map(item => { item.spec.logo = this.$utils.checkAvatarUrl(item.spec.logo) return item; diff --git a/pagesA/journal/journal.vue b/pagesA/journal/journal.vue index 03bd7a7..68d2ef1 100644 --- a/pagesA/journal/journal.vue +++ b/pagesA/journal/journal.vue @@ -46,8 +46,9 @@ size: 10, page: 0 }, - result: null, + dataList: [], + hasNext:false, isLoadMore: false, loadMoreText: '加载中...' }; @@ -65,7 +66,7 @@ this.fnGetData(); }, onReachBottom(e) { - if (this.result.hasNext) { + if (this.hasNext) { this.queryParams.page += 1; this.isLoadMore = true; this.fnGetData(); diff --git a/pagesA/tag-detail/tag-detail.vue b/pagesA/tag-detail/tag-detail.vue index efa315a..f0f96ea 100644 --- a/pagesA/tag-detail/tag-detail.vue +++ b/pagesA/tag-detail/tag-detail.vue @@ -47,8 +47,9 @@ }, name: '', pageTitle: '加载中...', - result: null, + dataList: [], + hasNext:false, isLoadMore: false, loadMoreText: '' }; @@ -66,7 +67,7 @@ this.fnGetData(); }, onReachBottom(e) { - if (this.result && this.result.hasNext) { + if (this.hasNext) { this.queryParams.page += 1; this.isLoadMore = true; this.fnGetData(); @@ -92,7 +93,7 @@ .getPostByTagName(this.name, this.queryParams) .then(res => { this.fnSetPageTitle(`${this.pageTitle} (共${res.total}篇)`); - this.result = res; + this.hasNext = res.hasNext; if (this.isLoadMore) { this.dataList = this.dataList.concat(res.items); } else { diff --git a/pagesA/test-page/test-page.vue b/pagesA/test-page/test-page.vue new file mode 100644 index 0000000..30c07fc --- /dev/null +++ b/pagesA/test-page/test-page.vue @@ -0,0 +1,289 @@ + + + + + \ No newline at end of file diff --git a/pagesB/articles/articles.vue b/pagesB/articles/articles.vue index d11ddb2..a9084f7 100644 --- a/pagesB/articles/articles.vue +++ b/pagesB/articles/articles.vue @@ -153,7 +153,7 @@ }, isLoadMore: false, loadMoreText: '加载中...', - result: {}, + hasNext:false, dataList: [], category: { loading: 'loading', @@ -182,7 +182,7 @@ }, onReachBottom(e) { - if (this.result.hasNext) { + if (this.hasNext) { this.queryParams.page += 1; this.isLoadMore = true; this.fnGetData();