Merge branch 'GST002_H5' of http://182.92.169.222:3000/dlsx/ContestPortal into GST002_H5

 Conflicts:

	.env.production

.env.development

@@ -4,5 +4,5 @@ VITE_APP_TITLE = '教学一体化平台'
 VITE_APP_BASE_API = http://localhost:18085/jeecg-boot
 # VITE_APP_BASE_API = 'http://127.0.0.1:8080'
 VITE_APP_BASE_API_JEECG = '/student'
-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/#/home

src/main.ts

@@ -54,9 +54,9 @@ const ua = navigator.userAgent.toLowerCase()
 const isMobile = /iphone|android|ipad|mobile/.test(ua)
 if (isMobile) {
   console.log('手机端')
-  // location.href = import.meta.env.VITE_APP_MOBILE_URL
+  location.href = import.meta.env.VITE_APP_MOBILE_URL
 } else if (!isMobile) {
   console.log('电脑端')
-  // location.href = import.meta.env.VITE_APP_PC_URL
+  location.href = import.meta.env.VITE_APP_PC_URL
 
 }

src/views/raceInfo/index.vue

@@ -500,7 +500,7 @@ const scrollToPosition = () => {
           text-indent: 2em;
           line-height: 26px;
           margin-top: 15px;
-          height: 300px;
+          // height: 300px;
           color: var(--text-color);
         }
         .file {