diff --git a/saiadmin-artd/src/utils/http/index.ts b/saiadmin-artd/src/utils/http/index.ts index 83484de..305164a 100644 --- a/saiadmin-artd/src/utils/http/index.ts +++ b/saiadmin-artd/src/utils/http/index.ts @@ -21,8 +21,8 @@ import { HttpError, handleError, showError, showSuccess } from './error' import { $t } from '@/locales' import { BaseResponse } from '@/types' -/** 请求配置常量 */ -const REQUEST_TIMEOUT = 15000 +/** 请求配置常量(超时时间 30s) */ +const REQUEST_TIMEOUT = 30000 const LOGOUT_DELAY = 500 const MAX_RETRIES = 0 const RETRY_DELAY = 1000 diff --git a/saiadmin-artd/src/utils/table/tableConfig.ts b/saiadmin-artd/src/utils/table/tableConfig.ts index 99fd1dc..493f4f3 100644 --- a/saiadmin-artd/src/utils/table/tableConfig.ts +++ b/saiadmin-artd/src/utils/table/tableConfig.ts @@ -40,9 +40,9 @@ export const tableConfig = { // 总条数 totalFields: ['total', 'count'], // 当前页码 - currentFields: ['current', 'page', 'pageNum'], + currentFields: ['current', 'page', 'pageNum', 'current_page'], // 每页大小 - sizeFields: ['size', 'pageSize', 'limit'], + sizeFields: ['size', 'pageSize', 'limit', 'per_page'], // 请求参数映射配置,前端发送请求时使用的分页参数名 // useTable 组合式函数传递分页参数的时候 用 current 跟 size diff --git a/saiadmin-artd/src/views/plugin/dice/api/reward/index.ts b/saiadmin-artd/src/views/plugin/dice/api/reward/index.ts new file mode 100644 index 0000000..9d832d6 --- /dev/null +++ b/saiadmin-artd/src/views/plugin/dice/api/reward/index.ts @@ -0,0 +1,61 @@ +import request from '@/utils/http' + +/** + * 奖励对照(dice_reward)API + */ +export default { + /** + * 分页列表,按 direction 区分顺时针(0)/逆时针(1) + * @param params direction(必), tier(选), page, limit, orderField, orderType + */ + list(params: Record) { + return request.get({ + url: '/core/dice/reward/DiceReward/index', + params + }) + }, + + /** + * 权重编辑弹窗:按档位分组获取当前方向的配置+权重(单方向) + * @param direction 0=顺时针 1=逆时针 + */ + weightRatioList(direction: 0 | 1) { + return request.get({ + url: '/core/dice/reward/DiceReward/weightRatioList', + params: { direction } + }) + }, + + /** + * 权重编辑弹窗:按档位分组获取配置+顺时针/逆时针权重(dice_reward 双方向) + */ + weightRatioListWithDirection() { + return request.get({ + url: '/core/dice/reward/DiceReward/weightRatioListWithDirection' + }) + }, + + /** + * 权重编辑弹窗:按 DiceReward 主键 id 批量更新 weight + * @param items [{ id: DiceReward.id, weight: 1-10000 }, ...] + */ + batchUpdateWeights(items: Array<{ id: number; weight: number }>) { + return request.post({ + url: '/core/dice/reward/DiceReward/batchUpdateWeights', + data: { items } + }) + }, + + /** + * 权重编辑弹窗:批量更新当前方向的权重(单方向) + */ + batchUpdateWeightsByDirection( + direction: 0 | 1, + items: Array<{ id: number; weight: number }> + ) { + return request.post({ + url: '/core/dice/reward/DiceReward/batchUpdateWeightsByDirection', + data: { direction, items } + }) + } +} diff --git a/saiadmin-artd/src/views/plugin/dice/api/reward_config/index.ts b/saiadmin-artd/src/views/plugin/dice/api/reward_config/index.ts index ec74042..4269c0e 100644 --- a/saiadmin-artd/src/views/plugin/dice/api/reward_config/index.ts +++ b/saiadmin-artd/src/views/plugin/dice/api/reward_config/index.ts @@ -73,8 +73,9 @@ export default { }, /** - * T1-T5、BIGWIN 权重配比:批量更新权重(同一档位权重之和必须等于 100%) + * T1-T5、BIGWIN 权重配比:批量更新顺时针/逆时针权重(写入 dice_reward) */ + /** 按 DiceReward 主键 id 批量更新 weight;items: [{ id, weight }, ...] */ batchUpdateWeights(items: Array<{ id: number; weight: number }>) { return request.post({ url: '/core/dice/reward_config/DiceRewardConfig/batchUpdateWeights', @@ -82,6 +83,20 @@ export default { }) }, + /** + * 创建奖励对照:按当前奖励配置为顺时针(0)、逆时针(1)生成所有色子可能对应的 dice_reward 记录,权重默认 1,可在奖励对照页权重编辑中调整 + */ + createRewardReference() { + return request.post<{ + created_clockwise: number + created_counterclockwise: number + updated_clockwise: number + updated_counterclockwise: number + }>({ + url: '/core/dice/reward_config/DiceRewardConfig/createRewardReference' + }) + }, + /** * 权重配比测试:按当前配置模拟 N 次抽奖,返回各 grid_number 落点次数 * @param test_count 100 | 500 | 1000 diff --git a/saiadmin-artd/src/views/plugin/dice/reward/index/index.vue b/saiadmin-artd/src/views/plugin/dice/reward/index/index.vue new file mode 100644 index 0000000..4d8048d --- /dev/null +++ b/saiadmin-artd/src/views/plugin/dice/reward/index/index.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/saiadmin-artd/src/views/plugin/dice/reward/index/modules/table-search.vue b/saiadmin-artd/src/views/plugin/dice/reward/index/modules/table-search.vue new file mode 100644 index 0000000..f950db5 --- /dev/null +++ b/saiadmin-artd/src/views/plugin/dice/reward/index/modules/table-search.vue @@ -0,0 +1,60 @@ + + + diff --git a/saiadmin-artd/src/views/plugin/dice/reward/index/modules/weight-edit-dialog.vue b/saiadmin-artd/src/views/plugin/dice/reward/index/modules/weight-edit-dialog.vue new file mode 100644 index 0000000..345e276 --- /dev/null +++ b/saiadmin-artd/src/views/plugin/dice/reward/index/modules/weight-edit-dialog.vue @@ -0,0 +1,477 @@ + + + + + diff --git a/saiadmin-artd/src/views/plugin/dice/reward/index/modules/weight-ratio-dialog.vue b/saiadmin-artd/src/views/plugin/dice/reward/index/modules/weight-ratio-dialog.vue new file mode 100644 index 0000000..3aec004 --- /dev/null +++ b/saiadmin-artd/src/views/plugin/dice/reward/index/modules/weight-ratio-dialog.vue @@ -0,0 +1,447 @@ + + + + + diff --git a/saiadmin-artd/src/views/plugin/dice/reward_config/index/index.vue b/saiadmin-artd/src/views/plugin/dice/reward_config/index/index.vue index 64f88ad..7707e26 100644 --- a/saiadmin-artd/src/views/plugin/dice/reward_config/index/index.vue +++ b/saiadmin-artd/src/views/plugin/dice/reward_config/index/index.vue @@ -10,11 +10,13 @@ - T1-T5 与 BIGWIN 权重配比 + 创建奖励对照 - - diff --git a/saiadmin-artd/src/views/plugin/dice/reward_config/index/modules/weight-ratio-dialog.vue b/saiadmin-artd/src/views/plugin/dice/reward_config/index/modules/weight-ratio-dialog.vue index 81d1d86..0199bc4 100644 --- a/saiadmin-artd/src/views/plugin/dice/reward_config/index/modules/weight-ratio-dialog.vue +++ b/saiadmin-artd/src/views/plugin/dice/reward_config/index/modules/weight-ratio-dialog.vue @@ -1,83 +1,73 @@