mojiahui/dafuweng-saiadmin6.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将项目中所有total_draw_count字段重构为total_ticket_count字段

Browse Source 
将项目中所有paid_draw_count字段重构为paid_ticket_count字段
将项目中所有free_draw_count字段重构为free_ticket_count字段
This commit is contained in:
zhenhui
2026-03-05 14:15:32 +08:00
parent 5ab16243bd
commit e5f83846b3
16 changed files with 134 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
saiadmin-artd/src/views/plugin/dice/player/index/index.vue
View File

@@ -169,9 +169,9 @@
{ prop: 't3_wight', label: 'T3池权重', width: 100, formatter: weightFormatter('t3_wight') },
{ prop: 't4_wight', label: 'T4池权重', width: 100, formatter: weightFormatter('t4_wight') },
{ prop: 't5_wight', label: 'T5池权重', width: 100, formatter: weightFormatter('t5_wight') },
{ prop: 'total_draw_count', label: '总抽奖次数' },
{ prop: 'paid_draw_count', label: '购买抽奖次数' },
{ prop: 'free_draw_count', label: '赠送抽奖次数' },
{ prop: 'total_ticket_count', label: '总抽奖次数' },
{ prop: 'paid_ticket_count', label: '购买抽奖次数' },
{ prop: 'free_ticket_count', label: '赠送抽奖次数' },
{ prop: 'created_at', label: '创建时间' },
{ prop: 'updated_at', label: '更新时间' },
{ prop: 'operation', label: '操作', width: 120, fixed: 'right', useSlot: true }

18
saiadmin-artd/src/views/plugin/dice/player_ticket_record/index/index.vue
View File

@@ -83,12 +83,12 @@
username: undefined,
use_coins_min: undefined,
use_coins_max: undefined,
total_draw_count_min: undefined,
total_draw_count_max: undefined,
paid_draw_count_min: undefined,
paid_draw_count_max: undefined,
free_draw_count_min: undefined,
free_draw_count_max: undefined,
total_ticket_count_min: undefined,
total_ticket_count_max: undefined,
paid_ticket_count_min: undefined,
paid_ticket_count_max: undefined,
free_ticket_count_min: undefined,
free_ticket_count_max: undefined,
create_time_min: undefined,
create_time_max: undefined,
create_time: undefined as [string, string] | undefined
@@ -131,9 +131,9 @@
{ prop: 'id', label: 'ID', width: 80 },
{ prop: 'player_id', label: '玩家用户名', formatter: (row: Record<string, any>) => usernameFormatter(row) },
{ prop: 'use_coins', label: '消耗硬币' },
{ prop: 'total_draw_count', label: '总抽奖次数' },
{ prop: 'paid_draw_count', label: '购买抽奖次数' },
{ prop: 'free_draw_count', label: '赠送抽奖次数' },
{ prop: 'total_ticket_count', label: '总抽奖次数' },
{ prop: 'paid_ticket_count', label: '购买抽奖次数' },
{ prop: 'free_ticket_count', label: '赠送抽奖次数' },
{ prop: 'remark', label: '备注', width: 100, showOverflowTooltip: true },
{ prop: 'create_time', label: '创建时间', width: 170 },
{ prop: 'operation', label: '操作', width: 100, fixed: 'right', useSlot: true }

48
saiadmin-artd/src/views/plugin/dice/player_ticket_record/index/modules/edit-dialog.vue
View File

@@ -28,25 +28,25 @@
<el-form-item label="消耗硬币" prop="use_coins">
<el-input-number v-model="formData.use_coins" placeholder="请输入消耗硬币" :min="0" />
</el-form-item>
<el-form-item label="购买抽奖次数" prop="paid_draw_count">
<el-form-item label="购买抽奖次数" prop="paid_ticket_count">
<el-input-number
v-model="formData.paid_draw_count"
v-model="formData.paid_ticket_count"
placeholder="请输入购买抽奖次数"
:min="0"
@change="onDrawCountChange"
@change="onTicketCountChange"
/>
</el-form-item>
<el-form-item label="赠送抽奖次数" prop="free_draw_count">
<el-form-item label="赠送抽奖次数" prop="free_ticket_count">
<el-input-number
v-model="formData.free_draw_count"
v-model="formData.free_ticket_count"
placeholder="请输入赠送抽奖次数"
:min="0"
@change="onDrawCountChange"
@change="onTicketCountChange"
/>
</el-form-item>
<el-form-item label="总抽奖次数" prop="total_draw_count">
<el-form-item label="总抽奖次数" prop="total_ticket_count">
<el-input-number
:model-value="totalDrawCountComputed"
:model-value="totalTicketCountComputed"
placeholder="自动求和"
:min="0"
disabled
@@ -110,23 +110,23 @@
const rules = reactive<FormRules>({
player_id: [{ required: true, message: '请选择玩家', trigger: 'change' }],
use_coins: [{ required: true, message: '消耗硬币必需填写', trigger: 'blur' }],
paid_draw_count: [{ required: true, message: '购买抽奖次数必需填写', trigger: 'blur' }],
free_draw_count: [{ required: true, message: '赠送抽奖次数必需填写', trigger: 'blur' }],
paid_ticket_count: [{ required: true, message: '购买抽奖次数必需填写', trigger: 'blur' }],
free_ticket_count: [{ required: true, message: '赠送抽奖次数必需填写', trigger: 'blur' }],
remark: [{ required: true, message: '备注必需填写', trigger: 'blur' }]
})
/** 玩家下拉选项（id、username） */
const playerOptions = ref<Array<{ id: number; username: string }>>([])
/** 总抽奖次数 = 购买抽奖次数 + 赠送抽奖次数（只读展示） */
const totalDrawCountComputed = computed(() => {
const paid = Number(formData.paid_draw_count) || 0
const free = Number(formData.free_draw_count) || 0
/** total_ticket_count = paid_ticket_count + free_ticket_count（只读展示） */
const totalTicketCountComputed = computed(() => {
const paid = Number(formData.paid_ticket_count) || 0
const free = Number(formData.free_ticket_count) || 0
return paid + free
})
function onDrawCountChange() {
formData.total_draw_count = totalDrawCountComputed.value
function onTicketCountChange() {
formData.total_ticket_count = totalTicketCountComputed.value
}
/**
@@ -136,9 +136,9 @@
id: null,
player_id: null,
use_coins: null as number | null,
total_draw_count: null as number | null,
paid_draw_count: null as number | null,
free_draw_count: null as number | null,
total_ticket_count: null as number | null,
paid_ticket_count: null as number | null,
free_ticket_count: null as number | null,
remark: ''
}
@@ -188,9 +188,9 @@
'id',
'player_id',
'use_coins',
'total_draw_count',
'paid_draw_count',
'free_draw_count',
'total_ticket_count',
'paid_ticket_count',
'free_ticket_count',
'remark'
]
keys.forEach((key) => {
@@ -210,12 +210,12 @@
}
/**
* 提交表单（总抽奖次数由购买+赠送自动求和，提交前写入）
* 提交表单（total_ticket_count 由 paid_ticket_count + free_ticket_count 自动求和，提交前写入）
*/
const handleSubmit = async () => {
if (!formRef.value) return
try {
formData.total_draw_count = totalDrawCountComputed.value
formData.total_ticket_count = totalTicketCountComputed.value
await formRef.value.validate()
if (props.dialogType === 'add') {
const rest = { ...formData } as Record<string, unknown>

18
saiadmin-artd/src/views/plugin/dice/player_ticket_record/index/modules/table-search.vue
View File

@@ -35,10 +35,10 @@
</el-form-item>
</el-col>
<el-col v-bind="setSpan(6)">
<el-form-item label="总抽奖次数" prop="total_draw_count_min">
<el-form-item label="总抽奖次数" prop="total_ticket_count_min">
<div class="range-wrap">
<el-input-number
v-model="formData.total_draw_count_min"
v-model="formData.total_ticket_count_min"
placeholder="最小"
:min="0"
controls-position="right"
@@ -46,7 +46,7 @@
/>
<span class="range-sep">至</span>
<el-input-number
v-model="formData.total_draw_count_max"
v-model="formData.total_ticket_count_max"
placeholder="最大"
:min="0"
controls-position="right"
@@ -56,10 +56,10 @@
</el-form-item>
</el-col>
<el-col v-bind="setSpan(6)">
<el-form-item label="购买抽奖次数" prop="paid_draw_count_min">
<el-form-item label="购买抽奖次数" prop="paid_ticket_count_min">
<div class="range-wrap">
<el-input-number
v-model="formData.paid_draw_count_min"
v-model="formData.paid_ticket_count_min"
placeholder="最小"
:min="0"
controls-position="right"
@@ -67,7 +67,7 @@
/>
<span class="range-sep">至</span>
<el-input-number
v-model="formData.paid_draw_count_max"
v-model="formData.paid_ticket_count_max"
placeholder="最大"
:min="0"
controls-position="right"
@@ -77,10 +77,10 @@
</el-form-item>
</el-col>
<el-col v-bind="setSpan(6)">
<el-form-item label="赠送抽奖次数" prop="free_draw_count_min">
<el-form-item label="赠送抽奖次数" prop="free_ticket_count_min">
<div class="range-wrap">
<el-input-number
v-model="formData.free_draw_count_min"
v-model="formData.free_ticket_count_min"
placeholder="最小"
:min="0"
controls-position="right"
@@ -88,7 +88,7 @@
/>
<span class="range-sep">至</span>
<el-input-number
v-model="formData.free_draw_count_max"
v-model="formData.free_ticket_count_max"
placeholder="最大"
:min="0"
controls-position="right"

6
saiadmin-artd/src/views/plugin/dice/player_wallet_record/index/index.vue
View File

@@ -196,9 +196,9 @@
align: 'center',
showOverflowTooltip: true
},
{ prop: 'total_draw_count', label: '总抽奖次数', align: 'center' },
{ prop: 'paid_draw_count', label: '购买抽奖次数', align: 'center' },
{ prop: 'free_draw_count', label: '赠送抽奖次数', align: 'center' },
{ prop: 'total_ticket_count', label: '总抽奖次数', align: 'center' },
{ prop: 'paid_ticket_count', label: '购买抽奖次数', align: 'center' },
{ prop: 'free_ticket_count', label: '赠送抽奖次数', align: 'center' },
{ prop: 'create_time', label: '创建时间', width: 170, align: 'center' },
{
prop: 'operation',