Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev

# Conflicts:
#	src/assets/js/utils/request.js
#	src/views/ebiz/manpower/Training.vue
#	src/views/ebiz/sale/List.vue
This commit is contained in:
yang.huaxiang
2020-11-14 15:39:49 +08:00
8 changed files with 429 additions and 17 deletions

View File

@@ -131,7 +131,7 @@ service.interceptors.request.use(
/**
* 请求拦截处理(待添加 判断走统一网关处理)
*/
if (config.url && /api\/$/.test(config.url.split(configApp.API_VERSION)[0])) {
if (configApp.API_VERSION == 'v2' && config.url && /api\/$/.test(config.url.split(configApp.API_VERSION)[0])) {
if (!config.data || config.data == null) {
config.data = {}
}
@@ -163,6 +163,7 @@ service.interceptors.response.use(
console.log('----------------')
let res = response.data
if (
configApp.API_VERSION == 'v2' &&
response.config.url &&
response.headers['content-type'].match(/application\/json/) &&
/api\/$/.test(response.config.url.split(configApp.API_VERSION)[0])