merge

config/dev.env.js

@@ -1,10 +1,18 @@
 /*
+<<<<<<< HEAD
  * @Author: gtz
  * @Date: 2021-11-19 10:10:51
  * @LastEditors: gtz
  * @LastEditTime: 2021-12-07 11:07:26
  * @Description: file content
  * @FilePath: \mt-qj-wms-ui\config\dev.env.js
+=======
+ * @Author: zwq
+ * @Date: 2021-11-15 08:20:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2021-12-06 15:34:11
+ * @Description:
+>>>>>>> master
  */
 'use strict'
 const merge = require('webpack-merge')
@@ -12,5 +20,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  OPEN_PROXY: false // 是否开启代理, 重置后需重启vue-cli
+  OPEN_PROXY: true // 是否开启代理, 重置后需重启vue-cli
 })

config/index.js

@@ -1,10 +1,18 @@
 /*
+<<<<<<< HEAD
  * @Author: gtz
  * @Date: 2021-11-19 10:10:51
  * @LastEditors: gtz
  * @LastEditTime: 2021-12-07 11:07:20
  * @Description: file content
  * @FilePath: \mt-qj-wms-ui\config\index.js
+=======
+ * @Author: zwq
+ * @Date: 2021-11-15 08:20:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2021-12-07 14:48:25
+ * @Description:
+>>>>>>> master
  */
 'use strict'
 // Template version: 1.2.5
@@ -22,10 +30,17 @@ module.exports = {
     // 代理列表, 是否开启代理通过[./dev.env.js]配置
     proxyTable: devEnv.OPEN_PROXY === false ? {} : {
       '/proxyApi': {
+<<<<<<< HEAD
         target: 'http://192.168.0.109:8080/',
         changeOrigin: true,
         pathRewrite: {
           '^/proxyApi': ''
+=======
+        target: 'http://192.168.0.134:8080/',
+        changeOrigin: true,
+        pathRewrite: {
+          '^/proxyApi': '/api'
+>>>>>>> master
         }
       }
     },