diff --git a/src/components/Anniversary/CategoryCard.vue b/src/components/Anniversary/CategoryCard.vue index df34af3..c0aaf7e 100644 --- a/src/components/Anniversary/CategoryCard.vue +++ b/src/components/Anniversary/CategoryCard.vue @@ -12,6 +12,7 @@ import { defineProps, PropType } from 'vue' import { IAnniversaryCategory } from '@/types/anniversary.ts' import { useAnniversaryStore } from '@/store/anniversary.ts' import { useRouter } from 'vue-router' +import { ElMessage } from 'element-plus' const props = defineProps({ categoryItem: { @@ -28,8 +29,12 @@ const router = useRouter() const anniversaryStore = useAnniversaryStore() const selectCategoryClick = () => { - anniversaryStore.queryInfo.category = props.categoryItem?.name as string - router.push({ name: 'AnniversaryList' }) + if (props.count) { + anniversaryStore.queryInfo.category = props.categoryItem?.name as string + router.push({ name: 'AnniversaryList' }) + } else { + ElMessage.info('暂无纪念日') + } } diff --git a/src/components/Food/Data/FoodRecordData.vue b/src/components/Food/Data/FoodRecordData.vue index e7704a8..f3ace6d 100644 --- a/src/components/Food/Data/FoodRecordData.vue +++ b/src/components/Food/Data/FoodRecordData.vue @@ -12,9 +12,8 @@ 完成人:{{ item.person }} + :src="AListUrl + item.imageUrl" fit="cover" alt="暂无图片" + @click="viewImageClick(item)" class="record-image"/> @@ -27,6 +26,13 @@ import { useFoodStore } from '@/store/food.ts' import { AListUrl } from '@/utils' import { SvgIcon } from 'vue3-common' +import { IFoodRecord } from '@/types/food.ts' +import { showImagePreview } from 'vant' const foodStore = useFoodStore() + +const viewImageClick = (item: IFoodRecord) => { + const imageList = [AListUrl + item.imageUrl] + showImagePreview({ images: imageList, closeable: true }) +} diff --git a/src/components/Food/FoodCard.vue b/src/components/Food/FoodCard.vue index f8f0f53..ec1bb92 100644 --- a/src/components/Food/FoodCard.vue +++ b/src/components/Food/FoodCard.vue @@ -13,7 +13,7 @@ -
+
@@ -49,9 +49,9 @@
@@ -88,21 +88,21 @@ onMounted(() => { const viewImageClick = () => { const imageList = props.foodItem?.recordList.map((item) => `${AListUrl}${item.imageUrl}`) - showImagePreview(imageList) + showImagePreview({ images: imageList, closeable: true }) } -const editFoodRecipeClick = async () => { +const editClick = async () => { const id = props.foodItem?.id foodStore.foodRecipeApiType = 'UPDATE' await foodStore.queryFoodRecipe(id as number) await router.push({ name: 'FoodRecipeForm' }) } -const viewFoodRecipeClick = async () => { +const viewClick = async () => { await router.push({ name: 'FoodDetailId', params: { id: props.foodItem?.id } }) } -const deleteFoodRecipeClick = () => { +const deleteClick = () => { foodStore.foodRecipeApiType = 'DELETE' commonElMessageBox(`请确认是否删除该菜谱: ${props.foodItem?.name}?`).then(() => { foodStore.handleFoodRecipeApi(props.foodItem) diff --git a/src/components/Food/FoodQuery.vue b/src/components/Food/FoodQuery.vue index f6846fa..4c5f96d 100644 --- a/src/components/Food/FoodQuery.vue +++ b/src/components/Food/FoodQuery.vue @@ -26,7 +26,14 @@ onMounted(async () => { }) const changeFoodNameEvent = async (value: string) => { - const result = await searchFoodRecipeApi(value) - foodStore.foodRecipeList = [result] + if (value) { + const result = await searchFoodRecipeApi(value) + foodStore.foodRecipeList = [result] + } else { + foodStore.pageInfo.currentPage = 1 + foodStore.pageInfo.pageSize = 3 + foodStore.foodRecipeList = [] + await foodStore.queryMobileFoodRecipeList() + } } diff --git a/src/components/Journal/JournalCard.vue b/src/components/Journal/JournalCard.vue index 044dba9..0795817 100644 --- a/src/components/Journal/JournalCard.vue +++ b/src/components/Journal/JournalCard.vue @@ -38,8 +38,7 @@