hera/oil-formula-calculator
1
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix: 西洋蓍草是正确名字，撤回误改；套装列表同步修正
Some checks failed
PR Preview / teardown-preview (pull_request) Has been skipped
Details
Test / unit-test (push) Successful in 5s
Details
Test / build-check (push) Successful in 4s
Details
PR Preview / test (pull_request) Successful in 5s
Details
PR Preview / deploy-preview (pull_request) Successful in 13s
Details
Test / e2e-test (push) Has been cancelled
Details

Browse Source 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Hera Zhao
2026-04-13 23:07:07 +00:00
parent 9562cbfe25
commit 8600f16cea
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/database.py
View File

@@ -252,7 +252,7 @@ def init_db():
c.execute("ALTER TABLE recipes ADD COLUMN volume TEXT DEFAULT ''") c.execute("ALTER TABLE recipes ADD COLUMN volume TEXT DEFAULT ''")
# Migration: rename oils 西洋蓍草→西洋蓍草石榴籽, 元气→元气焕能 # Migration: rename oils 西洋蓍草→西洋蓍草石榴籽, 元气→元气焕能
_oil_renames = [("西洋蓍草", "西洋蓍草石榴籽"), ("元气", "元气焕能")] _oil_renames = [("元气", "元气焕能")]
for old_name, new_name in _oil_renames: for old_name, new_name in _oil_renames:
old_exists = c.execute("SELECT 1 FROM oils WHERE name = ?", (old_name,)).fetchone() old_exists = c.execute("SELECT 1 FROM oils WHERE name = ?", (old_name,)).fetchone()
new_exists = c.execute("SELECT 1 FROM oils WHERE name = ?", (new_name,)).fetchone() new_exists = c.execute("SELECT 1 FROM oils WHERE name = ?", (new_name,)).fetchone()

54
backend/defaults.json
View File

@@ -328,7 +328,7 @@
"bottlePrice": 110, "bottlePrice": 110,
"dropCount": 280 "dropCount": 280
}, },
"西洋蓍草石榴籽": { "西洋蓍草": {
"bottlePrice": 450, "bottlePrice": 450,
"dropCount": 280 "dropCount": 280
}, },
@@ -514,7 +514,7 @@
"drops": 1 "drops": 1
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 1 "drops": 1
}, },
{ {
@@ -797,7 +797,7 @@
"drops": 1 "drops": 1
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 1 "drops": 1
}, },
{ {
@@ -867,7 +867,7 @@
"note": "", "note": "",
"ingredients": [ "ingredients": [
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 2 "drops": 2
}, },
{ {
@@ -929,7 +929,7 @@
"drops": 1 "drops": 1
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 2 "drops": 2
}, },
{ {
@@ -1169,7 +1169,7 @@
"tags": [], "tags": [],
"ingredients": [ "ingredients": [
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 20 "drops": 20
}, },
{ {
@@ -1196,7 +1196,7 @@
"tags": [], "tags": [],
"ingredients": [ "ingredients": [
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 20 "drops": 20
}, },
{ {
@@ -1910,7 +1910,7 @@
"drops": 10 "drops": 10
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 10 "drops": 10
} }
] ]
@@ -2285,7 +2285,7 @@
"tags": [], "tags": [],
"ingredients": [ "ingredients": [
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 5 "drops": 5
}, },
{ {
@@ -2643,7 +2643,7 @@
"drops": 2 "drops": 2
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 2 "drops": 2
} }
] ]
@@ -2709,7 +2709,7 @@
"drops": 3 "drops": 3
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 10 "drops": 10
} }
] ]
@@ -2778,7 +2778,7 @@
"drops": 5 "drops": 5
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 10 "drops": 10
}, },
{ {
@@ -3041,7 +3041,7 @@
"drops": 5 "drops": 5
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 10 "drops": 10
} }
] ]
@@ -3276,7 +3276,7 @@
"drops": 8 "drops": 8
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 10 "drops": 10
}, },
{ {
@@ -3858,7 +3858,7 @@
"drops": 30 "drops": 30
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 30 "drops": 30
}, },
{ {
@@ -4327,7 +4327,7 @@
"drops": 5 "drops": 5
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 20 "drops": 20
} }
] ]
@@ -4393,7 +4393,7 @@
"drops": 3 "drops": 3
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 3 "drops": 3
}, },
{ {
@@ -4564,7 +4564,7 @@
"drops": 2 "drops": 2
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 10 "drops": 10
}, },
{ {
@@ -4696,7 +4696,7 @@
"drops": 5 "drops": 5
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 10 "drops": 10
} }
] ]
@@ -4723,7 +4723,7 @@
"drops": 5 "drops": 5
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 5 "drops": 5
}, },
{ {
@@ -4758,7 +4758,7 @@
"drops": 5 "drops": 5
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 5 "drops": 5
} }
] ]
@@ -4866,7 +4866,7 @@
"tags": [], "tags": [],
"ingredients": [ "ingredients": [
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 10 "drops": 10
}, },
{ {
@@ -4893,7 +4893,7 @@
"tags": [], "tags": [],
"ingredients": [ "ingredients": [
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 20 "drops": 20
}, },
{ {
@@ -5056,7 +5056,7 @@
"tags": [], "tags": [],
"ingredients": [ "ingredients": [
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 10 "drops": 10
}, },
{ {
@@ -7051,7 +7051,7 @@
"drops": 10 "drops": 10
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 20 "drops": 20
}, },
{ {
@@ -7112,7 +7112,7 @@
"drops": 3 "drops": 3
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 3 "drops": 3
} }
] ]
@@ -7588,7 +7588,7 @@
"drops": 10 "drops": 10
}, },
{ {
"oil": "西洋蓍草石榴籽", "oil": "西洋蓍草",
"drops": 10 "drops": 10
}, },
{ {

2
frontend/src/config/kits.js
View File

@@ -27,7 +27,7 @@ export const KITS = [
price: 3988, price: 3988,
oils: [ oils: [
'乳香', '野橘', '柠檬', '薰衣草', '椒样薄荷', '冬青', '茶树', '生姜', '柠檬草', '西班牙牛至', '乳香', '野橘', '柠檬', '薰衣草', '椒样薄荷', '冬青', '茶树', '生姜', '柠檬草', '西班牙牛至',
'西洋蓍草石榴籽', '乐活', '保卫', '新瑞活力', '舒缓', '安定情绪', '安宁神气', '顺畅呼吸', '柑橘清新', '芳香调理', '元气焕能', '西洋蓍草', '乐活', '保卫', '新瑞活力', '舒缓', '安定情绪', '安宁神气', '顺畅呼吸', '柑橘清新', '芳香调理', '元气焕能',
'椰子油', '椰子油',
], ],
}, },