diff --git a/src/api/index.ts b/src/api/index.ts index 651fe50..382071c 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,9 +1,9 @@ import axios from 'axios' // import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' +import config from 'public/config/config.json' import router from '@/router/index' import useUserStore from '@/store/modules/user' -import config from 'public/config/config.json' // 错误码枚举 enum responseCode { @@ -27,7 +27,7 @@ const request = axios.create({ // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.NODE_ENV == 'production' ? config.baseUrl : import.meta.env.VITE_APP_API_BASEURL, - baseURL: process.env.NODE_ENV === 'development' ? import.meta.env.VITE_APP_API_BASEURL : config.baseUrl, + baseURL: config.baseUrl, timeout: 1000 * 60, responseType: 'json', }) diff --git a/src/api/index.ts b/src/api/index.ts index 651fe50..382071c 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,9 +1,9 @@ import axios from 'axios' // import qs from 'qs' import { ElLoading, ElMessage } from 'element-plus' +import config from 'public/config/config.json' import router from '@/router/index' import useUserStore from '@/store/modules/user' -import config from 'public/config/config.json' // 错误码枚举 enum responseCode { @@ -27,7 +27,7 @@ const request = axios.create({ // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL, // baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.NODE_ENV == 'production' ? config.baseUrl : import.meta.env.VITE_APP_API_BASEURL, - baseURL: process.env.NODE_ENV === 'development' ? import.meta.env.VITE_APP_API_BASEURL : config.baseUrl, + baseURL: config.baseUrl, timeout: 1000 * 60, responseType: 'json', }) diff --git a/src/main.ts b/src/main.ts index aaee575..e58e9ef 100644 --- a/src/main.ts +++ b/src/main.ts @@ -2,6 +2,7 @@ import ElementPlus from 'element-plus' import * as ElementPlusIconsVue from '@element-plus/icons-vue' import dayjs from 'dayjs' +import axios from 'axios' import App from './App.vue' import pinia from './store' import router from './router' @@ -17,30 +18,30 @@ import { hasPermission } from '@/utils/composables/permission' import buttonPerm from '@/utils/buttonPerm' import VueAMap from '@/components/aMap/aMap' -import axios from 'axios' import request from '@/api/index' -axios.get('./config/config.json').then(res =>{ - console.log('get config') - request.defaults.baseURL = process.env.NODE_ENV === 'development' ? import.meta.env.VITE_APP_API_BASEURL : res.data.baseUrl -}) - // 引入打印插件 if (useSettingsStore().app.iconifyOfflineUse) { downloadAndInstall() } -const app = createApp(App) -app.use(VueAMap) -// app.use($) -app.config.globalProperties.hasPerm = hasPermission -app.config.globalProperties.buttonPerm = buttonPerm -app.config.globalProperties.dayjs = dayjs -app.use(ElementPlus) -app.use(pinia) -app.use(router) -for (const [key, component] of Object.entries(ElementPlusIconsVue)) { - app.component(key, component) -} -directive(app) -app.mount('#app') +axios.get('./config/config.json').then((res) => { + console.log('get config') + request.defaults.baseURL = res.data.baseUrl + const app = createApp(App) + app.use(VueAMap) + // app.use($) + app.config.globalProperties.hasPerm = hasPermission + app.config.globalProperties.buttonPerm = buttonPerm + app.config.globalProperties.dayjs = dayjs + app.use(ElementPlus) + app.use(pinia) + app.use(router) + for (const [key, component] of Object.entries(ElementPlusIconsVue)) { + app.component(key, component) + } + directive(app) + + app.mount('#app') +}) +