fix: 🐛 临时奖项无法设置分次抽取

This commit is contained in:
log1997
2026-01-04 16:54:19 +08:00
parent 9328ab1021
commit 8fd2e76409
5 changed files with 13 additions and 12 deletions

2
src-tauri/Cargo.lock generated
View File

@@ -77,7 +77,7 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
[[package]]
name = "app"
version = "0.5.2"
version = "0.5.3"
dependencies = [
"log",
"serde",

View File

@@ -1,8 +1,5 @@
<script setup lang='ts'>
import type { IPrizeConfig } from '@/types/storeType'
import { ref } from 'vue'
// import { useI18n } from 'vue-i18n'
import EditSeparateDialog from '@/components/NumberSeparate/EditSeparateDialog.vue'
import OfficialPrizeList from './parts/OfficialPrizeList/index.vue'
import OperationButton from './parts/OperationButton.vue'
import TemporaryDialog from './parts/TemporaryDialog.vue'
@@ -23,8 +20,8 @@ const {
currentPrize,
localPrizeList,
isMobile,
selectedPrize,
} = usePrizeList(temporaryPrizeRef)
const selectedPrize = ref<IPrizeConfig | null>()
</script>
<template>
@@ -32,15 +29,13 @@ const selectedPrize = ref<IPrizeConfig | null>()
<TemporaryDialog
ref="temporaryPrizeRef"
v-model:temporary-prize="temporaryPrize"
v-model:selected-prize="selectedPrize"
:change-person-count="changePersonCount"
:select-prize="selectPrize"
:local-image-list="localImageList"
:add-temporary-prize="addTemporaryPrize"
:submit-temporary-prize="submitTemporaryPrize"
/>
<EditSeparateDialog
:total-number="selectedPrize?.count" :separated-number="selectedPrize?.separateCount.countList"
@submit-data="submitData"
:submit-data="submitData"
/>
<div class="h-full">
<TemporaryList

View File

@@ -9,10 +9,12 @@ defineProps<{
localImageList: IImage[]
submitTemporaryPrize: () => void
addTemporaryPrize: () => void
submitData: (separatedNumber: any) => void
}>()
const { t } = useI18n()
const dialogRef = ref<HTMLDialogElement | null>(null)
const temporaryPrize = defineModel<IPrizeConfig>('temporaryPrize', { required: true })
const selectedPrize = defineModel<IPrizeConfig | null>('selectedPrize', { required: true })
function showDialog() {
dialogRef.value?.showModal()
}
@@ -23,6 +25,10 @@ defineExpose({
</script>
<template>
<EditSeparateDialog
:total-number="selectedPrize?.count" :separated-number="selectedPrize?.separateCount.countList"
@submit-data="submitData"
/>
<dialog id="my_modal_1" ref="dialogRef" class="border-none modal">
<div class="modal-box">
<h3 class="text-lg font-bold">

View File

@@ -34,10 +34,9 @@ const { t } = useI18n()
{{ temporaryPrize.isUsedCount }}/{{ temporaryPrize.count }}
</p>
<progress
class="w-3/4 h-6 progress progress-primary" :value="temporaryPrize.isUsedCount"
class="w-3/4 h-6 progress bg-[#52545b] progress-primary" :value="temporaryPrize.isUsedCount"
:max="temporaryPrize.count"
/>
<!-- <p class="p-0 m-0">{{ item.isUsedCount }}/{{ item.count }}</p> -->
</div>
<div class="flex flex-col gap-1 mr-2">
<div class="tooltip tooltip-left" :data-tip="t('tooltip.edit')">

View File

@@ -21,7 +21,7 @@ export function usePrizeList(temporaryPrizeRef: any) {
= storeToRefs(globalConfig)
const { getIsMobile: isMobile } = storeToRefs(system)
const selectedPrize = ref<IPrizeConfig | null>()
const selectedPrize = ref<IPrizeConfig | null>(null)
const prizeShow = ref(structuredClone(isShowPrizeList.value))
function addTemporaryPrize() {
@@ -94,5 +94,6 @@ export function usePrizeList(temporaryPrizeRef: any) {
prizeShow,
localPrizeList,
isMobile,
selectedPrize,
}
}