Commit 19486d4a by zhujian

'fix:合并分支冲突'

parent 60f2495b
......@@ -109,7 +109,7 @@
if (!code) {
postJSON('hades/anon/hades/getCorpTrainSuiteId', { corpType }, (res) => {
GetJSON('hades/anon/hades/getCorpTrainSuiteId', { }, (res) => {
const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${res.result}&redirect_uri=${encodeURIComponent(location.href)}&response_type=code&scope=snsapi_privateinfo&state=STATE#wechat_redirect`
location.href = url
})
......@@ -134,11 +134,31 @@
}
function postJSON(url, data, callback) {
function GetJSON(url, data, callback) {
const ajaxOptions = {
data: JSON.stringify(data),
type: 'GET',
url: BASIC_HOST_MAP[env] + url + `?corpType=${corpType}`,
url: BASIC_HOST_MAP[env] + url+`?corpType=${corpType}`,
contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
timeout: 20000,
success(res, status, xhr) {
callback(res)
},
};
$.ajax(ajaxOptions)
}
function postJSON(url, data, callback) {
const ajaxOptions = {
data: JSON.stringify(data),
type: 'POST',
url: BASIC_HOST_MAP[env] + url,
contentType: 'application/json; charset=UTF-8',
timeout: 20000,
dataType: 'json',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment