From adf10717ea30676ed1c933af5bdc0156c8407bb8 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 14 Jan 2025 10:50:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E6=AF=8F=E6=97=A5?=
 =?UTF-8?q?=E8=8F=9C=E8=B0=B1=E8=8F=9C=E5=93=81=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/canteenDailyMenu/index.vue | 33 ++++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue
index 4572eb5..d5bf8be 100644
--- a/src/views/canteen/canteenDailyMenu/index.vue
+++ b/src/views/canteen/canteenDailyMenu/index.vue
@@ -26,14 +26,9 @@
 				<tr class="food">
 					<td @click="addFood(1)">早餐</td>
 					<div class="food_list">
-						<td class="food_list_item" v-for="(item, index) in foodData1" :key="index">
-							<el-image
-								style="width: 80px; height: 80px"
-								:src="imageBaseUrl + item.picUrl"
-								fit="cover"
-								@click="delteData(item.tid)"
-							/>
-							<div class="w-full flex justify-around items-center text-black">
+						<td class="food_list_item" v-for="(item, index) in foodData1" :key="index" @click="delteData(item.tid)">
+							<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
+							<div class="w-full flex justify-around items-center text-black mt-2">
 								<span>{{ item.name }}</span>
 								<span class="mx-1">|</span>
 								<span class="text-sm">{{ canteenCategoryOption.find((v: any) => v.id == item.categoryId)?.name }}</span>
@@ -45,14 +40,9 @@
 				<tr class="food">
 					<td @click="addFood(2)">中餐</td>
 					<div class="food_list">
-						<td class="food_list_item" v-for="(item, index) in foodData2" :key="index">
-							<el-image
-								style="width: 80px; height: 80px"
-								:src="imageBaseUrl + item.picUrl"
-								fit="cover"
-								@click="delteData(item.tid)"
-							/>
-							<div class="w-full flex justify-around items-center text-black">
+						<td class="food_list_item" v-for="(item, index) in foodData2" :key="index" @click="delteData(item.tid)">
+							<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
+							<div class="w-full flex justify-around items-center text-black mt-2">
 								<span>{{ item.name }}</span>
 								<span class="mx-1">|</span>
 								<span class="text-sm">{{ canteenCategoryOption.find((v: any) => v.id == item.categoryId)?.name }}</span>
@@ -64,14 +54,9 @@
 				<tr class="food">
 					<td @click="addFood(3)">晚餐</td>
 					<div class="food_list">
-						<td class="food_list_item" v-for="(item, index) in foodData3" :key="index">
-							<el-image
-								style="width: 80px; height: 80px"
-								:src="imageBaseUrl + item.picUrl"
-								fit="cover"
-								@click="delteData(item.tid)"
-							/>
-							<div class="w-full flex justify-around items-center text-black">
+						<td class="food_list_item" v-for="(item, index) in foodData3" :key="index" @click="delteData(item.tid)">
+							<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
+							<div class="w-full flex justify-around items-center text-black mt-2">
 								<span>{{ item.name }}</span>
 								<span class="mx-1">|</span>
 								<span class="text-sm">{{ canteenCategoryOption.find((v: any) => v.id == item.categoryId)?.name }}</span>

From d660e55f262d70e31a84ae593e54ae2a7305ba70 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 14 Jan 2025 11:08:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AF=8F=E6=97=A5?=
 =?UTF-8?q?=E8=8F=9C=E5=93=81=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/canteen/canteenDailyMenu.ts          | 6 +++---
 src/views/canteen/canteenDailyMenu/index.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/api/canteen/canteenDailyMenu.ts b/src/api/canteen/canteenDailyMenu.ts
index b703539..061d885 100644
--- a/src/api/canteen/canteenDailyMenu.ts
+++ b/src/api/canteen/canteenDailyMenu.ts
@@ -23,11 +23,11 @@ export function getObj(id?: string) {
 	})
 }
 
-export function delObjs(data?: Object) {
+export function delObjs(tid: number[], merchantId: string) {
 	return request({
-		url: "/canteen/canteenDailyMenu",
+		url: `/canteen/canteenDailyMenu?merchantId=${merchantId}`,
 		method: "delete",
-		data,
+		data: tid,
 	})
 }
 
diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue
index d5bf8be..cf92e67 100644
--- a/src/views/canteen/canteenDailyMenu/index.vue
+++ b/src/views/canteen/canteenDailyMenu/index.vue
@@ -100,7 +100,7 @@ const weekParams = reactive({
 const weekData = reactive({
 	data: [],
 }) //时间数组
-const merchantId = ref()
+const merchantId = ref() // 商户id
 const merchantInfo = ref<any>([])
 
 const addFood = async (hourType: number) => {
@@ -177,7 +177,7 @@ const selectTimeFood = async () => {
 const delteData = async (tid: number) => {
 	await message.delConfirm("确定删除菜品吗？", "今日菜品?")
 	try {
-		await delObjs([tid])
+		await delObjs([tid], merchantId.value)
 		message.success("删除成功")
 	} catch (error) {
 		message.error("删除失败")

From 600ad4f970f7959ef4c931f38df56f7e917d2ecb Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 14 Jan 2025 11:32:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/canteenDailyMenu/form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/canteen/canteenDailyMenu/form.vue b/src/views/canteen/canteenDailyMenu/form.vue
index 43787f4..089a636 100644
--- a/src/views/canteen/canteenDailyMenu/form.vue
+++ b/src/views/canteen/canteenDailyMenu/form.vue
@@ -47,7 +47,7 @@
 							<CircleClose />
 						</el-icon>
 						<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
-						<div class="w-full flex justify-around items-center text-black">
+						<div class="w-full flex justify-around items-center text-black mt-2">
 							<span>{{ item.name }}</span>
 							<span class="mx-1">|</span>
 							<span class="text-sm">