From 307178d1ce581efa250ddd0ca69c7f5fc6cae02d Mon Sep 17 00:00:00 2001 From: Apple <> Date: Tue, 12 Jul 2022 10:48:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=9C=E5=83=8F=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/api.js | 41 ++++++++++++++++++------------------ src/pages/login/loginform.js | 2 +- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/assets/api.js b/src/assets/api.js index 5545ee11..81daec13 100644 --- a/src/assets/api.js +++ b/src/assets/api.js @@ -1,19 +1,18 @@ import { Notify } from 'zent' // export const baseurl = 'https://marketapi.1688sup.com' -window.baseurl = 'https://marketapi.1688sup.com' -const Version = 'v1.2.0' -let baseurl = '' -if (process.env.NODE_ENV == 'test' || process.env.NODE_ENV == 'development') { - // 测试环境 - baseurl = 'http://192.168.6.75' - window.baseurl = 'http://192.168.6.75' - // baseurl = 'http://192.168.6.116:8056' - // window.baseurl = 'http://192.168.6.116:8056' -} -if (process.env.NODE_ENV == 'production') { - // 生成环境 - baseurl = 'https://marketapi.1688sup.com' -} +// window.baseurl = 'https://marketapi.1688sup.com' +// const Version = 'v1.2.0' +window.baseurl = 'http://pre.marketapi.1688sup.com' +let baseurl = 'http://pre.marketapi.1688sup.com' +// if (process.env.NODE_ENV == 'test' || process.env.NODE_ENV == 'development') { +// // 测试环境 +// baseurl = 'http://192.168.6.75' +// window.baseurl = 'http://192.168.6.75' +// } +// if (process.env.NODE_ENV == 'production') { +// // 生成环境 +// baseurl = 'https://marketapi.1688sup.com' +// } // export let HOST = host; // export let API_URL = api_url; // export const baseurl = window.baseurl @@ -22,7 +21,7 @@ const upload = (method, url, params, responseType) => { method: method, headers: new Headers({ authorization: sessionStorage.getItem('authorization'), - Version: Version + // Version: Version }), body: params } @@ -64,7 +63,7 @@ const derive = (method, url, params, responseType) => { responseType: 'blob', headers: new Headers({ authorization: sessionStorage.getItem('authorization'), - Version: Version + // Version: Version }) } if (method == 'get') { @@ -120,7 +119,7 @@ const getData = (method, url, params, responseType) => { obj = { headers: new Headers({ authorization: sessionStorage.getItem('authorization'), - Version: Version + // Version: Version }) } if (params) { @@ -180,7 +179,7 @@ const req = (method, url, params, responseType) => { obj = { headers: new Headers({ authorization: sessionStorage.getItem('authorization'), - Version: Version + // Version: Version }) } if (params) { @@ -202,7 +201,7 @@ const req = (method, url, params, responseType) => { body: JSON.stringify(params), headers: new Headers({ 'Content-Type': 'application/json', - Version: Version + // Version: Version }) } } @@ -214,7 +213,7 @@ const req = (method, url, params, responseType) => { headers: new Headers({ 'Content-Type': 'application/json', authorization: sessionStorage.getItem('authorization'), - Version: Version + // Version: Version }) } } @@ -870,4 +869,4 @@ export const addFund = (data, id) => { return req('post', baseurl + `/codes/voucher/fund/${id}`, data) } -export { req } +export { req } \ No newline at end of file diff --git a/src/pages/login/loginform.js b/src/pages/login/loginform.js index b09d78f9..8cfc4f72 100644 --- a/src/pages/login/loginform.js +++ b/src/pages/login/loginform.js @@ -148,7 +148,7 @@ function FormDom(props) { console.log(145, window.baseurl); const xhr = new XMLHttpRequest(); xhr.open("GET", window.baseurl + "/auth/login/verify"); - xhr.setRequestHeader("Version", "v1.2.0"); + // xhr.setRequestHeader("Version", "v1.2.0"); xhr.responseType = "arraybuffer"; xhr.onreadystatechange = function (response) { response.header = {