feat(lbs): 大神真实 5km 即时匹配与接单心跳

- companions 新增 latitude/longitude/last_active_at 与 idx_comp_active;切换接单中立即刷新活跃时间

- 新增 /api/companions/heartbeat(鉴权)与 /api/companions/match(真实注册+审核通过+接单中+10分钟心跳,Haversine 5km 过滤与距离排序,不返回精确坐标)

- 工作台/接单大厅/雷达前台每 60s 心跳,离开停止;首页即时匹配改为服务端 LBS 匹配并展示真实距离

- 线上实测:2010 匹配排除自己,仅命中 280m 的 8 号;匿名命中 9 号 10m、8 号 280m;北京 5km 为 0;118 套件/771 用例全绿
这个提交包含在:
xcbyy
2026-10-22 18:44:02 +08:00
父节点 b573c1ed05
当前提交 001f81eaca
共有 11 个文件被更改,包括 425 次插入 和 19 次删除

查看文件

@@ -246,7 +246,7 @@
{{ matchedExpert.isOnline ? '接单中' : '休息中' }}
</text>
</view>
<text class="matched-game">{{ matchedExpert.game }} · {{ matchedExpert.rankTag }}</text>
<text class="matched-game">{{ matchedMeta }}</text>
<text class="matched-price">¥{{ matchedExpert.price }}/小时</text>
</view>
</view>
@@ -264,7 +264,7 @@
<!-- 无在线大神匹配 -->
<view class="match-empty-box" v-else>
<text class="empty-txt">当前暂无空闲在线大神,请稍后再试</text>
<text class="empty-txt">暂无可匹配的接单大神,请稍后再试</text>
<button class="btn-match-action primary btn-active" @click="closeMatchModal">返回大厅</button>
</view>
</view>
@@ -280,7 +280,8 @@ import AppTabBar from '@/components/CustomTabBar.vue';
import SkeletonScreen from '@/components/SkeletonScreen.vue';
import PrivacyModal from '@/components/PrivacyModal.vue';
import HomePopupModal from '@/components/HomePopupModal.vue';
import { getCompanions, getBanners, getNavCategories, bindInviteCode, normalizeUserId } from '@/common/api.js';
import { getCompanions, matchCompanions, getBanners, getNavCategories, bindInviteCode } from '@/common/api.js';
import { getUserLocation } from '@/common/location.js';
import { ICONS } from '@/common/icons.js';
import { getCurrentThemeKey, applyThemeToNativeUI } from '@/common/theme.js';
import { getNavBarInfo } from '@/common/nav.js';
@@ -596,35 +597,45 @@ const startInstantMatch = async () => {
if (matchTimer) clearTimeout(matchTimer);
const startedAt = Date.now();
let freshList = null;
let pos = null;
try {
freshList = await getCompanions();
const loc = await getUserLocation();
pos = { lat: loc.latitude, lng: loc.longitude };
} catch (_) {
// 未授权定位时仍可匹配在线大神,只是不展示距离
}
let freshList = [];
try {
freshList = await matchCompanions({ ...(pos || {}), radius: 5, limit: 20 });
} catch (_) {}
if (seq !== matchSeq) return;
if (Array.isArray(freshList) && freshList.length > 0) {
experts.value = freshList;
}
const wait = Math.max(0, 600 - (Date.now() - startedAt));
matchTimer = setTimeout(() => {
if (seq !== matchSeq) return;
isMatching.value = false;
const uid = Number(normalizeUserId()) || 0;
const eligible = (experts.value || []).filter(
(e) => e.isOnline && Number(e.userId) > 0 && Number(e.userId) !== uid
);
const rotated = eligible.filter((e) => String(e.id) !== String(lastMatchedId));
const pool = rotated.length > 0 ? rotated : eligible;
const rotated = freshList.filter((e) => String(e.id) !== String(lastMatchedId));
const pool = rotated.length > 0 ? rotated : freshList;
if (pool.length === 0) {
matchedExpert.value = null;
return;
}
const picked = pool[Math.floor(Math.random() * pool.length)];
// 服务端已按真实距离升序;换一位取下一位最近的大神
const picked = pool[0];
matchedExpert.value = picked;
lastMatchedId = String(picked.id);
}, wait);
};
const matchedMeta = computed(() => {
const e = matchedExpert.value;
if (!e) return '';
const parts = [e.game, e.rankTag].filter(Boolean);
if (e.distanceText && e.distanceText !== '同城') parts.push(`距你 ${e.distanceText}`);
return parts.join(' · ');
});
const closeMatchModal = () => {
showMatchModal.value = false;
matchSeq += 1;