Commit c97dfb98 by 姜雷

Merge branch 'develop' into test

parents 6aea37a3 4b5ff119
...@@ -111,11 +111,18 @@ Page({ ...@@ -111,11 +111,18 @@ Page({
.then((res: wx.RequestSuccessCallbackResult) => { .then((res: wx.RequestSuccessCallbackResult) => {
console.log(res); console.log(res);
return { return {
code: res.data.verifyCode, verifyCode: res.data.verifyCode,
cookie: res.header['Set-Cookie'], cookie: res.header['Set-Cookie'],
}; };
}) })
.then(({ vCode, cookie }: { vCode: string; cookie: string }) => { .then(
({
verifyCode,
cookie,
}: {
verifyCode: string;
cookie: string;
}) => {
let mixpwd = md5(pwd); let mixpwd = md5(pwd);
return systemFetch({ return systemFetch({
url: '/boss/login', url: '/boss/login',
...@@ -127,10 +134,11 @@ Page({ ...@@ -127,10 +134,11 @@ Page({
code, code,
account, account,
pwd: mixpwd, pwd: mixpwd,
varifyCode: vCode, varifyCode: verifyCode,
}, },
}); });
}) },
)
.then(res => { .then(res => {
console.log(res); console.log(res);
const { const {
......
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