From c90a51409d9384ec34a85821b4fa704d578ab80e Mon Sep 17 00:00:00 2001 From: YunYouJun Date: Fri, 15 Apr 2022 23:31:05 +0800 Subject: [PATCH] fix: remove strict mode --- src/components/ChooseFood.vue | 16 +++++++++------- src/data/recipe.csv | 6 ++---- src/pages/index.vue | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/ChooseFood.vue b/src/components/ChooseFood.vue index c5a4944..64d4a6f 100644 --- a/src/components/ChooseFood.vue +++ b/src/components/ChooseFood.vue @@ -14,12 +14,14 @@ const rStore = useRecipeStore() const curStuff = computed(() => rStore.selectedStuff) const curTools = computed(() => rStore.selectedTools) -const strict = ref(false) +// 默认严格模式 +const strict = ref(true) const displayedRecipe = computed(() => { return recipe.value.filter((item) => { if (strict.value) { const stuffFlag = curStuff.value.every(stuff => item.stuff.includes(stuff)) - const toolFlag = curTools.value.every(tool => item.tools?.includes(tool)) + // const toolFlag = curTools.value.every(tool => item.tools?.includes(tool)) + const toolFlag = curTools.value.some(tool => item.tools?.includes(tool)) return stuffFlag && toolFlag } else { @@ -136,20 +138,20 @@ const clickTool = (item: StuffItem) => { -
+ -
+

🍲 今天的菜
@@ -217,7 +219,7 @@ $size: 20px; } input:checked + .slider { - background-color: green; + @apply bg-green-600; } input:checked + .slider:before { diff --git a/src/data/recipe.csv b/src/data/recipe.csv index dc96b9b..b474e5b 100644 --- a/src/data/recipe.csv +++ b/src/data/recipe.csv @@ -42,16 +42,14 @@ 金针菇菜卷,菌菇、胡萝卜、包菜,https://www.bilibili.com/video/BV1aW411H7fZ,简单,快手菜,,一口大锅 口蘑鸡胸肉,菌菇、鸡胸肉,https://www.bilibili.com/video/BV1AP4y1w7y6,简单,快手菜,煎,一口大锅 椒盐炸蘑菇,菌菇、鸡蛋,https://www.bilibili.com/video/BV1P54y1L7FS,简单,单一食材,炸,一口大锅 -潮汕杂菇煲,菌菇、猪肉,https://www.bilibili.com/video/BV15E411K7B5,简单, -,炒,一口大锅 +潮汕杂菇煲,菌菇、猪肉,https://www.bilibili.com/video/BV15E411K7B5,简单,,炒,一口大锅 烤蘑菇,菌菇、洋葱、猪肉,https://www.bilibili.com/video/BV1T3411e7VG,普通,,烤,空气炸锅 口蘑汤,菌菇,https://www.bilibili.com/video/BV1e64y1h776,简单,汤,煎、炖,一口大锅 蘑菇浓汤,蘑菇、洋葱、芹菜,https://www.bilibili.com/video/BV1Ut411C7Cu,普通,汤,炖,一口大锅 蒜香口蘑牛肉粒,蘑菇、牛肉,https://www.bilibili.com/video/BV1Nm4y197ev,简单,荤素搭配,炒,一口大锅 浇汁西兰花,西兰花,https://www.bilibili.com/video/BV1jq4y1M7jR,简单,单一食材,煮,一口大锅 蒜蓉西兰花,西兰花,https://www.bilibili.com/video/BV1fy4y1W7z5,简单,单一食材,炒,一口大锅 -西兰花炒虾仁,西兰花、虾,https://www.bilibili.com/video/BV1nv411B78i,简单, -,炒,一口大锅 +西兰花炒虾仁,西兰花、虾,https://www.bilibili.com/video/BV1nv411B78i,简单,,炒,一口大锅 白灼西兰花,西兰花,https://www.bilibili.com/video/BV1o4411A7dC,简单,健康,煮,一口大锅 鸡蛋西兰花豆腐羹,西兰花、豆腐、鸡蛋,https://www.bilibili.com/video/BV164411g77n,简单,,炖,一口大锅 水波蛋,鸡蛋,https://www.bilibili.com/video/BV1TT4y127vu,简单,,煮,一口大锅 diff --git a/src/pages/index.vue b/src/pages/index.vue index e9a1b1d..c2e835d 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -7,7 +7,7 @@ 好的,今天我们来做菜!

- 选你囤的食材和有的厨具,看看今天能做什么菜吧! + 选中你囤的食材和有的厨具,看看今天能做什么菜吧!