|
|
@ -208,17 +208,19 @@ |
|
|
|
let setting; |
|
|
|
try{setting = await uniGetSetting({})}catch(err){console.error(err)}; |
|
|
|
if(setting&&setting.authSetting&&setting.authSetting['scope.userInfo'] === true){ |
|
|
|
|
|
|
|
let [ loginRes, userRes ] = await Promise.all([uniLogin(), uniGetUserInfo()]); |
|
|
|
|
|
|
|
let [ loginRes, userRes ] = await Promise.all([uniLogin(), uniGetUserInfo({lang: 'zh_CN'})]); |
|
|
|
console.log(userRes) |
|
|
|
return servers.post({ |
|
|
|
url: API.wechatMiniAppLoginAndSync, |
|
|
|
data: { |
|
|
|
appid: APPID, |
|
|
|
code: loginRes.code, |
|
|
|
encryptedData: userRes.encryptedData, |
|
|
|
iv: userRes.iv, |
|
|
|
is_details: 1, |
|
|
|
// is_details: 1, |
|
|
|
// 后端解密错误,直接传用户信息 |
|
|
|
user_info: userRes.userInfo, |
|
|
|
user_raw_data: userRes.rawData, |
|
|
|
...userRes.userInfo, |
|
|
|
}, |
|
|
|
isDefaultGet: false, |
|
|
|
}) |
|
|
@ -269,16 +271,17 @@ |
|
|
|
return util.showNone('获取登陆凭证失败!稍后重试'); |
|
|
|
} |
|
|
|
|
|
|
|
util.showLoad(); |
|
|
|
|
|
|
|
servers.post({ |
|
|
|
url: API.wechatMiniAppLoginAndSync, |
|
|
|
data: { |
|
|
|
appid: APPID, |
|
|
|
code: loginRes.code, |
|
|
|
encryptedData: userRes.detail.encryptedData, |
|
|
|
iv: userRes.detail.iv, |
|
|
|
is_details: 1, |
|
|
|
// is_details: 1, |
|
|
|
// 后端解密错误,直接传用户信息 |
|
|
|
user_info: userRes.detail.userInfo, |
|
|
|
user_raw_data: userRes.detail.rawData, |
|
|
|
...userRes.detail.userInfo, |
|
|
|
// 'avatar_url': userRes.detail.userInfo.avatarUrl, |
|
|
|
// ...userRes.detail.userInfo, |
|
|
|
}, |
|
|
|