diff --git a/src/hooks/message.ts b/src/hooks/message.ts
index b3739e7..9a1c379 100644
--- a/src/hooks/message.ts
+++ b/src/hooks/message.ts
@@ -61,8 +61,8 @@ export function useMessage() {
 				content ? content : t('common.delMessage'),
 				tip ? tip : t('common.confirmTitle'),
 				{
-					confirmButtonText: t('common.ok'),
-					cancelButtonText: t('common.cancel'),
+					confirmButtonText: t('确定'),
+					cancelButtonText: t('取消'),
 					type: 'warning'
 				}
 			)
diff --git a/src/views/canteen/boxesInfo/form.vue b/src/views/canteen/boxesInfo/form.vue
index 21f1d8f..41a5c6a 100644
--- a/src/views/canteen/boxesInfo/form.vue
+++ b/src/views/canteen/boxesInfo/form.vue
@@ -3,35 +3,35 @@
       :close-on-click-modal="false" draggable>
       <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
        <el-row :gutter="24">
+         <el-col :span="12" class="mb20">
+           <el-form-item label="商户" prop="merchantId">
+             <el-select
+                 v-model="form.merchantId"
+                 placeholder="请选择商户"
+                 size="large"
+                 style="width: 240px; display: inline-block"
+                 :disabled="merchantStatus"
+             >
+               <el-option v-for="item in merchantInfo" :key="item.id" :label="item.name" :value="item.id" />
+             </el-select>
+           </el-form-item>
+         </el-col>
     <el-col :span="12" class="mb20">
       <el-form-item label="包厢名称" prop="name">
         <el-input v-model="form.name" placeholder="请输入包厢名称"/>
       </el-form-item>
       </el-col>
-
+         <el-col :span="24" class="mb20">
+           <el-form-item label="包厢图片" prop="images">
+             <upload-img v-model="form.images"></upload-img>
+           </el-form-item>
+         </el-col>
     <el-col :span="12" class="mb20">
       <el-form-item label="容纳人数" prop="capacity">
         <el-input v-model="form.capacity" placeholder="请输入容纳人数"/>
       </el-form-item>
       </el-col>
 
-    <el-col :span="12" class="mb20">
-  <el-form-item label="包厢描述" prop="description">
-    <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入包厢描述"></editor>
-  </el-form-item>
-  </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="包厢地址" prop="address">
-        <el-input type="textarea" v-model="form.address" placeholder="请输入包厢地址"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-  <el-form-item label="包厢图片" prop="images">
-    <upload-img v-model="form.images"></upload-img>
-  </el-form-item>
-  </el-col>
 
     <el-col :span="12" class="mb20">
       <el-form-item label="包厢状态" prop="status">
@@ -41,15 +41,16 @@
             </el-radio-group>
         </el-form-item>
       </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="商户id" prop="merchantId">
-          <el-select v-model="form.merchantId" placeholder="请选择商户id">
-            <el-option label="请选择">0</el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-
+         <el-col :span="24" class="mb20">
+           <el-form-item label="包厢地址" prop="address">
+             <el-input type="textarea" v-model="form.address" placeholder="请输入包厢地址"/>
+           </el-form-item>
+         </el-col>
+         <el-col :span="24" class="mb20">
+           <el-form-item label="包厢描述" prop="description">
+             <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入包厢描述"></editor>
+           </el-form-item>
+         </el-col>
 			</el-row>
       </el-form>
       <template #footer>
@@ -66,12 +67,17 @@ import { useDict } from '/@/hooks/dict';
 import { useMessage } from "/@/hooks/message";
 import { getObj, addObj, putObj } from '/@/api/canteen/boxesInfo'
 import { rule } from '/@/utils/validate';
+import {selectMerchantList} from "/@/api/canteen/merchantInfo";
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容
 const dataFormRef = ref();
 const visible = ref(false)
 const loading = ref(false)
+//业务变量
+// const merchantId = ref()
+const merchantStatus = ref(true)
+const merchantInfo = ref([])
 // 定义字典
 const { boxes_status } = useDict('boxes_status')
 
@@ -83,7 +89,7 @@ const form = reactive({
 	  description: '',
 	  address: '',
 	  images: '',
-	  status: '',
+	  status: '0',
 	  merchantId: '',
 });
 
@@ -109,6 +115,8 @@ const openDialog = (id: string) => {
     form.id = id
     getboxesInfoData(id)
   }
+  //初始化商户信息
+  merchantInit()
 };
 
 // 提交
@@ -140,9 +148,25 @@ const getboxesInfoData = (id: string) => {
     loading.value = false
   })
 };
+const merchantInit = async () => {
+  // 获取下拉框
+  let res = await selectMerchantList("1")
+  merchantInfo.value=res.data
+  //默认选中第一个
+  if (merchantInfo.value) {
+    if (merchantInfo.value.length > 1) {
+      merchantStatus.value = false
+    }else {
+      form.merchantId=merchantInfo.value[0].id
+    }
 
+
+  }
+}
 // 暴露变量
 defineExpose({
   openDialog
 });
-</script>
\ No newline at end of file
+
+
+</script>
diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue
index dada007..9c48d70 100644
--- a/src/views/canteen/canteenDailyMenu/index.vue
+++ b/src/views/canteen/canteenDailyMenu/index.vue
@@ -170,7 +170,7 @@ const selectTimeFood = async () => {
 }
 /** 删除数据源按钮 */
 const delteData = async (tid: number) => {
-    await message.delConfirm('确定删除菜品吗?')
+    await message.delConfirm("确定删除菜品吗？",'今日菜品?')
     await delObjs(tid)
     message.success(('common.delSuccess'))
     selectTimeFood()
@@ -218,12 +218,12 @@ const handleDelete = async (ids: string[]) => {
         merchantStatus.value = false
       }
       // getList()
+      fetchData()
 
     }
   }
   /** 初始化 **/
   onMounted(() => {
-    fetchData()
     merchantInit()
   })