From 271664dfa5e7f69655aa673a68a02fbd55694701 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 24 Dec 2024 14:43:25 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env | 1 +
.env.development | 3 +-
src/views/supermarket/supermarketSpu/form.vue | 155 ++++++++----------
.../supermarket/supermarketSpu/index.vue | 53 ++----
4 files changed, 91 insertions(+), 121 deletions(-)
diff --git a/.env b/.env
index 26338c2..04fa698 100644
--- a/.env
+++ b/.env
@@ -15,6 +15,7 @@ VITE_API_URL = /api
# ADMIN 服务地址
VITE_ADMIN_PROXY_PATH = http://localhost:9999
+#VITE_ADMIN_PROXY_PATH = http://192.168.110.156:9999
# 前端加密密钥
VITE_PWD_ENC_KEY='pigxpigxpigxpigx'
diff --git a/.env.development b/.env.development
index 3d121f1..e8d4295 100644
--- a/.env.development
+++ b/.env.development
@@ -9,6 +9,7 @@ ENV = 'development'
# ADMIN 服务地址
VITE_ADMIN_PROXY_PATH = http://localhost:9999
+#VITE_ADMIN_PROXY_PATH = http://192.168.110.156:9999
# 代码生成服务地址
-VITE_GEN_PROXY_PATH = http://localhost:5003
\ No newline at end of file
+VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index bfc9351..7ccb335 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -27,36 +27,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
0
-
-
+
+
+
+ 0
+
+
+
+
-
-
+
+
@@ -68,7 +61,7 @@
-
+
{{ item.label }}
@@ -77,8 +70,8 @@
-
-
+
+
@@ -102,14 +95,6 @@
-
-
-
- 0
-
-
-
-
@@ -124,21 +109,29 @@
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+ 0
+
+
+
@@ -154,7 +147,7 @@
-
+
@@ -183,78 +176,72 @@
-
-
+
+
+
+
+
+
+
-
-
-
- 签名上锁
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 区管理库存
-
-
-
+
+
+
+
+
+
+
-
-
-
- 0
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
-
-
- 0
-
-
-
-
-
-
-
- 0
-
-
-
-
diff --git a/src/views/supermarket/supermarketSpu/index.vue b/src/views/supermarket/supermarketSpu/index.vue
index 808413c..d26ea64 100644
--- a/src/views/supermarket/supermarketSpu/index.vue
+++ b/src/views/supermarket/supermarketSpu/index.vue
@@ -35,7 +35,7 @@
@queryTable="getDataList">
-
@@ -45,51 +45,32 @@
-
-
-
-
-
-
-
+
+
+
-
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
{
useMessage().error(err.msg);
}
};
-
\ No newline at end of file
+
From 5ad181117701f4397e273bc0a4da01c89e84a928 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 25 Dec 2024 10:37:55 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9spu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/supermarket/supermarketSpu/form.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index 7ccb335..986cc39 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -77,13 +77,13 @@
-
+
-
+
From 3cdb54389e78ce2f5732194fbc22c99c997bee01 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 25 Dec 2024 13:07:34 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/stores/themeConfig.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/stores/themeConfig.ts b/src/stores/themeConfig.ts
index fa8f3e4..738551a 100644
--- a/src/stores/themeConfig.ts
+++ b/src/stores/themeConfig.ts
@@ -75,7 +75,7 @@ export const useThemeConfig = defineStore('themeConfig', {
* 界面显示
*/
// 是否开启侧边栏 Logo
- isShowLogo: true,
+ isShowLogo: false,
// 初始化变量，用于 el-scrollbar 的高度更新，请勿删除
isShowLogoChange: false,
// 是否开启 Breadcrumb，强制经典、横向布局不显示
@@ -125,7 +125,7 @@ export const useThemeConfig = defineStore('themeConfig', {
* 中的 `initSetLayoutChange(设置布局切换，重置主题样式)` 方法
*/
// 布局切换：可选值""，默认 defaults
- layout: 'classic',
+ layout: 'transverse',
/**
* 后端控制路由
From 89baf27c89f0bd07f29b935d86e4dd9a17d8a8fb Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 25 Dec 2024 16:01:10 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.prod | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 .env.prod
diff --git a/.env.prod b/.env.prod
new file mode 100644
index 0000000..ab3a7e0
--- /dev/null
+++ b/.env.prod
@@ -0,0 +1,14 @@
+# port 端口号
+VITE_PORT = 8888
+
+#浏览器自动打开
+VITE_OPEN = true
+
+# 本地环境
+ENV = 'development'
+
+# ADMIN 服务地址
+VITE_ADMIN_PROXY_PATH = http://192.168.110.156:9999
+
+# 代码生成服务地址
+VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
From 83b5f5fa283ff389fd9849f0ead17e454e6e7513 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 25 Dec 2024 16:10:12 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/package.json b/package.json
index 343c930..0b85dab 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
"scripts": {
"dev": "vite --force",
"build": "cross-env NODE_OPTIONS=--max-old-space-size=4096 vite build",
+ "build:prod": "cross-env NODE_OPTIONS=--max-old-space-size=4096 vite build",
"build:docker": "cross-env NODE_OPTIONS=--max-old-space-size=4096 vite build --outDir ./docker/dist/",
"lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",
"prettier": "prettier --write ."