From 8600f16ceaa47ffacaaca43ae60bcdf216860266 Mon Sep 17 00:00:00 2001 From: Hera Zhao Date: Mon, 13 Apr 2026 23:07:07 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A5=BF=E6=B4=8B=E8=93=8D=E8=8D=89?= =?UTF-8?q?=E6=98=AF=E6=AD=A3=E7=A1=AE=E5=90=8D=E5=AD=97=EF=BC=8C=E6=92=A4?= =?UTF-8?q?=E5=9B=9E=E8=AF=AF=E6=94=B9=EF=BC=9B=E5=A5=97=E8=A3=85=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 (1M context) --- backend/database.py | 2 +- backend/defaults.json | 54 ++++++++++++++++++------------------- frontend/src/config/kits.js | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/backend/database.py b/backend/database.py index ed862b8..bfa9119 100644 --- a/backend/database.py +++ b/backend/database.py @@ -252,7 +252,7 @@ def init_db(): c.execute("ALTER TABLE recipes ADD COLUMN volume TEXT DEFAULT ''") # Migration: rename oils 西洋蓍草→西洋蓍草石榴籽, 元气→元气焕能 - _oil_renames = [("西洋蓍草", "西洋蓍草石榴籽"), ("元气", "元气焕能")] + _oil_renames = [("元气", "元气焕能")] for old_name, new_name in _oil_renames: 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() diff --git a/backend/defaults.json b/backend/defaults.json index b24d087..1f96d80 100644 --- a/backend/defaults.json +++ b/backend/defaults.json @@ -328,7 +328,7 @@ "bottlePrice": 110, "dropCount": 280 }, - "西洋蓍草石榴籽": { + "西洋蓍草": { "bottlePrice": 450, "dropCount": 280 }, @@ -514,7 +514,7 @@ "drops": 1 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 1 }, { @@ -797,7 +797,7 @@ "drops": 1 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 1 }, { @@ -867,7 +867,7 @@ "note": "", "ingredients": [ { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 2 }, { @@ -929,7 +929,7 @@ "drops": 1 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 2 }, { @@ -1169,7 +1169,7 @@ "tags": [], "ingredients": [ { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 20 }, { @@ -1196,7 +1196,7 @@ "tags": [], "ingredients": [ { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 20 }, { @@ -1910,7 +1910,7 @@ "drops": 10 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 10 } ] @@ -2285,7 +2285,7 @@ "tags": [], "ingredients": [ { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 5 }, { @@ -2643,7 +2643,7 @@ "drops": 2 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 2 } ] @@ -2709,7 +2709,7 @@ "drops": 3 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 10 } ] @@ -2778,7 +2778,7 @@ "drops": 5 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 10 }, { @@ -3041,7 +3041,7 @@ "drops": 5 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 10 } ] @@ -3276,7 +3276,7 @@ "drops": 8 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 10 }, { @@ -3858,7 +3858,7 @@ "drops": 30 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 30 }, { @@ -4327,7 +4327,7 @@ "drops": 5 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 20 } ] @@ -4393,7 +4393,7 @@ "drops": 3 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 3 }, { @@ -4564,7 +4564,7 @@ "drops": 2 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 10 }, { @@ -4696,7 +4696,7 @@ "drops": 5 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 10 } ] @@ -4723,7 +4723,7 @@ "drops": 5 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 5 }, { @@ -4758,7 +4758,7 @@ "drops": 5 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 5 } ] @@ -4866,7 +4866,7 @@ "tags": [], "ingredients": [ { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 10 }, { @@ -4893,7 +4893,7 @@ "tags": [], "ingredients": [ { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 20 }, { @@ -5056,7 +5056,7 @@ "tags": [], "ingredients": [ { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 10 }, { @@ -7051,7 +7051,7 @@ "drops": 10 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 20 }, { @@ -7112,7 +7112,7 @@ "drops": 3 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 3 } ] @@ -7588,7 +7588,7 @@ "drops": 10 }, { - "oil": "西洋蓍草石榴籽", + "oil": "西洋蓍草", "drops": 10 }, { diff --git a/frontend/src/config/kits.js b/frontend/src/config/kits.js index cc55392..73f37fb 100644 --- a/frontend/src/config/kits.js +++ b/frontend/src/config/kits.js @@ -27,7 +27,7 @@ export const KITS = [ price: 3988, oils: [ '乳香', '野橘', '柠檬', '薰衣草', '椒样薄荷', '冬青', '茶树', '生姜', '柠檬草', '西班牙牛至', - '西洋蓍草石榴籽', '乐活', '保卫', '新瑞活力', '舒缓', '安定情绪', '安宁神气', '顺畅呼吸', '柑橘清新', '芳香调理', '元气焕能', + '西洋蓍草', '乐活', '保卫', '新瑞活力', '舒缓', '安定情绪', '安宁神气', '顺畅呼吸', '柑橘清新', '芳香调理', '元气焕能', '椰子油', ], },