ysy 2 anni fa
parent
commit
409198a0a1
1 ha cambiato i file con 1 aggiunte e 5 eliminazioni
  1. 1 5
      vue.config.js

+ 1 - 5
vue.config.js

@@ -33,11 +33,7 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.147:18086',
-<<<<<<< HEAD
-        target: 'http://192.168.1.64:18086',
-=======
-        target: 'http://192.168.1.119:18086',
->>>>>>> e00b2c70b83a354da20fadfcb0334a5f5b41f425
+        target: 'http://192.168.1.125:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''