diff --git a/.env.development b/.env.development
index 2b6d25d..116c0c3 100644
--- a/.env.development
+++ b/.env.development
@@ -8,7 +8,8 @@ VITE_OPEN = true
 ENV = 'development'
 
 # ADMIN 服务地址
-VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
+# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
+VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
 # VITE_ADMIN_PROXY_PATH = http://localhost:9999
 
 # 图片访问基础地址
diff --git a/src/views/canteen/canteenSpu/form.vue b/src/views/canteen/canteenSpu/form.vue
index 55c67db..6e9cc50 100644
--- a/src/views/canteen/canteenSpu/form.vue
+++ b/src/views/canteen/canteenSpu/form.vue
@@ -2,12 +2,19 @@
 	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :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="24" class="mb20">
+					<el-form-item label="商户" prop="merchantId">
+						<el-select v-model="form.merchantId" placeholder="请选择商户" style="width: 240px">
+							<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="8" class="mb20">
+				<el-col :span="12" class="mb20">
 					<el-form-item label="商品分类" prop="categoryId">
 						<el-select v-model="form.categoryId" placeholder="请选择商品分类">
 							<el-option placeholder="请选择商品分类" v-for="item in categoryList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
@@ -21,17 +28,17 @@
 						<upload-img v-model:imageUrl="form.picUrl"></upload-img>
 					</el-form-item>
 				</el-col>
-<!--				<el-col :span="12" class="mb20">-->
-<!--					<el-form-item label="商品简介" prop="introduction">-->
-<!--						<el-input type="textarea" v-model="form.introduction" placeholder="请输入商品简介" />-->
-<!--					</el-form-item>-->
-<!--				</el-col>-->
+				<!--				<el-col :span="12" class="mb20">-->
+				<!--					<el-form-item label="商品简介" prop="introduction">-->
+				<!--						<el-input type="textarea" v-model="form.introduction" placeholder="请输入商品简介" />-->
+				<!--					</el-form-item>-->
+				<!--				</el-col>-->
 
-<!--				<el-col :span="24" class="mb20">-->
-<!--					<el-form-item label="商品轮播图" prop="sliderPicUrls">-->
-<!--						<upload-imgs v-model:imageUrls="form.sliderPicUrls"></upload-imgs>-->
-<!--					</el-form-item>-->
-<!--				</el-col>-->
+				<!--				<el-col :span="24" class="mb20">-->
+				<!--					<el-form-item label="商品轮播图" prop="sliderPicUrls">-->
+				<!--						<upload-imgs v-model:imageUrls="form.sliderPicUrls"></upload-imgs>-->
+				<!--					</el-form-item>-->
+				<!--				</el-col>-->
 
 				<el-col :span="8" class="mb20">
 					<el-form-item label="排序" prop="sort">
@@ -65,23 +72,23 @@
 					</el-form-item>
 				</el-col>
 
-<!--				<el-col :span="8" class="mb20">-->
-<!--					<el-form-item label="赠送积分" prop="giveIntegral">-->
-<!--						<el-input v-model="form.giveIntegral" placeholder="请输入赠送积分" />-->
-<!--					</el-form-item>-->
-<!--				</el-col>-->
+				<!--				<el-col :span="8" class="mb20">-->
+				<!--					<el-form-item label="赠送积分" prop="giveIntegral">-->
+				<!--						<el-input v-model="form.giveIntegral" placeholder="请输入赠送积分" />-->
+				<!--					</el-form-item>-->
+				<!--				</el-col>-->
 
-<!--				<el-col :span="8" class="mb20">-->
-<!--					<el-form-item label="虚拟销量" prop="virtualSalesCount">-->
-<!--						<el-input v-model="form.virtualSalesCount" placeholder="请输入虚拟销量" />-->
-<!--					</el-form-item>-->
-<!--				</el-col>-->
+				<!--				<el-col :span="8" class="mb20">-->
+				<!--					<el-form-item label="虚拟销量" prop="virtualSalesCount">-->
+				<!--						<el-input v-model="form.virtualSalesCount" 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-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>
@@ -99,6 +106,7 @@ import { useMessage } from '/@/hooks/message';
 import { getObj, addObj, putObj } from '/@/api/canteen/canteenSpu';
 import { getAllSimple } from '/@/api/canteen/canteenCategory';
 import { rule } from '/@/utils/validate';
+import { selectMerchantList } from '/@/api/canteen/merchantInfo';
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容
@@ -107,10 +115,12 @@ const visible = ref(false);
 const loading = ref(false);
 // 定义字典
 const { spu_status } = useDict('spu_status');
+const merchantInfo = ref<any>([]); // 商户信息
 
 // 提交表单数据
 const form = reactive({
 	id: '',
+	merchantId: '',
 	name: '',
 	introduction: '',
 	description: '',
@@ -127,12 +137,12 @@ const form = reactive({
 	salesCount: '',
 	virtualSalesCount: '',
 	browseCount: '',
-	merchantId: '',
 	deptId: '',
 });
 
 // 定义校验规则
 const dataRules = ref({
+	merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
 	name: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
 	picUrl: [{ required: true, message: '商品封面图不能为空', trigger: 'blur' }],
 	sort: [{ validator: rule.number, trigger: 'blur' }],
@@ -146,14 +156,23 @@ const dataRules = ref({
 });
 
 // 打开弹窗
-const openDialog = (id: string) => {
+const openDialog = async (id: string) => {
 	visible.value = true;
 	form.id = '';
 
 	// 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+	dataFormRef.value?.resetFields();
+
+	if (merchantInfo.value.length <= 0) {
+		try {
+			// 获取商户下拉框选项
+			const res = await selectMerchantList('1');
+			merchantInfo.value = res.data;
+		} catch (error) {
+			merchantInfo.value = [];
+			loading.value = false;
+		}
+	}
 
 	// 获取canteenSpu信息
 	if (id) {
@@ -194,7 +213,7 @@ const getcanteenSpuData = (id: string) => {
 			loading.value = false;
 		});
 };
-const categoryList = ref([]); // 商品分类树
+const categoryList = ref<any>([]); // 商品分类树
 onMounted(async () => {
 	const data = await getAllSimple();
 	categoryList.value = data.data;