Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/views/canteen/canteenCategory/form.vue

@@ -9,7 +9,13 @@
         <el-input v-model="form.name" placeholder="请输入分类名称"/>
       </el-form-item>
       </el-col>
-
+         <el-col :span="12" class="mb20">
+           <el-form-item label="餐段类型" prop="categoryType">
+             <el-select v-model="form.categoryType" placeholder="请选择餐段类型">
+               <el-option :value="item.value" :label="item.label" v-for="(item, index) in daily_menu" :key="index"></el-option>
+             </el-select>
+           </el-form-item>
+         </el-col>
     <el-col :span="24" class="mb20">
   <el-form-item label="分类图" prop="picUrl">
     <upload-img v-model="form.picUrl"></upload-img>
@@ -52,7 +58,7 @@ const dataFormRef = ref();
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
-
+const { daily_menu } = useDict('daily_menu')
 // 提交表单数据
 const form = reactive({
 		id:'',
@@ -64,13 +70,14 @@ const form = reactive({
 	  creator: '',
 	  updater: '',
 	  deleted: '',
-	  systemType: '',
 	  deptId: '',
+  categoryType: '',
 });
 
 // 定义校验规则
 const dataRules = ref({
         name: [{required: true, message: '分类名称不能为空', trigger: 'blur'}],
+        categoryType: [{required: true, message: '餐段类型不能为空', trigger: 'blur'}],
         sort: [{required: true, message: '分类排序不能为空', trigger: 'blur'}],
 })
 

src/views/canteen/canteenCategory/index.vue

@@ -36,6 +36,11 @@
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column type="index" label="#" width="40" />
           <el-table-column prop="name" label="分类名称"  show-overflow-tooltip/>
+        <el-table-column prop="categoryType" label="餐段类型" show-overflow-tooltip>
+          <template #default="scope">
+            <dict-tag :options="daily_menu" :value="scope.row.categoryType"></dict-tag>
+          </template>
+        </el-table-column>
           <el-table-column prop="picUrl" label="分类图"  show-overflow-tooltip/>
           <el-table-column prop="createBy" label="创建者"  show-overflow-tooltip/>
           <el-table-column prop="updateBy" label="更新者"  show-overflow-tooltip/>
@@ -66,7 +71,7 @@ import { useDict } from '/@/hooks/dict';
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 // 定义查询字典
-
+const { daily_menu } = useDict('daily_menu')
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量

src/views/canteen/canteenSpu/form.vue

@@ -196,10 +196,7 @@ const getcanteenSpuData = (id: string) => {
 };
 const categoryList = ref([]); // 商品分类树
 onMounted(async () => {
-	const params = {
-		systemType: 2,
-	};
-	const data = await getAllSimple(params);
+	const data = await getAllSimple();
 	categoryList.value = data.data;
 });
 // 暴露变量

src/views/canteen/merchantInfo/form.vue

@@ -34,20 +34,20 @@
       </el-col>
 
     <el-col :span="12" class="mb20">
-  <el-form-item label="商户logog" prop="logo">
-    <upload-img v-model="form.logo"></upload-img>
+  <el-form-item label="商户logo" prop="logo">
+    <upload-img v-model:imageUrl="form.logo"></upload-img>
   </el-form-item>
   </el-col>
 
-    <el-col :span="12" class="mb20">
-  <el-form-item label="商户收款二维码" prop="collectMoneyCode">
-    <upload-img v-model="form.collectMoneyCode"></upload-img>
-  </el-form-item>
-  </el-col>
+<!--    <el-col :span="12" class="mb20">-->
+<!--  <el-form-item label="商户收款二维码" prop="collectMoneyCode">-->
+<!--    <upload-img v-model:imageUrl="form.collectMoneyCode"></upload-img>-->
+<!--  </el-form-item>-->
+<!--  </el-col>-->
 
     <el-col :span="12" class="mb20">
   <el-form-item label="轮播图" prop="swiper">
-    <upload-img v-model="form.swiper"></upload-img>
+    <upload-img v-model:imageUrl="form.swiper"></upload-img>
   </el-form-item>
   </el-col>