From d0d31d0380a4bcf409089645cce994e01f9e14b7 Mon Sep 17 00:00:00 2001
From: xcbyy <2578898740@qq.com>
Date: Mon, 19 Oct 2026 15:10:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(search):=20=E5=A4=A7=E7=A5=9E=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E8=AF=8D=E6=90=9C=E7=B4=A2=E8=B5=B0=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=AB=AF=EF=BC=88=E6=98=B5=E7=A7=B0/=E5=93=81=E7=B1=BB/?=
 =?UTF-8?q?=E6=AE=B5=E4=BD=8D/=E6=A0=87=E7=AD=BE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 仓储 getCompanions(keyword?)：参数化 LIKE 搜索 name/track/rank_name/tags 及 id 精确匹配
- 接口 /api/companions 支持 ?keyword=（长度截断 40）
- 小程序 api.js getCompanions(keyword) 带 encodeURIComponent；首页监听 searchKeyword 防抖 350ms 走服务端搜索，搜索态以服务端结果为准（含空结果不展示陈旧数据）
- 回归 95 套件/668 用例全绿；冒烟 4/4（昵称/品类命中、无匹配空数组、无关键词向后兼容）
---
 pwuniapp/common/api.js                 |  8 +++++---
 pwuniapp/pages/index/index.vue         | 25 +++++++++++++++++++-----
 server/src/db/repository.ts            | 17 ++++++++++++----
 server/src/index.ts                    |  3 ++-
 server/tests/search-companions.spec.ts | 27 ++++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 13 deletions(-)
 create mode 100644 server/tests/search-companions.spec.ts

diff --git a/pwuniapp/common/api.js b/pwuniapp/common/api.js
index f7ee126..c492004 100644
--- a/pwuniapp/common/api.js
+++ b/pwuniapp/common/api.js
@@ -191,10 +191,12 @@ export async function getMyActivities(userId) {
 /**
  * 获取同城大神列表
  */
-export async function getCompanions() {
+export async function getCompanions(keyword) {
   try {
-    const list = await http.get('/companions');
-    if (Array.isArray(list) && list.length > 0) {
+    const kw = String(keyword == null ? '' : keyword).trim();
+    const query = kw ? `?keyword=${encodeURIComponent(kw)}` : '';
+    const list = await http.get(`/companions${query}`);
+    if (Array.isArray(list)) {
       return list
         .filter((c) => !c.auditStatus || c.auditStatus === '已通过')
         .map((c) => ({
diff --git a/pwuniapp/pages/index/index.vue b/pwuniapp/pages/index/index.vue
index 55f1d9b..987417f 100644
--- a/pwuniapp/pages/index/index.vue
+++ b/pwuniapp/pages/index/index.vue
@@ -266,7 +266,7 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, onUnmounted } from 'vue';
+import { ref, computed, watch, onMounted, onUnmounted } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import AppTabBar from '@/components/CustomTabBar.vue';
 import SkeletonScreen from '@/components/SkeletonScreen.vue';
@@ -352,17 +352,32 @@ const loadInitialData = async () => {
   }
 };
 
-const fetchLiveCompanions = async () => {
+const fetchLiveCompanions = async (keyword = '') => {
   try {
-    const list = await getCompanions();
-    if (Array.isArray(list) && list.length > 0) {
-      experts.value = list;
+    const kw = String(keyword || '').trim();
+    const list = await getCompanions(kw);
+    if (Array.isArray(list)) {
+      if (kw) {
+        // 服务端搜索：以服务端结果为准（含空结果），避免仅过滤已加载的一页数据
+        experts.value = list;
+      } else if (list.length > 0) {
+        experts.value = list;
+      }
     }
   } catch (err) {
     console.warn('[Index] 获取大神数据失败:', err);
   }
 };
 
+// 关键词变化时防抖走服务端搜索，覆盖超出当前加载范围的候选
+let searchTimer = null;
+watch(searchKeyword, (val) => {
+  if (searchTimer) clearTimeout(searchTimer);
+  searchTimer = setTimeout(() => {
+    fetchLiveCompanions(String(val || '').trim());
+  }, 350);
+});
+
 const fetchLiveBanners = async () => {
   try {
     const list = await getBanners();
diff --git a/server/src/db/repository.ts b/server/src/db/repository.ts
index 12a7d28..df23f77 100644
--- a/server/src/db/repository.ts
+++ b/server/src/db/repository.ts
@@ -742,11 +742,11 @@ export class MysqlRepository {
     return null;
   }
 
-  async getCompanions(): Promise<any[]> {
+  async getCompanions(keyword?: string): Promise<any[]> {
     try {
       await pool.query("ALTER TABLE companions ADD COLUMN reject_reason VARCHAR(255) DEFAULT '' AFTER audit_status");
     } catch (_) {}
-    const [rows]: any = await pool.query(`
+    let sql = `
       SELECT 
         id, user_id as userId, name, avatar, gender, age, track, rank_name as \`rank\`,
         hourly_rate as hourlyRate, voice_duration as voiceDuration,
@@ -754,8 +754,17 @@ export class MysqlRepository {
         status, audit_status as auditStatus, COALESCE(reject_reason, '') as rejectReason,
         id_card_masked as idCardMasked, tags, apply_time as applyTime
       FROM companions
-      ORDER BY id ASC
-    `);
+    `;
+    const params: any[] = [];
+    const kw = String(keyword == null ? '' : keyword).trim();
+    if (kw) {
+      // 关键词搜索：昵称 / 陪玩品类 / 段位 / 技能标签（参数化，避免注入）
+      sql += ' WHERE name LIKE ? OR track LIKE ? OR rank_name LIKE ? OR tags LIKE ? OR CAST(id AS CHAR) = ?';
+      const like = `%${kw}%`;
+      params.push(like, like, like, like, kw);
+    }
+    sql += ' ORDER BY id ASC';
+    const [rows]: any = await pool.query(sql, params);
     return rows.map((r: any) => {
       let tagsArr = [];
       try {
diff --git a/server/src/index.ts b/server/src/index.ts
index d412df7..26ca87f 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -1073,7 +1073,8 @@ app.get('/api/users/:id/my-activities', async (req: Request, res: Response) => {
 // 4. 陪玩与大神管理接口 (落盘 MySQL)
 app.get('/api/companions', async (req: Request, res: Response) => {
   try {
-    const companions = await repo.getCompanions();
+    const keyword = req.query.keyword ? String(req.query.keyword).slice(0, 40) : undefined;
+    const companions = await repo.getCompanions(keyword);
     // 管理端可见全量（含待审核/已驳回及内部备注）；公开目录仅展示已通过审核的大神，并剥离内部审核备注
     if (isVerifiedAdminRequest(req)) {
       return res.json({ code: 20000, data: companions });
diff --git a/server/tests/search-companions.spec.ts b/server/tests/search-companions.spec.ts
new file mode 100644
index 0000000..e2d83e3
--- /dev/null
+++ b/server/tests/search-companions.spec.ts
@@ -0,0 +1,27 @@
+// 已读取AGENTS.md
+import * as fs from 'fs';
+import * as path from 'path';
+
+/**
+ * 第七十九批：大神关键词搜索（服务端）。
+ */
+describe('第七十九批大神搜索闸门', () => {
+  const root = path.resolve(__dirname, '../../');
+  const indexCode = fs.readFileSync(path.join(root, 'server/src/index.ts'), 'utf-8');
+  const repo = fs.readFileSync(path.join(root, 'server/src/db/repository.ts'), 'utf-8');
+  const api = fs.readFileSync(path.join(root, 'pwuniapp/common/api.js'), 'utf-8');
+  const home = fs.readFileSync(path.join(root, 'pwuniapp/pages/index/index.vue'), 'utf-8');
+
+  it('后端支持关键词搜索（参数化，避免注入）', () => {
+    expect(indexCode).toContain('req.query.keyword');
+    expect(repo).toContain('async getCompanions(keyword?: string)');
+    expect(repo).toContain('WHERE name LIKE ? OR track LIKE ? OR rank_name LIKE ?');
+  });
+
+  it('小程序搜索走服务端并做防抖', () => {
+    expect(api).toContain('export async function getCompanions(keyword)');
+    expect(api).toContain('encodeURIComponent(kw)');
+    expect(home).toContain('watch(searchKeyword');
+    expect(home).toContain('fetchLiveCompanions');
+  });
+});