diff --git a/saiadmin-artd/src/views/plugin/dice/api/lottery_pool_config/index.ts b/saiadmin-artd/src/views/plugin/dice/api/lottery_pool_config/index.ts index b862b27..c0f2695 100644 --- a/saiadmin-artd/src/views/plugin/dice/api/lottery_pool_config/index.ts +++ b/saiadmin-artd/src/views/plugin/dice/api/lottery_pool_config/index.ts @@ -12,6 +12,19 @@ export type LotteryPoolConfigOption = LotteryPoolOption & { t5_weight: number } +/** 规范化接口返回的彩金池配置(含权重) */ +export function parseLotteryPoolConfigOption(raw: Record): LotteryPoolConfigOption { + const base = normalizeLotteryPoolOption(raw) + return { + ...base, + t1_weight: Number(raw.t1_weight ?? 0), + t2_weight: Number(raw.t2_weight ?? 0), + t3_weight: Number(raw.t3_weight ?? 0), + t4_weight: Number(raw.t4_weight ?? 0), + t5_weight: Number(raw.t5_weight ?? 0) + } +} + /** * 色子奖池配置 API 接口 */ @@ -39,17 +52,7 @@ export default { }) const rows = Array.isArray(res) ? res : (Array.isArray((res as any)?.data) ? (res as any).data : []) if (!Array.isArray(rows)) return [] - return rows.map((r: Record) => { - const base = normalizeLotteryPoolOption(r) - return { - ...base, - t1_weight: Number(r.t1_weight ?? 0), - t2_weight: Number(r.t2_weight ?? 0), - t3_weight: Number(r.t3_weight ?? 0), - t4_weight: Number(r.t4_weight ?? 0), - t5_weight: Number(r.t5_weight ?? 0) - } - }) + return rows.map((r: Record) => parseLotteryPoolConfigOption(r)) }, /** diff --git a/saiadmin-artd/src/views/plugin/dice/api/player/index.ts b/saiadmin-artd/src/views/plugin/dice/api/player/index.ts index 702246e..723b6ac 100644 --- a/saiadmin-artd/src/views/plugin/dice/api/player/index.ts +++ b/saiadmin-artd/src/views/plugin/dice/api/player/index.ts @@ -1,5 +1,5 @@ import request from '@/utils/http' -import { normalizeLotteryPoolOption } from '@/views/plugin/dice/utils/lotteryPoolDisplay' +import { normalizeLotteryPoolOption, type LotteryPoolOption } from '@/views/plugin/dice/utils/lotteryPoolDisplay' /** * 大富翁-玩家 API接口 @@ -87,7 +87,7 @@ export default { /** * 获取彩金池配置选项,供 lottery_config_id 下拉使用(含奖池名称 display_name) */ - async getLotteryConfigOptions(params?: Record) { + async getLotteryConfigOptions(params?: Record): Promise { const res = await request.get({ url: '/core/dice/player/DicePlayer/getLotteryConfigOptions', params diff --git a/saiadmin-artd/src/views/plugin/dice/player/index/modules/edit-dialog.vue b/saiadmin-artd/src/views/plugin/dice/player/index/modules/edit-dialog.vue index b64127a..a0553f1 100644 --- a/saiadmin-artd/src/views/plugin/dice/player/index/modules/edit-dialog.vue +++ b/saiadmin-artd/src/views/plugin/dice/player/index/modules/edit-dialog.vue @@ -183,9 +183,16 @@