From a3d2e19d7c969eeca5cbfbe29c439041e8f148aa Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 28 八月 2023 09:21:05 +0800
Subject: [PATCH] 配置

---
 screen_standard/vite.config.js |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/screen_standard/vite.config.js b/screen_standard/vite.config.js
index 722a9a4..bf4e9bc 100644
--- a/screen_standard/vite.config.js
+++ b/screen_standard/vite.config.js
@@ -53,20 +53,8 @@
           changeOrigin: true,
           ws: false,  // 鍏佽websocket浠g悊
           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鏇挎崲涓虹┖
-        },
-        /*'/api' : {
-          target: env.VITE_BASE_URL, // 閫氳繃浠g悊鎺ュ彛璁块棶瀹為檯鍦板潃銆傝繖閲屾槸瀹為檯璁块棶鐨勫湴鍧�銆倂ue浼氶�氳繃浠g悊鏈嶅姟鍣ㄦ潵浠g悊璇锋眰
-          changeOrigin: true,
-          ws: false,  // 鍏佽websocket浠g悊
-          rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
-        }*/
->>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10
       }
     }
   }

--
Gitblit v1.9.3