config

vue.config.js

@@ -93,11 +93,7 @@ module.exports = {
         proxy: {
             // 开发环境变化可注释 ⬇️⬇️
             "/market/CMK": {
-<<<<<<< HEAD
-                target: "http://127.0.0.1:9113",
-=======
-                target: "http://192.168.3.25:9114",
->>>>>>> 926ddf4e003746cdcd9f1d90acf1eab279c1fa8f
+                target: "127.0.0.1:9113",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -105,11 +101,7 @@ module.exports = {
                 },
             },
             "/market/mk": {
-<<<<<<< HEAD
-                target: "http://127.0.0.1:9113",
-=======
-                target: "http://192.168.3.25:9114",
->>>>>>> 926ddf4e003746cdcd9f1d90acf1eab279c1fa8f
+                target: "127.0.0.1:9113",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -117,11 +109,7 @@ module.exports = {
                 },
             },
             "/market/techcentergj": {
-<<<<<<< HEAD
-                target: "http://127.0.0.1:9113",
-=======
-                target: "http://192.168.3.25:9114",
->>>>>>> 926ddf4e003746cdcd9f1d90acf1eab279c1fa8f
+                target: "127.0.0.1:9113",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -129,11 +117,7 @@ module.exports = {
                 },
             },
             "/mkWangge": {
-<<<<<<< HEAD
-                target: "http://127.0.0.1:9113",
-=======
-                target: "http://192.168.3.25:9114",
->>>>>>> 926ddf4e003746cdcd9f1d90acf1eab279c1fa8f
+                target: "127.0.0.1:9113",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -151,11 +135,7 @@ module.exports = {
                 // target: 'http://192.168.0.156:9600/',
                 // target: 'http://192.168.2.170:9600/',
                 // target: 'http://192.168.2.169:9600/',
-<<<<<<< HEAD
                 target: "http://127.0.0.1:9600",
-=======
-                target: "http://192.168.3.228:9600/spfm",
->>>>>>> 926ddf4e003746cdcd9f1d90acf1eab279c1fa8f
                 changeOrigin: true,
             },
         },