FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mr.Z
2021-08-04 10:54:00 +08:00
parent 8662828688 53b2346c70
commit 85b3676dba
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/axios/index.js
+2 -2
View File
@@ -7,11 +7,11 @@ import axios from 'axios'
import router from '@/router' import router from '@/router'
import store from '@/store' import store from '@/store'
import {Message} from 'element-ui' import {Message} from 'element-ui'
import { baseUrl } from '@/sysConfig' import { serverUrl } from '@/sysConfig'
export const CancelToken = axios.CancelToken export const CancelToken = axios.CancelToken
// import 'element-ui/lib/theme-chalk/index.css' // import 'element-ui/lib/theme-chalk/index.css'
const _axios = axios.create({ const _axios = axios.create({
baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/' baseURL: process.env.NODE_ENV === 'production' ? serverUrl : '/'
}) })
/** /**
src/common/axiosV2/index.js
+2 -2
View File
@@ -2,7 +2,7 @@ import axios from 'axios'
import router from '@/router' import router from '@/router'
import store from '@/store' import store from '@/store'
import {Message} from 'element-ui' import {Message} from 'element-ui'
import { baseUrl } from '@/sysConfig' import { serverUrl } from '@/sysConfig'
// import 'element-ui/lib/theme-chalk/index.css' // import 'element-ui/lib/theme-chalk/index.css'
/** /**
@@ -19,7 +19,7 @@ let formData = (data) => {
} }
const service = axios.create({ const service = axios.create({
baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/' baseURL: process.env.NODE_ENV === 'production' ? serverUrl : '/'
}) })
service.defaults.timeout = 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 service.defaults.timeout = 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999