更新排序和页面

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)

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,
 	})

web/src/api/post.ts

@@ -242,7 +242,7 @@ export const deleteCommentReply = (
   });
 };
 
-/** 置顶/取消置顶话题 */
+/** 置顶/取消置顶专题 */
 export const stickTopic = (
   data: NetParams.PostStickTopic
 ): Promise<NetReq.PostStickTopic> => {
@@ -253,7 +253,7 @@ export const stickTopic = (
   });
 };
 
-/** 关注话题 */
+/** 关注专题 */
 export const followTopic = (
   data: NetParams.PostFollowTopic
 ): Promise<NetReq.PostFollowTopic> => {
@@ -264,7 +264,7 @@ export const followTopic = (
   });
 };
 
-/** 取消关注话题 */
+/** 取消关注专题 */
 export const unfollowTopic = (
   data: NetParams.PostUnfollowTopic
 ): Promise<NetReq.PostUnfollowTopic> => {

web/src/assets/css/main.less

@@ -1,6 +1,6 @@
 :root {
     // 如果要变更中间栏的大小，修改此处即可
-    --content-main: 600px;
+    --content-main: 910px;
 }
 
 .app-container {

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',

web/src/components/rightbar.vue

@@ -13,7 +13,7 @@
                 </template>
             </n-input>
         </div>
-        <n-card v-if="showFollowTopics" class="hottopic-wrap" title="关注话题" embedded :bordered="false" size="small">
+        <n-card v-if="showFollowTopics" class="hottopic-wrap" title="关注专题" embedded :bordered="false" size="small">
             <n-spin :show="loading">
                 <div class="hot-tag-item" v-for="tag in followTags" :key="tag.id">
                     <router-link
@@ -35,7 +35,7 @@
                 </div>
             </n-spin>
         </n-card>
-        <n-card class="hottopic-wrap" title="热门话题" embedded :bordered="false" size="small">
+        <n-card class="hottopic-wrap" title="热门专题" embedded :bordered="false" size="small">
             <n-spin :show="loading">
                 <div class="hot-tag-item" v-for="tag in hotTags" :key="tag.id">
                     <router-link

web/src/components/sidebar.vue

@@ -156,7 +156,7 @@ const menuOptions = computed(() => {
         href: '/profile',
     });
     options.push({
-        label: '短消息',
+        label: '消息',
         key: 'messages',
         icon: () => h(ChatbubblesOutline),
         href: '/messages',

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'),
     },

web/src/views/Anouncement.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <main-nav title="公告" />
+        <main-nav title="排行榜" />
 
         <n-list class="main-content-wrap" bordered>
 

web/src/views/Home.vue

@@ -55,7 +55,7 @@ const page = ref(+(route.query.p as string) || 1);
 const pageSize = ref(20);
 const totalPage = ref(0);
 const title = computed(() => {
-    let t = 'Aimo Community';
+    let t = 'Aimo社区';
 
     if (route.query && route.query.q) {
         if (route.query.t && route.query.t === 'tag') {

web/src/views/Profile.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <main-nav title="主页" />
+        <main-nav title="我的贴子" />
 
         <n-list
             class="main-content-wrap profile-wrap"

web/src/views/Setting.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <main-nav title="设置" theme />
+        <main-nav title="个人中心" theme />
         <n-card title="基本信息" size="small" class="setting-card">
             <div class="base-line avatar">
                 <n-avatar

web/src/views/Topic.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <main-nav title="话题" />
+        <main-nav title="专题" />
 
         <n-list class="main-content-wrap tags-wrap" bordered>
             <n-tabs type="line" animated @update:value="changeTab">

web/src/views/Wallet.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <main-nav title="钱包" />
+        <main-nav title="订阅" />
 
         <n-list class="main-content-wrap" bordered>
             <div class="balance-wrap">