From b94ecf28da52fff02632de49f727eca66e144a30 Mon Sep 17 00:00:00 2001
From: gtz217 <535262213@qq.com>
Date: Wed, 8 Dec 2021 16:01:51 +0800
Subject: [PATCH] merge

---
 config/dev.env.js |  8 ++++++++
 config/index.js   | 12 ++++++++++--
 src/mock/index.js |  4 ++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/config/dev.env.js b/config/dev.env.js
index b6614db..1cc0c69 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -1,3 +1,11 @@
+/*
+ * @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
+ */
 'use strict'
 const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
diff --git a/config/index.js b/config/index.js
index b89e19f..5e8b261 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,3 +1,11 @@
+/*
+ * @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
+ */
 'use strict'
 // Template version: 1.2.5
 // see http://vuejs-templates.github.io/webpack for documentation.
@@ -14,10 +22,10 @@ module.exports = {
     // 代理列表, 是否开启代理通过[./dev.env.js]配置
     proxyTable: devEnv.OPEN_PROXY === false ? {} : {
       '/proxyApi': {
-        target: 'http://demo.renren.io/renren-fast/',
+        target: 'http://192.168.0.109:8080/',
         changeOrigin: true,
         pathRewrite: {
-          '^/proxyApi': '/'
+          '^/proxyApi': ''
         }
       }
     },
diff --git a/src/mock/index.js b/src/mock/index.js
index 9c5aa84..202963d 100644
--- a/src/mock/index.js
+++ b/src/mock/index.js
@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2021-11-15 08:20:28
- * @LastEditors: zwq
- * @LastEditTime: 2021-11-15 17:17:47
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-07 11:07:41
  * @Description:
  */
 import Mock from 'mockjs'