Merge branch 'release/1226' into dev

# Conflicts:
#	src/assets/js/utils/request.js
This commit is contained in:
wangmingzhe
2019-12-26 15:07:35 +08:00

View File

@@ -10,7 +10,8 @@ let proposal = [
'/proposal/file/getFile', '/proposal/file/getFile',
'/proposal/proposal/deleteProposal' '/proposal/proposal/deleteProposal'
] //建议书 ] //建议书
let sale = ['/sale/order/orderList', '/sale/order/saveOrUpdateOrderInfo'] //在线投保
//入司
let agentEnter = [ let agentEnter = [
'/agent/enter/share', '/agent/enter/share',
'/agent/enter/query', '/agent/enter/query',
@@ -20,7 +21,8 @@ let agentEnter = [
'/agent/agreement/query', '/agent/agreement/query',
'/agent/agreement/signAgreement', '/agent/agreement/signAgreement',
'/agent/enter/query' '/agent/enter/query'
] //入司 ]
//理赔
let claims = [ let claims = [
`/claim/claimApply/progress`, `/claim/claimApply/progress`,
`/claim/claimApply/progressDetail`, `/claim/claimApply/progressDetail`,
@@ -31,8 +33,35 @@ let claims = [
`/claim/claimApply/query`, `/claim/claimApply/query`,
`/claim/claimApply/delete` `/claim/claimApply/delete`
] ]
//在线投保
let sale = [
'/sale/order/orderList',
'/sale/order/saveOrUpdateOrderInfo',
'/sale/order/orderList',
'/sale/order/deleteOrderInfo',
'/sale/product/getDetail',
'/sale/order/saveOrUpdateOrderInfo',
'/sale/order/orderDetail',
'/customer/authcode/loginedSend',
'/uploadImage',
'/customer/recognition',
'/sale/insure/underWrite',
'/sale/insure/acceptInsurance',
'/app/code/getCodeValue',
'/customer/token',
'/media/ebizSignInfo/sign',
'/sale/receiptSign/submit',
'/sale/order/orderDetail',
'/sale/record/check',
'/ppf/sign',
'/ppf/check',
'/sale/insure/selfToHuman',
'/sale/insure/orderPayStatusQuery'
]
let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims] let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims]
// let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale]
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
timeout: 66666666 // 请求超时时间 timeout: 66666666 // 请求超时时间