From 597934be2e8a71b0d3240452b8c3a59d460c0b72 Mon Sep 17 00:00:00 2001 From: zwq Date: Mon, 28 Feb 2022 10:58:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/vue.config.js b/vue.config.js index dee72d0..637215f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,18 +46,9 @@ module.exports = { // 这里写入需要代理的api和对应的目标地址 proxy: { '/api': { -<<<<<<< HEAD - target: 'http://localhost:8080', - // target: 'http://192.168.0.148:8080', -======= -<<<<<<< HEAD // target: 'http://localhost:8080', - target: 'http://192.168.0.148:8080', -======= // target: 'http://192.168.0.148:8080', target: 'http://a.wms.picaiba.com/api', ->>>>>>> 14bf2dc2f6d116f4005fe216e91bb59aa7ba338f ->>>>>>> develop // target: 'http://192.168.0.127:8080', // target: 'http://192.168.0.165:8080', // target: 'http://192.168.43.105:8080', -- 2.45.2