提交

src/utils/axios.js

@@ -1,11 +1,8 @@
 import axios from 'axios';
 import QS from 'qs';
 import { goTologin } from '@/utils/util.js'
-<<<<<<< HEAD
 import {showFullScreenLoading,tryHideFullScreenLoading} from './loading'
-=======
 import store from '@/store/index';
->>>>>>> 542e853 (提交)
 
 axios.defaults.baseURL = 'https://app.gter.net'
 // axios.defaults.baseURL = '/index'