diff --git a/saiadmin-artd/src/locales/langs/en.json b/saiadmin-artd/src/locales/langs/en.json index ca768ea..d70b3fa 100644 --- a/saiadmin-artd/src/locales/langs/en.json +++ b/saiadmin-artd/src/locales/langs/en.json @@ -361,6 +361,7 @@ "dice": { "title": "Dice Game", "lotteryPoolConfig": "Lottery Tier Weight Config", + "anteConfig": "Ante Config", "player": "Player Management", "playerWalletRecord": "Player Wallet Records", "playRecord": "Player Draw Records", diff --git a/saiadmin-artd/src/locales/langs/en/dice/play_record.json b/saiadmin-artd/src/locales/langs/en/dice/play_record.json index 72cc7b0..4415be9 100644 --- a/saiadmin-artd/src/locales/langs/en/dice/play_record.json +++ b/saiadmin-artd/src/locales/langs/en/dice/play_record.json @@ -30,8 +30,8 @@ "rollArrayHint": "5 numbers, each 1–6", "rollNumber": "Roll Sum", "placeholderRollNumber": "Sum of 5 dice (5–30)", - "rewardConfig": "Reward Config", - "placeholderRewardConfig": "Select reward config (by UI text)", + "rewardTier": "Reward Tier", + "placeholderRewardTier": "Select reward tier", "addSuccess": "Added successfully", "editSuccess": "Updated successfully", "validateFailed": "Validation failed, please check required fields and format" @@ -47,8 +47,8 @@ "direction": "Direction", "winCoin": "Win Coin", "rollNumber": "Roll Number", - "rewardConfig": "Reward Config", "rewardTier": "Reward Tier", + "rewardConfig": "Reward Config", "usernameFuzzy": "Username (fuzzy)", "nameFuzzy": "Name (fuzzy)", "uiTextFuzzy": "UI Text (fuzzy)", @@ -75,7 +75,7 @@ "targetIndex": "Target Index", "rollArray": "Roll Array", "rollNumber": "Roll Number", - "rewardConfig": "Reward Config", + "rewardTier": "Reward Tier", "createTime": "Create Time", "updateTime": "Update Time" } diff --git a/saiadmin-artd/src/locales/langs/en/dice/play_record_test.json b/saiadmin-artd/src/locales/langs/en/dice/play_record_test.json index d7ede03..2c44fd5 100644 --- a/saiadmin-artd/src/locales/langs/en/dice/play_record_test.json +++ b/saiadmin-artd/src/locales/langs/en/dice/play_record_test.json @@ -37,7 +37,8 @@ "targetIndex": "Target Index", "rollArray": "Roll Array", "rollNumber": "Roll Number", - "rewardConfig": "Reward Config", + "rewardTier": "Reward Tier", + "status": "Status", "createTime": "Create Time" }, "form": { @@ -46,9 +47,7 @@ "labelLotteryConfigId": "Lottery Config ID", "placeholderLotteryConfigId": "Please enter lottery config id", "placeholderWinCoin": "Win coin", - "placeholderRewardTier": "Please select tier (will auto fill reward config id)", - "rewardConfigId": "Reward Config ID", - "placeholderRewardConfigId": "Auto fill by tier or enter manually", + "placeholderRewardTier": "Please select reward tier", "placeholderStartIndex": "Please enter start index", "labelTargetIndex": "Target Index", "placeholderTargetIndex": "Please enter target index", @@ -64,7 +63,7 @@ "ruleDrawTypeRequired": "Draw type is required", "ruleIsBigWinRequired": "Is big win is required", "ruleDirectionRequired": "Direction is required", - "ruleRewardConfigIdRequired": "Reward config id is required", + "ruleRewardTierRequired": "Reward tier is required", "ruleStatusRequired": "Status is required", "addSuccess": "Added successfully", "editSuccess": "Updated successfully" diff --git a/saiadmin-artd/src/locales/langs/en/dice/player.json b/saiadmin-artd/src/locales/langs/en/dice/player.json index ca8ac50..e3bcb88 100644 --- a/saiadmin-artd/src/locales/langs/en/dice/player.json +++ b/saiadmin-artd/src/locales/langs/en/dice/player.json @@ -66,6 +66,7 @@ "status": "Status", "coin": "Coin", "lotteryPoolConfig": "Lottery Pool Config", + "customConfig": "Custom", "t1Weight": "T1 Weight", "t2Weight": "T2 Weight", "t3Weight": "T3 Weight", diff --git a/saiadmin-artd/src/locales/langs/zh.json b/saiadmin-artd/src/locales/langs/zh.json index 1f6bd3d..0a8a99f 100644 --- a/saiadmin-artd/src/locales/langs/zh.json +++ b/saiadmin-artd/src/locales/langs/zh.json @@ -357,6 +357,7 @@ "dice": { "title": "大富翁-色子游戏", "lotteryPoolConfig": "彩金池配置", + "anteConfig": "底注配置", "player": "玩家管理", "playerWalletRecord": "玩家钱包记录", "playRecord": "玩家抽奖记录", diff --git a/saiadmin-artd/src/locales/langs/zh/dice/play_record.json b/saiadmin-artd/src/locales/langs/zh/dice/play_record.json index 39a7319..8a44bf5 100644 --- a/saiadmin-artd/src/locales/langs/zh/dice/play_record.json +++ b/saiadmin-artd/src/locales/langs/zh/dice/play_record.json @@ -30,8 +30,8 @@ "rollArrayHint": "固定 5 个数,每个 1~6", "rollNumber": "摇取点数和", "placeholderRollNumber": "5 个色子点数之和(5~30)", - "rewardConfig": "奖励配置", - "placeholderRewardConfig": "请选择奖励配置(显示前端文本)", + "rewardTier": "中奖档位", + "placeholderRewardTier": "请选择中奖档位", "addSuccess": "新增成功", "editSuccess": "修改成功", "validateFailed": "表单验证失败,请检查必填项与格式" @@ -47,8 +47,8 @@ "direction": "方向", "winCoin": "赢取平台币", "rollNumber": "摇取点数和", + "rewardTier": "中奖档位", "rewardConfig": "奖励配置", - "rewardTier": "奖励档位", "usernameFuzzy": "用户名模糊", "nameFuzzy": "名称模糊", "uiTextFuzzy": "前端显示文本模糊", @@ -75,7 +75,7 @@ "targetIndex": "终点索引", "rollArray": "摇取点数", "rollNumber": "摇取点数和", - "rewardConfig": "奖励配置", + "rewardTier": "中奖档位", "createTime": "创建时间", "updateTime": "更新时间" } diff --git a/saiadmin-artd/src/locales/langs/zh/dice/play_record_test.json b/saiadmin-artd/src/locales/langs/zh/dice/play_record_test.json index dc2183c..64dbb1f 100644 --- a/saiadmin-artd/src/locales/langs/zh/dice/play_record_test.json +++ b/saiadmin-artd/src/locales/langs/zh/dice/play_record_test.json @@ -11,7 +11,7 @@ "winCoin": "赢取平台币", "paidAmount": "付费金额", "ante": "底注", - "rewardTier": "奖励档位", + "rewardTier": "中奖档位", "rollNumber": "摇取点数和", "paid": "付费", "free": "免费", @@ -37,7 +37,8 @@ "targetIndex": "终点索引", "rollArray": "摇取点数", "rollNumber": "摇取点数和", - "rewardConfig": "奖励配置", + "rewardTier": "中奖档位", + "status": "状态", "createTime": "创建时间" }, "form": { @@ -46,9 +47,7 @@ "labelLotteryConfigId": "彩金池配置id", "placeholderLotteryConfigId": "请输入彩金池配置id", "placeholderWinCoin": "赢取平台币", - "placeholderRewardTier": "请选择档位(选后自动带出奖励配置ID)", - "rewardConfigId": "奖励配置id", - "placeholderRewardConfigId": "可选中奖档位自动带出或手动输入", + "placeholderRewardTier": "请选择中奖档位", "placeholderStartIndex": "请输入起始索引", "labelTargetIndex": "结束索引", "placeholderTargetIndex": "请输入结束索引", @@ -64,7 +63,7 @@ "ruleDrawTypeRequired": "抽奖类型必需填写", "ruleIsBigWinRequired": "是否中大奖必需填写", "ruleDirectionRequired": "方向必需填写", - "ruleRewardConfigIdRequired": "奖励配置id必需填写", + "ruleRewardTierRequired": "中奖档位必需填写", "ruleStatusRequired": "状态必需填写", "addSuccess": "新增成功", "editSuccess": "修改成功" diff --git a/saiadmin-artd/src/locales/langs/zh/dice/player.json b/saiadmin-artd/src/locales/langs/zh/dice/player.json index fd77675..2996d61 100644 --- a/saiadmin-artd/src/locales/langs/zh/dice/player.json +++ b/saiadmin-artd/src/locales/langs/zh/dice/player.json @@ -66,6 +66,7 @@ "status": "状态", "coin": "平台币", "lotteryPoolConfig": "彩金池配置", + "customConfig": "自定义", "t1Weight": "T1权重", "t2Weight": "T2权重", "t3Weight": "T3权重", diff --git a/saiadmin-artd/src/utils/router.ts b/saiadmin-artd/src/utils/router.ts index 97158bc..2b76763 100644 --- a/saiadmin-artd/src/utils/router.ts +++ b/saiadmin-artd/src/utils/router.ts @@ -42,6 +42,8 @@ export const MAP_PATH_TO_MENU_I18N_KEY: Record = { '/dice': 'menus.dice.title', '/dice/lottery_pool_config': 'menus.dice.lotteryPoolConfig', '/dice/lottery_pool_config/index': 'menus.dice.lotteryPoolConfig', + '/dice/ante_config': 'menus.dice.anteConfig', + '/dice/ante_config/index': 'menus.dice.anteConfig', '/dice/player': 'menus.dice.player', '/dice/player/index': 'menus.dice.player', '/dice/player_wallet_record': 'menus.dice.playerWalletRecord', diff --git a/saiadmin-artd/src/views/plugin/dice/api/play_record/index.ts b/saiadmin-artd/src/views/plugin/dice/api/play_record/index.ts index ebfdc02..ee59953 100644 --- a/saiadmin-artd/src/views/plugin/dice/api/play_record/index.ts +++ b/saiadmin-artd/src/views/plugin/dice/api/play_record/index.ts @@ -75,12 +75,5 @@ export default { return request.get<{ id: number; name: string }[]>({ url: '/dice/play_record/DicePlayRecord/getLotteryConfigOptions' }) - }, - - /** 获取奖励配置选项(id、ui_text、tier) */ - getRewardConfigOptions() { - return request.get<{ id: number; ui_text: string; tier: string }[]>({ - url: '/dice/play_record/DicePlayRecord/getRewardConfigOptions' - }) } } diff --git a/saiadmin-artd/src/views/plugin/dice/play_record/index/index.vue b/saiadmin-artd/src/views/plugin/dice/play_record/index/index.vue index 7f247e8..b467c59 100644 --- a/saiadmin-artd/src/views/plugin/dice/play_record/index/index.vue +++ b/saiadmin-artd/src/views/plugin/dice/play_record/index/index.vue @@ -56,19 +56,37 @@ @@ -158,8 +176,7 @@ row?.dicePlayer?.username ?? row?.player_id ?? '-' const lotteryConfigNameFormatter = (row: Record) => row?.diceLotteryPoolConfig?.name ?? row?.lottery_config_id ?? '-' - const rewardTierFormatter = (row: Record) => - row?.diceRewardConfig?.tier ?? row?.reward_config_id ?? '-' + const rewardTierFormatter = (row: Record) => row?.reward_tier ?? '-' /** 摇取点数格式化为 1,3,4,5,6,6 */ function formatRollArray(val: unknown): string { @@ -216,25 +233,32 @@ useSlot: true }, { prop: 'lottery_type', label: 'page.table.drawType', width: 100, useSlot: true }, + { prop: 'direction', label: 'page.table.direction', width: 90, useSlot: true }, { prop: 'ante', label: 'page.table.ante', width: 80, align: 'center' }, { prop: 'paid_amount', label: 'page.table.paidAmount', width: 110, align: 'center' }, { prop: 'is_win', label: 'page.table.isBigWin', width: 100, useSlot: true }, { prop: 'win_coin', label: 'page.table.winCoin', width: 110, useSlot: true }, { prop: 'super_win_coin', label: 'page.table.superWinCoin', width: 120, useSlot: true }, { prop: 'reward_win_coin', label: 'page.table.rewardWinCoin', width: 140, useSlot: true }, - { prop: 'direction', label: 'page.table.direction', width: 90, useSlot: true }, { prop: 'start_index', label: 'page.table.startIndex', width: 90 }, { prop: 'target_index', label: 'page.table.targetIndex', width: 90 }, { prop: 'roll_array', label: 'page.table.rollArray', width: 140, useSlot: true }, { prop: 'roll_number', label: 'page.table.rollNumber', width: 110, sortable: true }, { - prop: 'reward_config_id', - label: 'page.table.rewardConfig', + prop: 'reward_tier', + label: 'page.table.rewardTier', + width: 100, formatter: (row: Record) => rewardTierFormatter(row) }, { prop: 'create_time', label: 'page.table.createTime', width: 170 }, { prop: 'update_time', label: 'page.table.updateTime', width: 170 }, - { prop: 'operation', label: 'table.actions.operation', width: 100, fixed: 'right', useSlot: true } + { + prop: 'operation', + label: 'table.actions.operation', + width: 100, + fixed: 'right', + useSlot: true + } ] } }) diff --git a/saiadmin-artd/src/views/plugin/dice/play_record/index/modules/edit-dialog.vue b/saiadmin-artd/src/views/plugin/dice/play_record/index/modules/edit-dialog.vue index 3d669db..9411afd 100644 --- a/saiadmin-artd/src/views/plugin/dice/play_record/index/modules/edit-dialog.vue +++ b/saiadmin-artd/src/views/plugin/dice/play_record/index/modules/edit-dialog.vue @@ -153,25 +153,21 @@ :disabled="dialogType === 'edit'" /> - + - + + + + + + @@ -239,12 +235,11 @@ trigger: 'change' } ], - reward_config_id: [{ required: true, message: '请选择奖励配置', trigger: 'change' }] + reward_tier: [{ required: true, message: '请选择中奖档位', trigger: 'change' }] }) const playerOptions = ref>([]) const lotteryConfigOptions = ref>([]) - const rewardConfigOptions = ref>([]) const initialFormData = { id: null as number | null, @@ -260,7 +255,7 @@ target_index: null as number | null, roll_array: null as string | number[] | null, roll_number: null as number | null, - reward_config_id: null as number | null + reward_tier: '' as string } /** 摇取点数固定 5 位 [n0..n4],每项 1~6 */ @@ -277,22 +272,17 @@ if (open) { initPage() try { - const [players, lotteryConfigs, rewardConfigs] = await Promise.all([ + const [players, lotteryConfigs] = await Promise.all([ api.getPlayerOptions(), - api.getLotteryConfigOptions(), - api.getRewardConfigOptions() + api.getLotteryConfigOptions() ]) playerOptions.value = Array.isArray(players) ? players : ((players as any)?.data ?? []) lotteryConfigOptions.value = Array.isArray(lotteryConfigs) ? lotteryConfigs : ((lotteryConfigs as any)?.data ?? []) - rewardConfigOptions.value = Array.isArray(rewardConfigs) - ? rewardConfigs - : ((rewardConfigs as any)?.data ?? []) } catch { playerOptions.value = [] lotteryConfigOptions.value = [] - rewardConfigOptions.value = [] } } } @@ -322,7 +312,7 @@ 'target_index', 'roll_array', 'roll_number', - 'reward_config_id' + 'reward_tier' ] keys.forEach((key) => { const val = props.data![key] diff --git a/saiadmin-artd/src/views/plugin/dice/play_record/index/modules/table-search.vue b/saiadmin-artd/src/views/plugin/dice/play_record/index/modules/table-search.vue index 3d60594..a8778ad 100644 --- a/saiadmin-artd/src/views/plugin/dice/play_record/index/modules/table-search.vue +++ b/saiadmin-artd/src/views/plugin/dice/play_record/index/modules/table-search.vue @@ -101,6 +101,7 @@ + diff --git a/saiadmin-artd/src/views/plugin/dice/play_record_test/index/index.vue b/saiadmin-artd/src/views/plugin/dice/play_record_test/index/index.vue index 64851a6..7d30f64 100644 --- a/saiadmin-artd/src/views/plugin/dice/play_record_test/index/index.vue +++ b/saiadmin-artd/src/views/plugin/dice/play_record_test/index/index.vue @@ -8,7 +8,9 @@ - -