Merge remote-tracking branch 'origin/master'

2019-05-09 00:13:28 +08:00 · 2019-05-09 00:13:28 +08:00 · 3c2fbc1594
commit 3c2fbc1594
parent f051d2f892 a187dbfdb5
2 changed files with 2 additions and 2 deletions
--- a/admin-web/config/proxy/proxy.dev.js
+++ b/admin-web/config/proxy/proxy.dev.js
@ -1,6 +1,6 @@
 // 开发环境，的代理配置

-export default {
+module.exports = {
  '/admin-api/': {
    target: 'http://127.0.0.1:18083/',
    // target: 'http://180.167.213.26:18083/',
--- a/admin-web/config/proxy/proxy.prod.js
+++ b/admin-web/config/proxy/proxy.prod.js
@ -1,6 +1,6 @@
 // production 配置文件

-export default {
+module.exports = {
  '/admin-api/': {
    target: 'http://api.shop.iocoder.cn:18099/admin-api',
    changeOrigin: true,