Commit 43ce1b693b9cad2419ccb4c8759af803c5a4e93b

Authored by “wangming”
2 parents 19415acc 0ebd787b

Merge branch 'master' of http://39.98.150.180/antissoft/lvqianmeiye_ERP

antis-ncc-admin/.env.development
... ... @@ -2,8 +2,8 @@
2 2  
3 3 VUE_CLI_BABEL_TRANSPILE_MODULES = true
4 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 7 # VUE_APP_BASE_API = 'http://localhost:2011'
8 8 VUE_APP_IMG_API = ''
9 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 10 // 正式环境
11 11 production: {
12 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 15 // apiBaseUrl: 'http://lvqian.antissoft.com',
16 16 description: '生产环境服务器'
17 17 }
... ...