From cad68a0301fd86bec85d389f6445dffdcf75d9bc Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Thu, 16 Jan 2025 12:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E8=B0=B1=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=95=86=E5=93=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/canteenDailyMenu/form.vue  | 1 +
 src/views/canteen/canteenDailyMenu/index.vue | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/canteen/canteenDailyMenu/form.vue b/src/views/canteen/canteenDailyMenu/form.vue
index 7ae28b5..5eb36b3 100644
--- a/src/views/canteen/canteenDailyMenu/form.vue
+++ b/src/views/canteen/canteenDailyMenu/form.vue
@@ -243,6 +243,7 @@ const getDataListAndSelect = async () => {
 	// 添加请求参数
 	foodQueryForm.startTime = form.startTime
 	foodQueryForm.hourType = form.hourType
+	foodQueryForm.merchantId = form.merchantId
 
 	const res = await getCanteenDailyMenuList(foodQueryForm).finally(() => (loading.value = false))
 	if (res.code === 0) {
diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue
index e2db1a6..1983c3a 100644
--- a/src/views/canteen/canteenDailyMenu/index.vue
+++ b/src/views/canteen/canteenDailyMenu/index.vue
@@ -182,7 +182,7 @@ const selectTimeFood = async () => {
 
 // 删除菜品
 const delteData = async (tid: number) => {
-	ElMessageBox.confirm("确定删除菜品吗？", "今日菜品?", {
+	ElMessageBox.confirm("确定删除菜品吗？", "删除菜品", {
 		confirmButtonText: "确定",
 		cancelButtonText: "取消",
 		type: "warning",
@@ -281,6 +281,7 @@ onMounted(async () => {
 	border: 2px solid rgb(255, 187, 0);
 	border-left: 2px solid transparent;
 	color: rgb(255, 187, 0);
+	font-weight: bold;
 	position: relative;
 	cursor: default;
 }