核对到的积分余额同步刷新主界面积分列,发布0.3.6
后端在"导入账号/手动查询/抢购后核对"时都会写入积分基线,但界面一直没有读它: 积分列的 scoreMap 只由"查询积分"按钮填充,所以自动核对完余额后主界面不动, 用户必须再点一次"查询积分"才看到新余额。 - 新增 GetScoreBaselines 绑定:一次性返回各账号最近一次已记录的积分余额 (Scheduler.ScoreBaselines → ScoreBaselineStore.Snapshot),界面直接读取, 不必再为每个账号单独发请求 - 前端 useAccounts 新增 syncScoresFromBackend:把后端基线写入 scoreMap 与 localStorage(与手动查询同一份状态);导入场景下会短暂轮询等待后端异步查询写完 - 抢购状态回到 idle 时自动同步一次(对应抢购结束后的核对结果) - 导入账号成功后按导入的账号名同步一次 - 新增断言:核对后 ScoreBaselines 返回最新余额
This commit is contained in:
@@ -14,7 +14,7 @@ import {
|
||||
|
||||
const { selectedProductId, selectedProductName, selectedProduct } = useProducts()
|
||||
const { showToast } = useToast()
|
||||
const { accounts, loadAccounts, clearSelection } = useAccounts()
|
||||
const { accounts, loadAccounts, clearSelection, syncScoresFromBackend } = useAccounts()
|
||||
|
||||
// 状态
|
||||
const loading = ref(false)
|
||||
@@ -41,6 +41,16 @@ const refreshManagedAccounts = async (resetSelection = true) => {
|
||||
}
|
||||
}
|
||||
|
||||
// parseImportedNames 从粘贴内容里取出账号名(每行 账号名----密码----Cookie)。
|
||||
const parseImportedNames = (content: string): string[] => {
|
||||
return content
|
||||
.split(/\r?\n/)
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line && !line.startsWith('#'))
|
||||
.map((line) => line.split('----')[0]?.trim() || '')
|
||||
.filter(Boolean)
|
||||
}
|
||||
|
||||
const importAccountText = async (content: string) => {
|
||||
accountLoading.value = true
|
||||
try {
|
||||
@@ -52,6 +62,8 @@ const importAccountText = async (content: string) => {
|
||||
accountContent.value = ''
|
||||
await refreshManagedAccounts()
|
||||
showToast('导入成功', `已添加 ${result.count} 个账号`, 'success')
|
||||
// 后端会在导入后自动记一次积分基线,这里等它写完并刷新积分列
|
||||
void syncScoresFromBackend(parseImportedNames(content))
|
||||
} catch (e: any) {
|
||||
showToast('导入失败', e?.message || '', 'error')
|
||||
} finally {
|
||||
|
||||
@@ -7,6 +7,7 @@ import {
|
||||
GetXiaodianBindQRCode,
|
||||
BindXiaodianRole,
|
||||
DeleteAccounts,
|
||||
GetScoreBaselines,
|
||||
QueryScore,
|
||||
ReloadAccounts,
|
||||
VerifyAllExchange,
|
||||
@@ -150,6 +151,32 @@ export function useAccounts() {
|
||||
}
|
||||
}
|
||||
|
||||
// syncScoresFromBackend 用后端已记录的积分余额刷新积分列。
|
||||
//
|
||||
// 后端在"导入账号""手动查询积分""抢购结束后核对"时都会写入基线,
|
||||
// 这里直接读取结果,不需要再逐账号重新请求接口。
|
||||
// expectNames 非空时会短暂轮询等待后端异步查询完成(导入刚返回时可能还没写完)。
|
||||
const syncScoresFromBackend = async (expectNames: string[] = [], attempts = 4, delayMs = 600) => {
|
||||
const tries = expectNames.length > 0 ? attempts : 1
|
||||
for (let i = 0; i < tries; i++) {
|
||||
try {
|
||||
const d = await GetScoreBaselines()
|
||||
const scores = (d?.scores || {}) as Record<string, string>
|
||||
Object.keys(scores).forEach((name) => {
|
||||
scoreMap.value[name] = String(scores[name])
|
||||
localStorage.setItem('accScore_' + name, String(scores[name]))
|
||||
})
|
||||
if (expectNames.every((name) => name in scores)) {
|
||||
return true
|
||||
}
|
||||
} catch {}
|
||||
if (i < tries - 1) {
|
||||
await new Promise((resolve) => setTimeout(resolve, delayMs))
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
const queryAllScore = async () => {
|
||||
showToast('查询积分', '正在并发查询...', 'info')
|
||||
const tasks = accounts.value.map(async (a) => {
|
||||
@@ -358,6 +385,7 @@ export function useAccounts() {
|
||||
selectedIndices,
|
||||
statusMap,
|
||||
scoreMap,
|
||||
syncScoresFromBackend,
|
||||
xiaodianAssetsMap,
|
||||
xiaodianRolesMap,
|
||||
xiaodianQRCode,
|
||||
|
||||
@@ -17,7 +17,7 @@ let unsubscribeSeckillState: (() => void) | null = null
|
||||
|
||||
export function useScheduler() {
|
||||
const { showToast } = useToast()
|
||||
const { resetStatus, buildAccountProducts, markSelectedPending, markAccountNamesPending, markSelectedStatus, queryXiaodianAssets } = useAccounts()
|
||||
const { resetStatus, buildAccountProducts, markSelectedPending, markAccountNamesPending, markSelectedStatus, queryXiaodianAssets, syncScoresFromBackend } = useAccounts()
|
||||
const { selectedProductId, selectedProductName } = useProducts()
|
||||
const { currentActivity } = useActivity()
|
||||
const { addLocalLog, clearLocalResults } = useLogs()
|
||||
@@ -49,6 +49,8 @@ export function useScheduler() {
|
||||
}
|
||||
if (state === 'idle') {
|
||||
void refreshXiaodianAssetsAfterRun()
|
||||
// 抢购结束后的自动核对已经把新余额写进后端基线,这里同步到积分列。
|
||||
void syncScoresFromBackend()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user