Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/canteen/canteenDailyMenu/copyDialog.vue

@@ -61,7 +61,7 @@
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
 import type { FormInstance } from 'element-plus'
-import { pageJoin } from "/@/api/wallet/mch-manage"
+import { select } from "/@/api/wallet/mch-manage"
 import { useMessage } from "/@/hooks/message"
 import { copyMenu } from "/@/api/canteen/canteenDailyMenu"
 
@@ -87,7 +87,7 @@ const emit = defineEmits(['success'])
 // 获取商户列表
 const getMerchantList = async () => {
   try {
-    const res = await pageJoin({ current: 1, size: 9999, types: 1 })
+    const res = await select({ current: 1, size: 9999, types: 1 })
     merchantList.value = res.data.records
   } catch (error) {
     console.error('获取商户列表失败:', error)

src/views/canteen/canteenDailyMenu/index.vue

@@ -66,7 +66,7 @@
 					</div>
 				</tr>
 				<tr class="food">
-					<td v-if="!loading" class="text-center" @click="addFood(3)">晚餐</td>
+ 					<td v-if="!loading" class="text-center" @click="addFood(3)">晚餐</td>
 					<div class="food_list">
 						<td class="food_list_item" v-for="(item, index) in foodData3" :key="index" @click="delteData(item.tid)">
 							<el-image style="width: 80px; height: 80px" loading="lazy" :src="imageBaseUrl + item.picUrl" fit="cover" />