Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

.env.dev

@@ -9,5 +9,6 @@ VITE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 # VITE_APP_BASE_URL = 'http://192.168.31.118:5567'
 # 李天祥
 # VITE_APP_BASE_URL = 'http://192.168.31.82:5567'
+VITE_APP_BASE_URL = 'http://192.168.31.82:5569'
 # 海波
 # VITE_APP_BASE_URL = 'http://192.168.31.34:5567'

src/tool/https.js

@@ -24,13 +24,10 @@ import store from '@/store'
 // }else{
 // 	httpIp = ''
 // }
-let httpIp = import.meta.env.VITE_USER_NODE_ENV == 'development' ? '' : ''
+const isDev = import.meta.env.VITE_USER_NODE_ENV == 'development'
-// let httpIp = import.meta.env.VITE_USER_NODE_ENV == 'development' ? "https://192.168.1.8:10086" : "";
+const baseURL = isDev ? '' : import.meta.env.VITE_APP_BASE_URL
-
+axios.defaults.baseURL = baseURL; // isDev ? '' : import.meta.env.VITE_APP_BASE_URL; //配置接口地址
-axios.defaults.baseURL = httpIp //配置接口地址
+console.log(import.meta.env.VITE_APP_BASE_URL, baseURL)
-// console.log(axios.defaults.baseURL);
-axios.defaults.baseURL = import.meta.env.VITE_APP_BASE_URL //配置接口地址
-console.log(import.meta.env.VITE_APP_BASE_URL)
 
 // 创建取消令牌
 const CancelToken = axios.CancelToken

vite.config.js

@@ -11,7 +11,7 @@ import { ElementPlusResolver } from "unplugin-vue-components/resolvers";
 export default defineConfig(({ mode }) => {
   // 加载环境变量
   const env = loadEnv(mode, process.cwd(), "");
-	console.log(mode)
+  const baseURL = env.VITE_APP_BASE_URL
   return {
     resolve: {
       alias: {
@@ -89,8 +89,9 @@ export default defineConfig(({ mode }) => {
       },
       proxy: {
         "/api": {
-          target: "http://192.168.1.7:5567",
           // target: 'https://develop.api.aida.com.hk',
+          target: baseURL,
+          rewrite: (path) => path.replace(/^\/api/, "/aida/api"),
           changeOrigin: true,
         },
         "/xupei": {