From 215f0c650052088891c67a5fb085534f01124f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Mon, 31 Mar 2025 11:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/app/t-postcard.vue           |  4 +--
 src/components/viewPost/vp-overlay-user.vue |  2 +-
 src/pages/common/PostCollect.vue            | 29 ++++++++++++++++++---
 src/pages/common/PostForum.vue              |  3 ++-
 src/pages/common/PostTopic.vue              |  3 ++-
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/components/app/t-postcard.vue b/src/components/app/t-postcard.vue
index 463a2649..9b1136b8 100644
--- a/src/components/app/t-postcard.vue
+++ b/src/components/app/t-postcard.vue
@@ -114,7 +114,7 @@ type TPostCardProps = {
 };
 type TPostCardEmits = {
   (e: "onSelected", v: string): void;
-  (e: "onUserClick", v: TGApp.BBS.Post.User): void;
+  (e: "onUserClick", u: TGApp.BBS.Post.User, g: number): void;
 };
 type RenderForum = { name: string; icon: string; id: number };
 type RenderStatus = { stat: number; label: string; color: string };
@@ -271,7 +271,7 @@ async function toForum(forum: RenderForum): Promise<void> {
 function onUserClick(): void {
   if (props.selectMode) return;
   if (!card.value || card.value.user === null) return;
-  emits("onUserClick", card.value.user);
+  emits("onUserClick", card.value.user, props.modelValue.post.game_id);
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/components/viewPost/vp-overlay-user.vue b/src/components/viewPost/vp-overlay-user.vue
index 943b56c1..d11ad168 100644
--- a/src/components/viewPost/vp-overlay-user.vue
+++ b/src/components/viewPost/vp-overlay-user.vue
@@ -108,7 +108,7 @@ async function loadPosts(): Promise<void> {
     load.value = false;
     return;
   }
-  const resp = await postReq.user.post(props.uid, props.gid, offset.value);
+  const resp = await postReq.user.post(props.uid, 0, offset.value);
   if ("retcode" in resp) {
     showSnackbar.warn(`[${resp.retcode}] ${resp.message}`);
     load.value = false;
diff --git a/src/pages/common/PostCollect.vue b/src/pages/common/PostCollect.vue
index 878a7ee4..8fde548d 100644
--- a/src/pages/common/PostCollect.vue
+++ b/src/pages/common/PostCollect.vue
@@ -90,10 +90,17 @@
   </v-app-bar>
   <div class="pc-posts">
     <div v-for="item in curPosts" :key="item.post.post_id">
-      <TPostCard @onSelected="handleSelected" :model-value="item" :select-mode="selectedMode" />
+      <TPostCard
+        @onSelected="handleSelected"
+        :model-value="item"
+        :select-mode="selectedMode"
+        :user-click="true"
+        @onUserClick="handleUserClick"
+      />
     </div>
   </div>
-  <ToCollectPost @submit="load" :post="selectedPost" v-model="showOverlay" />
+  <ToCollectPost @submit="load" :post="selectedPost" v-model="showCollect" />
+  <VpOverlayUser v-model="showUser" :gid="curGid" :uid="curUid" />
 </template>
 <script lang="ts" setup>
 import TPostCard from "@comp/app/t-postcard.vue";
@@ -101,6 +108,7 @@ import showDialog from "@comp/func/dialog.js";
 import showLoading from "@comp/func/loading.js";
 import showSnackbar from "@comp/func/snackbar.js";
 import ToCollectPost from "@comp/pageCollect/to-collectPost.vue";
+import VpOverlayUser from "@comp/viewPost/vp-overlay-user.vue";
 import TSUserCollection from "@Sqlite/modules/userCollect.js";
 import { event } from "@tauri-apps/api";
 import type { UnlistenFn } from "@tauri-apps/api/event";
@@ -116,12 +124,17 @@ let collectListener: UnlistenFn | null = null;
 
 const curSelect = ref<string>("未分类");
 const page = ref<number>(1);
+const curUid = ref<string>("");
+const curGid = ref<number>(2);
 const selectedMode = ref<boolean>(false);
-const showOverlay = ref<boolean>(false);
+const showUser = ref<boolean>(false);
+const showCollect = ref<boolean>(false);
 const sortId = ref<boolean>(false);
+
 const selectedPost = shallowRef<Array<string>>([]);
 const collections = shallowRef<Array<TGApp.Sqlite.UserCollection.UFCollection>>([]);
 const selected = shallowRef<Array<TGApp.Sqlite.UserCollection.UFPost>>([]);
+
 const length = computed<number>(() => Math.ceil(selected.value.length / 12));
 const view = computed<number>(() => (length.value === 1 ? 1 : length.value > 5 ? 5 : length.value));
 const curPosts = computed<Array<TGApp.BBS.Post.FullData>>(() =>
@@ -178,10 +191,11 @@ async function load(): Promise<void> {
 }
 
 function toSelect(): void {
+  if (showUser.value) showUser.value = false;
   if (selectedMode.value) {
     selectedMode.value = false;
     if (selectedPost.value.length === 0) return;
-    showOverlay.value = true;
+    showCollect.value = true;
     return;
   }
   selectedPost.value = [];
@@ -382,6 +396,13 @@ async function mergePosts(posts: Array<TGApp.BBS.Post.FullData>, collect: string
     if (!res) await TGLogger.Error(`[PostCollect] mergePosts [${post.post.post_id}]`);
   }
 }
+
+function handleUserClick(user: TGApp.BBS.Post.User, gid: number): void {
+  if (showCollect.value) showCollect.value = false;
+  curGid.value = gid;
+  curUid.value = user.uid;
+  showUser.value = true;
+}
 </script>
 <style lang="css" scoped>
 .pc-top {
diff --git a/src/pages/common/PostForum.vue b/src/pages/common/PostForum.vue
index 8cd1b717..b50af476 100644
--- a/src/pages/common/PostForum.vue
+++ b/src/pages/common/PostForum.vue
@@ -345,8 +345,9 @@ function searchPost(): void {
   } else createPost(search.value);
 }
 
-function handleUserClick(user: TGApp.BBS.Post.User): void {
+function handleUserClick(user: TGApp.BBS.Post.User, gid: number): void {
   if (showSearch.value) showSearch.value = false;
+  curGid.value = gid;
   curUid.value = user.uid;
   showUser.value = true;
 }
diff --git a/src/pages/common/PostTopic.vue b/src/pages/common/PostTopic.vue
index 527c3cbf..b0b0dad9 100644
--- a/src/pages/common/PostTopic.vue
+++ b/src/pages/common/PostTopic.vue
@@ -270,8 +270,9 @@ function getGameList(list: Array<TGApp.BBS.Topic.GameInfo> | undefined): Array<G
   });
 }
 
-function handleUserClick(user: TGApp.BBS.Post.User): void {
+function handleUserClick(user: TGApp.BBS.Post.User, gid: number): void {
   if (showSearch.value) showSearch.value = false;
+  curGid.value = gid;
   curUid.value = user.uid;
   showUser.value = true;
 }