Merge branch 'nbs' into release/0401

# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/config/index.js
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
This commit is contained in:
阳华祥
2020-04-01 15:25:33 +08:00
26 changed files with 5863 additions and 3088 deletions

View File

@@ -11,7 +11,7 @@ let apiDomain, imgDomain, assetsUrl, mainUrl, payUrl, zssqUrl // 保融支付的
console.log('环境:', process.env.VUE_APP_FLAG)
switch (process.env.VUE_APP_FLAG) {
case 'dev':
apiDomain = 'http://139.199.50.151:7000/api/v1' // 国富api
apiDomain = 'http://139.199.50.151:7000/api/v1' // 国富api ///api/v1
imgDomain = 'http://211.159.248.123:7012/updown' // dev
// 静态服务资源
assetsUrl = 'http://139.199.50.151:8000/app/'