diff --git a/internal/dao/search/meili.go b/internal/dao/search/meili.go index fc19e358..07c9928d 100644 --- a/internal/dao/search/meili.go +++ b/internal/dao/search/meili.go @@ -103,7 +103,7 @@ func (s *meiliTweetSearchServant) queryByContent(user *core.User, q *core.QueryR request := &meilisearch.SearchRequest{ Offset: int64(offset), Limit: int64(limit), - Sort: []string{"is_top:desc", "latest_replied_on:desc"}, + Sort: []string{"is_top:desc", "-upvote_count", "-collection_count", "latest_replied_on:desc"}, } filter := s.filterList(user) diff --git a/internal/dao/search/zinc.go b/internal/dao/search/zinc.go index ea9a7fa5..c0fc6dab 100644 --- a/internal/dao/search/zinc.go +++ b/internal/dao/search/zinc.go @@ -101,7 +101,7 @@ func (s *zincTweetSearchServant) queryByContent(user *core.User, q *core.QueryRe "content": q.Query, }, }, - "sort": []string{"-is_top", "-latest_replied_on"}, + "sort": []string{"is_top:desc", "-upvote_count", "-collection_count", "-latest_replied_on"}, "from": offset, "size": limit, }) diff --git a/web/public/logo.png b/web/public/logo.png index 7054b5bd..2008eca2 100644 Binary files a/web/public/logo.png and b/web/public/logo.png differ diff --git a/web/src/api/post.ts b/web/src/api/post.ts index 81d8e1a7..a21ba397 100644 --- a/web/src/api/post.ts +++ b/web/src/api/post.ts @@ -242,7 +242,7 @@ export const deleteCommentReply = ( }); }; -/** 置顶/取消置顶话题 */ +/** 置顶/取消置顶专题 */ export const stickTopic = ( data: NetParams.PostStickTopic ): Promise => { @@ -253,7 +253,7 @@ export const stickTopic = ( }); }; -/** 关注话题 */ +/** 关注专题 */ export const followTopic = ( data: NetParams.PostFollowTopic ): Promise => { @@ -264,7 +264,7 @@ export const followTopic = ( }); }; -/** 取消关注话题 */ +/** 取消关注专题 */ export const unfollowTopic = ( data: NetParams.PostUnfollowTopic ): Promise => { diff --git a/web/src/assets/css/main.less b/web/src/assets/css/main.less index 5cde672f..3a0db077 100644 --- a/web/src/assets/css/main.less +++ b/web/src/assets/css/main.less @@ -1,6 +1,6 @@ :root { // 如果要变更中间栏的大小,修改此处即可 - --content-main: 600px; + --content-main: 910px; } .app-container { diff --git a/web/src/components/comment-item.vue b/web/src/components/comment-item.vue index 10c218f4..567f9f2f 100644 --- a/web/src/components/comment-item.vue +++ b/web/src/components/comment-item.vue @@ -140,7 +140,7 @@ const doClickText = (e: MouseEvent, id: number | string) => { if (d.length === 2) { store.commit('refresh'); if (d[0] === 'tag') { - window.$message.warning('评论内的无效话题'); + window.$message.warning('评论内的无效专题'); } else { router.push({ name: 'user', diff --git a/web/src/components/rightbar.vue b/web/src/components/rightbar.vue index b895374f..c03a0eaa 100644 --- a/web/src/components/rightbar.vue +++ b/web/src/components/rightbar.vue @@ -13,7 +13,7 @@ - +
- +
{ href: '/profile', }); options.push({ - label: '短消息', + label: '消息', key: 'messages', icon: () => h(ChatbubblesOutline), href: '/messages', diff --git a/web/src/router/index.ts b/web/src/router/index.ts index 88f1eced..a5e1b3a9 100644 --- a/web/src/router/index.ts +++ b/web/src/router/index.ts @@ -14,7 +14,7 @@ const routes = [ path: '/post', name: 'post', meta: { - title: '话题详情', + title: '专题详情', }, component: () => import('@/views/Post.vue'), }, @@ -22,7 +22,7 @@ const routes = [ path: '/topic', name: 'topic', meta: { - title: '话题', + title: '专题', }, component: () => import('@/views/Topic.vue'), }, @@ -30,7 +30,7 @@ const routes = [ path: '/anouncement', name: 'anouncement', meta: { - title: '公告', + title: '排行榜', }, component: () => import('@/views/Anouncement.vue'), }, @@ -38,7 +38,7 @@ const routes = [ path: '/profile', name: 'profile', meta: { - title: '主页', + title: '我的贴子', }, component: () => import('@/views/Profile.vue'), }, @@ -78,7 +78,7 @@ const routes = [ path: '/wallet', name: 'wallet', meta: { - title: '钱包', + title: '订阅', }, component: () => import('@/views/Wallet.vue'), }, @@ -86,7 +86,7 @@ const routes = [ path: '/setting', name: 'setting', meta: { - title: '设置', + title: '个人中心', }, component: () => import('@/views/Setting.vue'), }, diff --git a/web/src/views/Anouncement.vue b/web/src/views/Anouncement.vue index 22d3acae..4abfb874 100644 --- a/web/src/views/Anouncement.vue +++ b/web/src/views/Anouncement.vue @@ -1,6 +1,6 @@