Merge branch 'dev' into 'master'

feat:接口请求超时时间改为半小时

See merge request !108

src/api/axios.ts

@@ -4,7 +4,7 @@ import { showError } from '@/utils/ui.ts'
 
 
 const axios = Axios.create({
 const axios = Axios.create({
   baseURL: import.meta.env.VITE_API_BASE,
   baseURL: import.meta.env.VITE_API_BASE,
-  timeout: 300000, //凯哥让改的超时时间
+  timeout: 30 * 60 * 1000, //半小时
 })
 })
 
 
 const TOKEN_KEY = 'token'
 const TOKEN_KEY = 'token'