From 79497d7b05a437dedaa7b4a6675b8e7aa5f7b94b Mon Sep 17 00:00:00 2001 From: ctw <> Date: Tue, 7 Jan 2025 18:25:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=B8=8B=E6=8B=89=E9=80=89?= =?UTF-8?q?=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/components/Select/SelectMch.vue | 115 ++++---- src/views/canteen/boxesInfo/form.vue | 30 +-- src/views/canteen/canteenDailyMenu/index.vue | 20 +- .../canteen/canteenOnlineCategory/form.vue | 17 +- src/views/canteen/canteenOnlineSpu/form.vue | 17 +- src/views/canteen/merchantInfo/form.vue | 252 +++++++++--------- src/views/home/navMenu/index.vue | 2 +- 8 files changed, 209 insertions(+), 248 deletions(-) diff --git a/.env.development b/.env.development index 422dfe8..6208c19 100644 --- a/.env.development +++ b/.env.development @@ -10,10 +10,12 @@ ENV = 'development' # ADMIN 服务地址 # 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://192.168.101.24:9999/ # VITE_ADMIN_PROXY_PATH = http://localhost:9999 # 图片访问基础地址 -VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api +VITE_IMAGE_BASE_PATH = http://192.168.101.24:9999 +# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # VITE_IMAGE_BASE_PATH = http://localhost:9999 diff --git a/src/components/Select/SelectMch.vue b/src/components/Select/SelectMch.vue index c5a4b12..ab26d5c 100644 --- a/src/components/Select/SelectMch.vue +++ b/src/components/Select/SelectMch.vue @@ -1,73 +1,86 @@ \ No newline at end of file + diff --git a/src/views/canteen/boxesInfo/form.vue b/src/views/canteen/boxesInfo/form.vue index 206177c..aa5b34f 100644 --- a/src/views/canteen/boxesInfo/form.vue +++ b/src/views/canteen/boxesInfo/form.vue @@ -4,15 +4,7 @@ - - - + @@ -64,16 +56,12 @@ 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 merchantStatus = ref(true); -const merchantInfo = ref([]); // 定义字典 const { boxes_status } = useDict('boxes_status'); @@ -115,8 +103,6 @@ const openDialog = (id: string) => { form.id = id; getboxesInfoData(id); } - //初始化商户信息 - merchantInit(); }; // 提交 @@ -149,19 +135,7 @@ 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, diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue index ce1ff72..097fdb9 100644 --- a/src/views/canteen/canteenDailyMenu/index.vue +++ b/src/views/canteen/canteenDailyMenu/index.vue @@ -1,16 +1,9 @@