From 89dea1f67efbda884a33d20ad12789bfc69536a9 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 11 六月 2026 16:47:22 +0800
Subject: [PATCH] Merge branch 'dev_pro_河南鹤壁' of http://114.132.189.42:9002/r/product-inventory-management into dev_pro_河南鹤壁
---
.env.development | 2 ++
multiple/assets/favicon/favicon.ico | 0
vite.config.js | 10 ++--------
multiple/assets/logo/Logo.png | 0
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/.env.development b/.env.development
index e3c6324..28b8042 100644
--- a/.env.development
+++ b/.env.development
@@ -6,3 +6,5 @@
# 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬩簩绾у椁愬寘/寮�鍙戠幆澧�
VITE_APP_BASE_API = '/dev-api'
+
+VITE_BASE_API = http://1.15.17.182:9048
diff --git a/multiple/assets/favicon/favicon.ico b/multiple/assets/favicon/favicon.ico
index 2fa05d5..bbfd0f9 100644
--- a/multiple/assets/favicon/favicon.ico
+++ b/multiple/assets/favicon/favicon.ico
Binary files differ
diff --git a/multiple/assets/logo/Logo.png b/multiple/assets/logo/Logo.png
index a5831b8..cd0a106 100644
--- a/multiple/assets/logo/Logo.png
+++ b/multiple/assets/logo/Logo.png
Binary files differ
diff --git a/vite.config.js b/vite.config.js
index fcc019d..14a32ce 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -6,14 +6,8 @@
export default defineConfig(({ mode, command }) => {
const env = loadEnv(mode, process.cwd());
const { VITE_APP_ENV } = env;
- const baseUrl =
- env.VITE_APP_ENV === "development"
- ? "http://1.15.17.182:9048"
- : env.VITE_BASE_API;
- const javaUrl =
- env.VITE_APP_ENV === "development"
- ? "http://1.15.17.182:9048"
- : env.VITE_JAVA_API;
+ const baseUrl = env.VITE_BASE_API;
+ const javaUrl = env.VITE_JAVA_API;
return {
define:{
__BASE_API__: JSON.stringify(javaUrl)
--
Gitblit v1.9.3