From d79f65b4d72102ce2401dd9faf9173e1cd693bf1 Mon Sep 17 00:00:00 2001 From: lixin Date: Fri, 23 Nov 2018 13:57:41 +0800 Subject: [PATCH] lx --- src/utils/request.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 13b4ff36..b018dd26 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -10,14 +10,10 @@ export const name = `OP8888` export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx` export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx` const service = axios.create({ -<<<<<<< HEAD + // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, -======= - - baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - ->>>>>>> 3b215d048bf49b3019c70e80ff7dbd7ebd5869a4 + // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 })