From 2a431ace3a7b7dcdd313bb2fa0eff5bb727946f8 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 14:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen_standard/vite.config.js | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/screen_standard/vite.config.js b/screen_standard/vite.config.js
index 0d025d2..966fbbe 100644
--- a/screen_standard/vite.config.js
+++ b/screen_standard/vite.config.js
@@ -51,6 +51,10 @@
changeOrigin: true,
ws: false, // 鍏佽websocket浠ｇ悊
secure: false,
+<<<<<<< HEAD
+ rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/')
+ }
+=======
rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/'),
// rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
},
@@ -60,6 +64,7 @@
ws: false, // 鍏佽websocket浠ｇ悊
rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
}*/
+>>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10
}
}
}
--
Gitblit v1.9.3