Merge remote-tracking branch 'origin/GST002' into GST002

# Conflicts: # src/main.ts
配置0519-2
2 changed files with 7 additions and 7 deletions
--- a/.env.production
+++ b/.env.production
@ -3,5 +3,5 @@ NODE_ENV = 'development'
 VITE_APP_TITLE = '高赛通单项目'
 VITE_APP_BASE_API = http://115.190.99.211:18086/jeecg-boot
 # VITE_APP_BASE_API = 'http://127.0.0.1:8080'
-VITE_APP_PC_URL = http://localhost:18085/jeecg-boot
-VITE_APP_MOBILE_URL = http://localhost:18085/jeecg-boot
+VITE_APP_PC_URL = http://115.190.99.211:803/#/home
+VITE_APP_MOBILE_URL = http://115.190.99.211:8030
--- a/src/main.ts
+++ b/src/main.ts
@ -50,6 +50,7 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 // 初始化主题
 const useThemeStore = themeStore()
 useThemeStore.initTheme()
+
 const ua = navigator.userAgent.toLowerCase()
 const isMobile = /iphone|android|ipad|mobile/.test(ua)

@ -66,4 +67,3 @@ if (isMobile && currentHost !== mobileHost) {
 }


-
Author	SHA1	Message	Date
喻忠伟	6c49d9df6a	Merge remote-tracking branch 'origin/GST002' into GST002 # Conflicts: # src/main.ts	2 weeks ago
喻忠伟	7754863402	配置0519-2	2 weeks ago
喻忠伟	9cbd57c6be	配置0519-1	2 weeks ago
喻忠伟	ba9b08668f	Merge branch 'GST002' of http://182.92.169.222:3000/dlsx/ContestPortal into GST002 Conflicts: src/main.ts	2 weeks ago
喻忠伟	e63c743b40	配置0519	2 weeks ago