From cdf99bcf94089d27daf45e19be604acf8a3417d5 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 7 Jan 2025 10:45:15 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E9=83=A8=E5=88=86=E8=A1=A8=E5=8D=95=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 8 ++---
.../components/supermarketUnit/form.vue | 33 ++++++++++++++++---
src/views/supermarket/supermarketSpu/form.vue | 16 ---------
vite.config.ts | 14 ++++----
4 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/.env.development b/.env.development
index e0df6a1..2b6d25d 100644
--- a/.env.development
+++ b/.env.development
@@ -8,12 +8,12 @@ VITE_OPEN = true
ENV = 'development'
# ADMIN 服务地址
-# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
-VITE_ADMIN_PROXY_PATH = http://localhost:9999
+VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
+# VITE_ADMIN_PROXY_PATH = http://localhost:9999
# 图片访问基础地址
-# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
-VITE_IMAGE_BASE_PATH = http://localhost:9999
+VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
+# VITE_IMAGE_BASE_PATH = http://localhost:9999
# 代码生成服务地址
VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
diff --git a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
index d4c8ee0..4e7f86a 100644
--- a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
+++ b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
@@ -35,11 +35,29 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -71,6 +89,10 @@ const form = reactive({
unit: '',
status: '',
packageNum: 0,
+ purchasePrice: '',
+ retailPrice: '',
+ promotionPrice: '',
+ costPrice: '',
});
// 定义校验规则
@@ -80,7 +102,8 @@ const dataRules = ref({
unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
packageNum: [{ required: true, message: '内装数量不能为空', trigger: 'blur' }],
- spuId: [{ required: true, message: 'spuId不能为空', trigger: 'blur' }],
+ purchasePrice: [{ required: true, message: '进价不能为空', trigger: 'blur' }],
+ retailPrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }],
});
// 打开弹窗
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index a0d69d1..ad8eb77 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -294,20 +294,6 @@ const getsupermarketSpuData = (id: string) => {
.finally(() => {
loading.value = false;
});
- getSupermarketUnit(id)
- .then((res: any) => {
- form.supermarketUnitEntityList = res.data;
- })
- .finally(() => {
- loading.value = false;
- });
- getSupermarketAuxiliaryCode(id)
- .then((res: any) => {
- form.supermarketAuxiliaryCodeEntityList = res.data;
- })
- .finally(() => {
- loading.value = false;
- });
};
// 打开弹窗
@@ -315,8 +301,6 @@ const openDialog = async (id: string) => {
visible.value = true;
currentTabPaneIndex.value = 0;
form.id = '';
- form.supermarketUnitEntityList = [];
- form.supermarketAuxiliaryCodeEntityList = [];
// 重置表单数据
dataFormRef.value?.resetFields();
diff --git a/vite.config.ts b/vite.config.ts
index 759a73a..8fbe8e0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -9,8 +9,8 @@ import viteCompression from 'vite-plugin-compression';
// @ts-ignore
import { svgBuilder } from '/@/components/IconSelector/index';
-import dns from 'node:dns'
-dns.setDefaultResultOrder('verbatim')
+import dns from 'node:dns';
+dns.setDefaultResultOrder('verbatim');
const pathResolve = (dir: string) => {
return resolve(__dirname, '.', dir);
@@ -24,7 +24,7 @@ const alias: Record = {
const viteConfig = defineConfig((mode: ConfigEnv) => {
const env = loadEnv(mode.mode, process.cwd());
// 判断是否开发环境
- const isDev = env.ENV === 'development'
+ const isDev = env.ENV === 'development';
return {
plugins: [
vue(), // Vue 插件
@@ -77,18 +77,18 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
},
},
build: {
- outDir: 'dist', // 打包输出目录
+ outDir: 'dist', // 打包输出目录//
chunkSizeWarningLimit: 1500, // 代码分包阈值
// 开发使用 esbuild 更快，生产环境打包使用 terser 可以删除更多注释
- minify: isDev ? 'esbuild' : 'terser',
+ minify: isDev ? 'esbuild' : 'terser',
terserOptions: {
compress: {
drop_console: true, // 删除 console
drop_debugger: true, // 删除 debugger
},
format: {
- comments: false // 删除所有注释
- }
+ comments: false, // 删除所有注释
+ },
},
rollupOptions: {
output: {
From d744b188d067508c56c966931ea57715eadb1d11 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 7 Jan 2025 10:47:13 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/supermarket/supermarketSpu/form.vue | 70 +++++++++----------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index a0d69d1..44d11c0 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -114,36 +114,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -156,11 +156,11 @@
-
-
-
-
-
+
+
+
+
+
From 3e0b0bbe8f58c364234bcf035b4fc4813911cf28 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 7 Jan 2025 10:55:22 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=BF=85=E5=A1=AB=E9=A1=B9?=
=?UTF-8?q?=E6=9C=AA=E5=A1=AB=E5=86=99=E5=AE=8C=E6=95=B4=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/supermarket/supermarketSpu/form.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index ad8eb77..45fc134 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -352,6 +352,7 @@ const onSubmit = async () => {
console.log(form);
const valid = await dataFormRef.value.validate().catch(() => {});
+ if (!valid) useMessage().warning('基础信息必填项未填写完整');
if (!form.supermarketUnitEntityList || form.supermarketUnitEntityList.length <= 0) useMessage().warning('请添加包装单位');
if (!form.supermarketAuxiliaryCodeEntityList || form.supermarketAuxiliaryCodeEntityList.length <= 0) useMessage().warning('请添加辅助条码');
if (!valid) return false;
From f7ba21ac8f7258c18fdbf8ca02b53962efaf8cc8 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 7 Jan 2025 13:06:47 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E5=95=86?=
=?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/supermarket/supermarketSpu/form.vue | 80 +++++++++----------
1 file changed, 39 insertions(+), 41 deletions(-)
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index fd36bde..48d9007 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -110,40 +110,40 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -156,11 +156,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -207,9 +207,7 @@
import { useDict } from '/@/hooks/dict';
import { useMessage } from '/@/hooks/message';
import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from '/@/api/supermarket/supermarketSpu';
-import { getObj as getSupermarketUnit } from '/@/api/supermarket/supermarketUnit';
-import { getObj as getSupermarketAuxiliaryCode } from '/@/api/supermarket/supermarketAuxiliaryCode';
-import { fetchList } from '/@/api/supermarketerp/smErpSupplier';
+import { getSupplierTypeOptions } from '/@/api/supermarketerp/smErpSupplier';
import { rule } from '/@/utils/validate';
import supermarketAuxiliaryCode from './components/supermarketAuxiliaryCode/index.vue';
import supermarketUnit from './components/supermarketUnit/index.vue';
@@ -334,8 +332,8 @@ const openDialog = async (id: string) => {
// 获取货商选项
if (supplierOptions.value.length <= 0) {
try {
- const res = await fetchList();
- supplierOptions.value = res.data.records;
+ const res = await getSupplierTypeOptions();
+ supplierOptions.value = res.data;
} catch (error) {
supplierOptions.value = [];
}
From d9e5d86a68c3cd6d500b3d13d41255dbfa484b2d Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 7 Jan 2025 14:24:16 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 8 +-
.../canteen/canteenOnlineCategory/form.vue | 40 ++++----
.../canteen/canteenOnlineCategory/index.vue | 9 +-
src/views/canteen/canteenOnlineSpu/form.vue | 99 ++++++-------------
src/views/canteen/canteenOnlineSpu/index.vue | 22 ++---
5 files changed, 66 insertions(+), 112 deletions(-)
diff --git a/.env.development b/.env.development
index 2b6d25d..4bc442c 100644
--- a/.env.development
+++ b/.env.development
@@ -8,12 +8,12 @@ VITE_OPEN = true
ENV = 'development'
# ADMIN 服务地址
-VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
-# VITE_ADMIN_PROXY_PATH = http://localhost:9999
+#VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
+ VITE_ADMIN_PROXY_PATH = http://localhost:9999
# 图片访问基础地址
-VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
-# VITE_IMAGE_BASE_PATH = http://localhost:9999
+#VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
+ VITE_IMAGE_BASE_PATH = http://localhost:9999
# 代码生成服务地址
VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
diff --git a/src/views/canteen/canteenOnlineCategory/form.vue b/src/views/canteen/canteenOnlineCategory/form.vue
index 8401510..d9a8266 100644
--- a/src/views/canteen/canteenOnlineCategory/form.vue
+++ b/src/views/canteen/canteenOnlineCategory/form.vue
@@ -3,11 +3,11 @@
:close-on-click-modal="false" draggable>
-
-
-
-
-
+
+
+
+
+
@@ -15,7 +15,7 @@
-
+
@@ -23,23 +23,23 @@
-
+
-
-
-
- 开启状态
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -133,4 +133,4 @@ const getcanteenOnlineCategoryData = (id: string) => {
defineExpose({
openDialog
});
-
\ No newline at end of file
+
diff --git a/src/views/canteen/canteenOnlineCategory/index.vue b/src/views/canteen/canteenOnlineCategory/index.vue
index a2d5e63..9bfe42e 100644
--- a/src/views/canteen/canteenOnlineCategory/index.vue
+++ b/src/views/canteen/canteenOnlineCategory/index.vue
@@ -29,18 +29,17 @@
@queryTable="getDataList">
-
-
-
-
+
+
{
useMessage().error(err.msg);
}
};
-
\ No newline at end of file
+
diff --git a/src/views/canteen/canteenOnlineSpu/form.vue b/src/views/canteen/canteenOnlineSpu/form.vue
index 29a02ad..0e8cf8c 100644
--- a/src/views/canteen/canteenOnlineSpu/form.vue
+++ b/src/views/canteen/canteenOnlineSpu/form.vue
@@ -3,6 +3,12 @@
:close-on-click-modal="false" draggable>
+
+
+
+
+
+
@@ -10,35 +16,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
0
+
+
+
+
+
-
+
-
-
+
+
@@ -50,7 +47,7 @@
-
+
{{ item.label }}
@@ -59,14 +56,8 @@
-
-
-
-
-
-
-
-
+
+
@@ -76,42 +67,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -163,8 +128,8 @@ const form = reactive({
const dataRules = ref({
name: [{required: true, message: '商品名称不能为空', trigger: 'blur'}],
picUrl: [{required: true, message: '商品封面图不能为空', trigger: 'blur'}],
- price: [{required: true, message: '商品价格，单位使用：分不能为空', trigger: 'blur'}],
- marketPrice: [{required: true, message: '市场价，单位使用：分不能为空', trigger: 'blur'}],
+ price: [{required: true, message: '商品价格', trigger: 'blur'}],
+ marketPrice: [{required: true, message: '市场价', trigger: 'blur'}],
stock: [{ validator: rule.number, trigger: 'blur' }],
})
@@ -219,4 +184,4 @@ const getcanteenOnlineSpuData = (id: string) => {
defineExpose({
openDialog
});
-
\ No newline at end of file
+
diff --git a/src/views/canteen/canteenOnlineSpu/index.vue b/src/views/canteen/canteenOnlineSpu/index.vue
index b97dc34..39e9bfa 100644
--- a/src/views/canteen/canteenOnlineSpu/index.vue
+++ b/src/views/canteen/canteenOnlineSpu/index.vue
@@ -34,35 +34,25 @@
@queryTable="getDataList">
-
-
-
-
+
-
-
+
-
-
+
+
-
-
-
-
-
@@ -152,4 +142,4 @@ const handleDelete = async (ids: string[]) => {
useMessage().error(err.msg);
}
};
-
\ No newline at end of file
+
From 965ed6f25006d1b1bce23336fd440deb7d803585 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 7 Jan 2025 14:31:58 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/canteen/canteenOnlineSpu/form.vue | 33 +++++++++++----------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/views/canteen/canteenOnlineSpu/form.vue b/src/views/canteen/canteenOnlineSpu/form.vue
index 0e8cf8c..f185a80 100644
--- a/src/views/canteen/canteenOnlineSpu/form.vue
+++ b/src/views/canteen/canteenOnlineSpu/form.vue
@@ -22,12 +22,22 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
-
@@ -42,7 +52,7 @@
-
+
@@ -55,17 +65,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -112,7 +111,7 @@ const form = reactive({
picUrl: '',
sliderPicUrls: '',
sort: '',
- status: '',
+ status: '0',
price: '',
marketPrice: '',
stock: '',
@@ -130,7 +129,9 @@ const dataRules = ref({
picUrl: [{required: true, message: '商品封面图不能为空', trigger: 'blur'}],
price: [{required: true, message: '商品价格', trigger: 'blur'}],
marketPrice: [{required: true, message: '市场价', trigger: 'blur'}],
- stock: [{ validator: rule.number, trigger: 'blur' }],
+ stock: [{ required: true,message: '请输入库存数量',trigger: 'blur' }],
+ status: [{required: true, message: '请勾选上下架', trigger: 'blur'}],
+
})
// 打开弹窗
From ffeb7e71b7a763a61ac43a28c795cf35d6f45845 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 7 Jan 2025 14:38:39 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E8=8F=9C=E8=B0=B1->?=
=?UTF-8?q?=E8=8F=9C=E5=93=81=E5=88=97=E8=A1=A8->=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=95=86=E6=88=B7=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 3 +-
src/views/canteen/canteenSpu/form.vue | 83 ++++++++++++++++-----------
2 files changed, 53 insertions(+), 33 deletions(-)
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 @@
+
+
+
+
+
+
+
-
+
@@ -21,17 +28,17 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -65,23 +72,23 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -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([]); // 商户信息
// 提交表单数据
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([]); // 商品分类树
onMounted(async () => {
const data = await getAllSimple();
categoryList.value = data.data;
From a8c78d19dda2316a4cf7d944db80f60c74061b1c Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 7 Jan 2025 14:49:04 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E7=82=B9=E9=A4=90-?=
=?UTF-8?q?=E8=8F=9C=E5=93=81=E5=88=97=E8=A1=A8-=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 5 +-
src/views/canteen/canteenOnlineSpu/form.vue | 278 ++++++++++----------
2 files changed, 147 insertions(+), 136 deletions(-)
diff --git a/.env.development b/.env.development
index 2e92776..a4aba57 100644
--- a/.env.development
+++ b/.env.development
@@ -13,8 +13,9 @@ VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
# VITE_ADMIN_PROXY_PATH = http://localhost:9999
# 图片访问基础地址
-#VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
- VITE_IMAGE_BASE_PATH = http://localhost: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
# 代码生成服务地址
VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
diff --git a/src/views/canteen/canteenOnlineSpu/form.vue b/src/views/canteen/canteenOnlineSpu/form.vue
index f185a80..1ca7793 100644
--- a/src/views/canteen/canteenOnlineSpu/form.vue
+++ b/src/views/canteen/canteenOnlineSpu/form.vue
@@ -1,154 +1,163 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 0
+
+
+
-
-
-
- 0
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+ {{ item.label }}
+
+
+
-
-
-
- {{ item.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
From 8aeed03d5c7471bb5bce032cda9b4e8ee3331c74 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 7 Jan 2025 14:55:06 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E7=82=B9=E9=A4=90-?=
=?UTF-8?q?=E8=8F=9C=E5=93=81=E5=88=86=E7=B1=BB-=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=95=86=E6=88=B7=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../canteen/canteenOnlineCategory/form.vue | 188 ++++++++++--------
1 file changed, 105 insertions(+), 83 deletions(-)
diff --git a/src/views/canteen/canteenOnlineCategory/form.vue b/src/views/canteen/canteenOnlineCategory/form.vue
index d9a8266..0bde02a 100644
--- a/src/views/canteen/canteenOnlineCategory/form.vue
+++ b/src/views/canteen/canteenOnlineCategory/form.vue
@@ -1,102 +1,123 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
From f0c6056e57848956ad852ba730af5df51accb9c5 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 7 Jan 2025 15:21:38 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supermarketSpu/components/supermarketUnit/form.vue | 4 ++--
.../supermarketSpu/components/supermarketUnit/index.vue | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
index 4e7f86a..07acd9d 100644
--- a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
+++ b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
@@ -36,13 +36,13 @@
-
+
-
+
diff --git a/src/views/supermarket/supermarketSpu/components/supermarketUnit/index.vue b/src/views/supermarket/supermarketSpu/components/supermarketUnit/index.vue
index fbf3a8f..7b4ad08 100644
--- a/src/views/supermarket/supermarketSpu/components/supermarketUnit/index.vue
+++ b/src/views/supermarket/supermarketSpu/components/supermarketUnit/index.vue
@@ -67,8 +67,8 @@
-
-
+
+