From 8fd2e764099a97b7b86b8900de548db31c1ada70 Mon Sep 17 00:00:00 2001 From: log1997 <2694233102@qq.com> Date: Sun, 4 Jan 2026 16:54:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E5=A5=96=E9=A1=B9=E6=97=A0=E6=B3=95=E8=AE=BE=E7=BD=AE=E5=88=86?= =?UTF-8?q?=E6=AC=A1=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-tauri/Cargo.lock | 2 +- src/views/Home/components/PrizeList/index.vue | 11 +++-------- .../components/PrizeList/parts/TemporaryDialog.vue | 6 ++++++ .../Home/components/PrizeList/parts/TemporaryList.vue | 3 +-- src/views/Home/components/PrizeList/usePrizeList.ts | 3 ++- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 5a56935..13070d8 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -77,7 +77,7 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "app" -version = "0.5.2" +version = "0.5.3" dependencies = [ "log", "serde", diff --git a/src/views/Home/components/PrizeList/index.vue b/src/views/Home/components/PrizeList/index.vue index b727b24..c0a1acc 100644 --- a/src/views/Home/components/PrizeList/index.vue +++ b/src/views/Home/components/PrizeList/index.vue @@ -1,8 +1,5 @@ @@ -32,15 +29,13 @@ const selectedPrize = ref() - void addTemporaryPrize: () => void + submitData: (separatedNumber: any) => void }>() const { t } = useI18n() const dialogRef = ref(null) const temporaryPrize = defineModel('temporaryPrize', { required: true }) +const selectedPrize = defineModel('selectedPrize', { required: true }) function showDialog() { dialogRef.value?.showModal() } @@ -23,6 +25,10 @@ defineExpose({ + diff --git a/src/views/Home/components/PrizeList/parts/TemporaryList.vue b/src/views/Home/components/PrizeList/parts/TemporaryList.vue index fb7c7a0..107006a 100644 --- a/src/views/Home/components/PrizeList/parts/TemporaryList.vue +++ b/src/views/Home/components/PrizeList/parts/TemporaryList.vue @@ -34,10 +34,9 @@ const { t } = useI18n() {{ temporaryPrize.isUsedCount }}/{{ temporaryPrize.count }} - diff --git a/src/views/Home/components/PrizeList/usePrizeList.ts b/src/views/Home/components/PrizeList/usePrizeList.ts index ed039bf..5d6a1b7 100644 --- a/src/views/Home/components/PrizeList/usePrizeList.ts +++ b/src/views/Home/components/PrizeList/usePrizeList.ts @@ -21,7 +21,7 @@ export function usePrizeList(temporaryPrizeRef: any) { = storeToRefs(globalConfig) const { getIsMobile: isMobile } = storeToRefs(system) - const selectedPrize = ref() + const selectedPrize = ref(null) const prizeShow = ref(structuredClone(isShowPrizeList.value)) function addTemporaryPrize() { @@ -94,5 +94,6 @@ export function usePrizeList(temporaryPrizeRef: any) { prizeShow, localPrizeList, isMobile, + selectedPrize, } } From 4527d61c01fed08d310e8651e526f8e1e61dc5e7 Mon Sep 17 00:00:00 2001 From: log1997 <2694233102@qq.com> Date: Sun, 4 Jan 2026 17:07:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A5=96=E9=A1=B9=E5=88=99=E5=B0=86=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E5=A5=96=E5=93=81=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E5=A5=96=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/useMounted.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/layout/useMounted.ts b/src/layout/useMounted.ts index 00307a9..5bf36b2 100644 --- a/src/layout/useMounted.ts +++ b/src/layout/useMounted.ts @@ -12,7 +12,7 @@ export function useMounted(tipDialog: Ref) { const prizeConfig = useStore().prizeConfig const system = useStore().system const { getTheme: localTheme } = storeToRefs(globalConfig) - const { getPrizeConfig: prizeList } = storeToRefs(prizeConfig) + const { getPrizeConfig: prizeList, getTemporaryPrize: temporaryPrize } = storeToRefs(prizeConfig) const tipDesc = ref('') const { t } = useI18n() // 设置当前奖列表 @@ -20,6 +20,10 @@ export function useMounted(tipDialog: Ref) { if (prizeList.value.length <= 0) { return } + if (temporaryPrize.value && temporaryPrize.value.isShow) { + prizeConfig.setCurrentPrize(temporaryPrize.value) + return + } for (let i = 0; i < prizeList.value.length; i++) { if (!prizeList.value[i].isUsed) { prizeConfig.setCurrentPrize(prizeList.value[i]) From 81b66e6836592db2e20de26e4fa865b47c4d1e3a Mon Sep 17 00:00:00 2001 From: log1997 <2694233102@qq.com> Date: Sun, 4 Jan 2026 17:30:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?docs:=20=F0=9F=93=9D=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1d7b5ed..a5746ce 100644 --- a/README.md +++ b/README.md @@ -160,10 +160,11 @@ npm run build 容器运行成功后即可在本地通过访问 -3. 软件安装包 +## 软件安装包 - 可前往[Releases](https://github.com/LOG1997/log-lottery/releases)下载。 - 目前只支持windows平台使用,跨平台安装包暂不支持,如有需要请自行编译,参照[贡献文档](https://github.com/LOG1997/log-lottery/blob/dev/.github/CONTRIBUTING.md) +可前往[Releases](https://github.com/LOG1997/log-lottery/releases)下载。 + +目前只支持windows平台使用,跨平台安装包暂不支持,如有需要请自行编译,参照[贡献文档](https://github.com/LOG1997/log-lottery/blob/main/.github/CONTRIBUTING.md) ## 支持项目 From a06c153f0cca0be70fd1b04e154034603baf72af Mon Sep 17 00:00:00 2001 From: LOG1997 <2694233102@qq.com> Date: Sun, 4 Jan 2026 21:15:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?docs:=20=F0=9F=93=9D=20=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E7=89=88=E6=9C=AC0.5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 020590b..700bd84 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "log-lottery", "private": true, - "version": "0.5.3", + "version": "0.5.4", "type": "module", "license": "MIT", "scripts": { diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 13070d8..cc5e089 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -77,7 +77,7 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "app" -version = "0.5.3" +version = "0.5.4" dependencies = [ "log", "serde", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 3f885aa..477b4e1 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "app" -version = "0.5.3" +version = "0.5.4" description = "A Tauri App" authors = ["you"] license = "" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f8a207a..d12e962 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "productName": "log-lottery", - "version": "0.5.3", + "version": "0.5.4", "identifier": "to2026.xyz", "build": { "frontendDist": "../dist",