解决冲突

ZZJ

2022-07-28 abe3a86c15105f215992d78bcaaf9b51efa1d565

解决冲突

 vue.config.js

@@ -13,32 +13,10 @@
    // hotOnly: false, // 热更新
    proxy: {
      "/api": {
<<<<<<< HEAD
        // target: "http://192.168.20.10:7004",
<<<<<<< HEAD
        // target: "http://192.168.20.174:7070",
        target: "http://192.168.20.115:7070",
=======
=======
        //  target: "http://192.168.20.10:7009",
>>>>>>> gb18186
        target: "http://192.168.20.115:7070",
        // target: "http://192.168.20.235:7070",
>>>>>>> bug修复
        //  target: "http://192.168.20.117:7080",
        // secure: false,
        changeOrigin: true,
      },

      "/httpImage": {
        //target: "http://bsic.asuscomm.com:7003",
        // target: "http://222.128.87.51:7003",
        // target: "http://192.168.20.10:7009",
        // target: "http://192.168.20.189:7009",
<<<<<<< HEAD
=======
        // target: "http://192.168.20.235:7070",
>>>>>>> bug修复
        target: "http://192.168.20.115:7070",

        changeOrigin: true, //开启代理