|
@@ -1,8 +1,9 @@
|
|
|
import axios from 'axios'
|
|
|
-import {ElLoading, ElMessage, ElMessageBox} from 'element-plus'
|
|
|
+import {ElMessage, ElMessageBox} from 'element-plus'
|
|
|
import Cookies from 'js-cookie'
|
|
|
import router from '@/router'
|
|
|
import store from '@/store'
|
|
|
+import {endLoading, startLoading} from "./loading";
|
|
|
|
|
|
const apiUrl = import.meta.env.VITE_BASE_URL
|
|
|
|
|
@@ -13,39 +14,17 @@ const service = axios.create({
|
|
|
})
|
|
|
|
|
|
/*axios请求拦截*/
|
|
|
-var loading
|
|
|
-
|
|
|
-/*开启遮罩*/
|
|
|
-function startLoading(showLoadingTime) {
|
|
|
- showLoadingTime = showLoadingTime || '2'
|
|
|
- loading = ElLoading.service({
|
|
|
- customClass: 'axios-loading' + showLoadingTime,
|
|
|
- lock: true,
|
|
|
- text: '加载中......',
|
|
|
- spinner: 'el-icon-loading',
|
|
|
- background: 'rgba(0, 0, 0, 0.7)',
|
|
|
- })
|
|
|
-}
|
|
|
-
|
|
|
-/*关闭遮罩*/
|
|
|
-function endLoading() {
|
|
|
- if (loading) {
|
|
|
- loading.close()
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-
|
|
|
service.interceptors.request.use(
|
|
|
(config) => {
|
|
|
- startLoading(1)
|
|
|
+ startLoading()
|
|
|
if (store.getters['user/token']) {
|
|
|
config.headers['token'] = store.state.user.token
|
|
|
}
|
|
|
- store.commit('app/setLoading', false)
|
|
|
+ //store.commit('app/setLoading', false)
|
|
|
return config
|
|
|
},
|
|
|
(error) => {
|
|
|
- store.commit('app/setLoading', false)
|
|
|
+ //store.commit('app/setLoading', false)
|
|
|
endLoading()
|
|
|
return Promise.reject(error)
|
|
|
}
|
|
@@ -53,7 +32,7 @@ service.interceptors.request.use(
|
|
|
|
|
|
service.interceptors.response.use(
|
|
|
(response) => {
|
|
|
- store.commit('app/setLoading', false)
|
|
|
+ //store.commit('app/setLoading', false)
|
|
|
endLoading()
|
|
|
if (response.data.code === 200 || response.data.code === 0) {
|
|
|
return response.data.data
|
|
@@ -113,7 +92,7 @@ service.interceptors.response.use(
|
|
|
},
|
|
|
(error) => {
|
|
|
endLoading()
|
|
|
- store.commit('app/setLoading', false)
|
|
|
+ //store.commit('app/setLoading', false)
|
|
|
ElMessage({
|
|
|
message: error,
|
|
|
type: 'error',
|