Commit 43ce1b693b9cad2419ccb4c8759af803c5a4e93b
Merge branch 'master' of http://39.98.150.180/antissoft/lvqianmeiye_ERP
Showing
2 changed files
with
4 additions
and
4 deletions
antis-ncc-admin/.env.development
| @@ -2,8 +2,8 @@ | @@ -2,8 +2,8 @@ | ||
| 2 | 2 | ||
| 3 | VUE_CLI_BABEL_TRANSPILE_MODULES = true | 3 | VUE_CLI_BABEL_TRANSPILE_MODULES = true |
| 4 | # VUE_APP_BASE_API = 'https://erp.lvqianmeiye.com' | 4 | # VUE_APP_BASE_API = 'https://erp.lvqianmeiye.com' |
| 5 | -# VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com' | ||
| 6 | -VUE_APP_BASE_API = 'http://localhost:2011' | 5 | +VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com' |
| 6 | +# VUE_APP_BASE_API = 'http://localhost:2011' | ||
| 7 | # VUE_APP_BASE_API = 'http://localhost:2011' | 7 | # VUE_APP_BASE_API = 'http://localhost:2011' |
| 8 | VUE_APP_IMG_API = '' | 8 | VUE_APP_IMG_API = '' |
| 9 | VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket' | 9 | VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket' |
绿纤uni-app/common/config.js
| @@ -10,8 +10,8 @@ const ENV_CONFIG = { | @@ -10,8 +10,8 @@ const ENV_CONFIG = { | ||
| 10 | // 正式环境 | 10 | // 正式环境 |
| 11 | production: { | 11 | production: { |
| 12 | name: '正式环境', | 12 | name: '正式环境', |
| 13 | - // apiBaseUrl: 'http://erp_test.lvqianmeiye.com', | ||
| 14 | - apiBaseUrl: 'https://erp.lvqianmeiye.com', | 13 | + apiBaseUrl: 'http://erp_test.lvqianmeiye.com', |
| 14 | + // apiBaseUrl: 'https://erp.lvqianmeiye.com', | ||
| 15 | // apiBaseUrl: 'http://lvqian.antissoft.com', | 15 | // apiBaseUrl: 'http://lvqian.antissoft.com', |
| 16 | description: '生产环境服务器' | 16 | description: '生产环境服务器' |
| 17 | } | 17 | } |