diff --git a/src/apis/moment.ts b/src/apis/moment.ts index 5666026..7cbeb30 100644 --- a/src/apis/moment.ts +++ b/src/apis/moment.ts @@ -1,13 +1,6 @@ import { cloudService } from './index' import type { IComment, IMoment } from '@/types/food' -export const addCommentApi = (id: number, comment: IComment): Promise => - cloudService({ - url: `/food-service/moment/${id}/comment`, - method: 'post', - data: comment - }) - export const addMomentApi = (moment: IMoment): Promise => cloudService({ url: '/food-service/moment', @@ -15,9 +8,22 @@ export const addMomentApi = (moment: IMoment): Promise => data: moment }) +export const updateMomentApi = (id: number, moment: IMoment): Promise => + cloudService({ + url: `/food-service/moment/${id}`, + method: 'put', + data: moment + }) + export const queryMomentApi = (): Promise => cloudService({ url: '/food-service/moment', method: 'get' }) +export const addCommentApi = (id: number, content: string): Promise => + cloudService({ + url: `/food-service/moment/${id}/comment`, + method: 'post', + params: { content } + }) diff --git a/src/components/Food/FoodBasicData.vue b/src/components/Food/FoodBasicData.vue new file mode 100644 index 0000000..beda022 --- /dev/null +++ b/src/components/Food/FoodBasicData.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/components/Food/FoodCard.vue b/src/components/Food/FoodCard.vue index ccb8b13..b4e6580 100644 --- a/src/components/Food/FoodCard.vue +++ b/src/components/Food/FoodCard.vue @@ -96,7 +96,7 @@ const getRecord = (recordList: IRecord[]) => { const editClick = async () => { const id = props.foodItem?.id foodStore.recipeApiType = 'UPDATE' - await foodStore.queryRecipe(id as number) + // await foodStore.queryRecipe(id as number) // foodStore.foodRecipeDialog = { // title: '编辑菜谱', // visible: true, @@ -105,13 +105,13 @@ const editClick = async () => { } const viewClick = async () => { - await router.push({ name: 'MobileHomeFoodDetailId', params: { id: props.foodItem?.id } }) + await router.push({ name: 'RecordDetailId', params: { id: props.foodItem?.id } }) } const deleteClick = () => { foodStore.recipeApiType = 'DELETE' commonElMessageBox(`请确认是否删除该菜谱: ${props.foodItem?.name}?`).then(() => { - foodStore.handleRecipeApi(props.foodItem) + // foodStore.handleRecipeApi(props.foodItem as IRecipe) }) } diff --git a/src/components/Food/FoodMaterialData.vue b/src/components/Food/FoodMaterialData.vue new file mode 100644 index 0000000..43de7e9 --- /dev/null +++ b/src/components/Food/FoodMaterialData.vue @@ -0,0 +1,59 @@ + + + diff --git a/src/components/Food/FoodMaterialForm.vue b/src/components/Food/FoodMaterialForm.vue index b9a55f3..b608368 100644 --- a/src/components/Food/FoodMaterialForm.vue +++ b/src/components/Food/FoodMaterialForm.vue @@ -15,7 +15,7 @@ diff --git a/src/components/Food/FoodRecordData.vue b/src/components/Food/FoodRecordData.vue new file mode 100644 index 0000000..61cbe9b --- /dev/null +++ b/src/components/Food/FoodRecordData.vue @@ -0,0 +1,32 @@ + + + diff --git a/src/components/Food/FoodStepData.vue b/src/components/Food/FoodStepData.vue new file mode 100644 index 0000000..5e4bdae --- /dev/null +++ b/src/components/Food/FoodStepData.vue @@ -0,0 +1,28 @@ + + + diff --git a/src/components/Food/FoodStepForm.vue b/src/components/Food/FoodStepForm.vue index d19f1c9..4beb445 100644 --- a/src/components/Food/FoodStepForm.vue +++ b/src/components/Food/FoodStepForm.vue @@ -20,7 +20,7 @@ diff --git a/src/views/record/detail[id].vue b/src/views/record/detail[id].vue new file mode 100644 index 0000000..a3f7e94 --- /dev/null +++ b/src/views/record/detail[id].vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/views/record/index.vue b/src/views/record/index.vue index 1fbd13d..317f745 100644 --- a/src/views/record/index.vue +++ b/src/views/record/index.vue @@ -9,26 +9,24 @@
查看类型: -

-
+
-
+
-
+
- -
@@ -36,20 +34,13 @@ import FoodRecipe from '@/components/Food/FoodRecipe.vue' import FoodDaily from '@/components/Food/FoodDaily.vue' import FoodTimeline from '@/components/Food/FoodTimeline.vue' -import DraggableButton from '@/components/DraggableButton.vue' import { Search } from '@element-plus/icons-vue' import { reactive } from 'vue' import { useFoodStore } from '@/store/food' -import type { IFoodSegment } from '@/types/food' -import { useRouter } from 'vue-router' -import { useAppStore } from '@/store/app' const foodStore = useFoodStore() -const router = useRouter() -const appStore = useAppStore() const foodInfo = reactive({ - recordSegment: 'recipe' as IFoodSegment, query: '' }) @@ -65,25 +56,6 @@ const recordSegmentList = [{ label: '时间轴', value: 'timeline' }] - -const addClick = () => { - appStore.isShowMobileBack = true - - switch (foodInfo.recordSegment) { - case 'recipe': - foodStore.recipeApiType = 'ADD' - foodStore.currentRecipe = foodStore.getEmptyRecipe() - router.push('/record/recipeForm') - break - case 'daily': - foodStore.recordApiType = 'ADD' - foodStore.currentRecord = foodStore.getEmptyRecord() - router.push('/record/recordForm') - break - default: - break - } -}