Merge branches 'master' and 'master' of https://gitee.com/lvYeJu/lane-crawford-3

src/utils/request.ts

@@ -8,12 +8,15 @@ import { useOverallStore } from '@/stores'
 
 
 // 创建axios实例
-console.log(import.meta.env.VITE_APP_URL,123)
+// console.log(import.meta.env,123)
+
 const service = axios.create({
-  // baseURL: import.meta.env.VITE_APP_URL, // api的base_url
 //   baseURL: import.meta.env.VITE_APP_URL, // api的base_url
   timeout: 20000, // 请求超时时间
 })
+if(import.meta.env.MODE != 'development'){
+  service.defaults.baseURL = import.meta.env.VITE_APP_URL
+}
 axios.defaults.headers.post["Content-Type"] = "application/json";
 axios.defaults.headers.post['lang'] = 'en';        //配置语言请求头
 axios.defaults.withCredentials = true;  //跨域携带cookie

src/views/Workshop/customize.vue

@@ -104,11 +104,11 @@
 			</div>
 			<div class="card">
 				<img :src="customizeInfo.tryOnUrl" />
-				<!-- <div class="select-box">
+				<div class="select-box">
 					<div class="icon"><SvgIcon name="history" size="35" /></div>
 					<div class="label">History</div>
 					<div class="icon"><SvgIcon name="xialajiantou" size="29" /></div>
-			</div> -->
+				</div>
 				<div class="icons">
 					<div @click="onLove">
 						<SvgIcon :name="`love_${customizeInfo.isFavorite ? 1 : 0}`" size="35" />

vite.config.ts

@@ -1,6 +1,6 @@
 import { fileURLToPath, URL } from 'node:url'
 
-import { defineConfig } from 'vite'
+import { defineConfig, loadEnv } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
@@ -14,7 +14,10 @@ import { VantResolver } from '@vant/auto-import-resolver'
 
 // https://vitejs.dev/config/
 
-export default defineConfig({
+export default defineConfig(({ mode }) => {
+	const env = loadEnv(mode, process.cwd())
+
+	return {
 		plugins: [
 			vue(),
 			DefineOptions(),
@@ -62,10 +65,11 @@ export default defineConfig({
 			proxy: {
 				'/api': {
 					//'/api'是自行设置的请求前缀
-        target: 'http://18.167.251.121:10095',
+					target: env.VITE_APP_URL,
 					changeOrigin: true, //用于控制请求头中的host值
 					rewrite: (path) => path.replace(/^\/api/, '/api') //路径重写，（正则）匹配以api开头的路径为空（将请求前缀删除）
 				}
 			}
 		}
+	}
 })