Merge remote-tracking branch 'origin/main' into dev/chat

dev/chat
Lei OT 2 years ago
commit 58038b6fe2

@ -2,17 +2,15 @@ const KEY_USER_ID = 'KEY_USER_ID'
class Auth { class Auth {
constructor() { // {"errcode":0,"errmsg":"ok","result":{"nick":"廖一军","unionId":"j7cuUCplZe1ZiiqjQNUUmFwiEiE","avatarUrl":"https://static-legacy.dingtalk.com/media/lALPBDDrhXr716HNAoDNAoA_640_640.png","openId":"iioljiPmZ4RPoOYpkFiSn7IKAiEiE","mobile":"18777396951","stateCode":"86","email":"lyj@hainatravel.com","opisn":"383"}}
} userId = '383'
username = '廖一军'
// avatarUrl = 'https://static-legacy.dingtalk.com/media/lALPBDDrhXr716HNAoDNAoA_640_640.png'
stateCode = '86'
// loginUser: email = 'lyj@hainatravel.com'
openId = 'iioljiPmZ4RPoOYpkFiSn7IKAiEiE'
// HT 账号 OP_SN accountList = ['LYJ', 'LYJAH', 'LYJGH']
userId = 1
openId = '123456789'
} }
export default Auth export default Auth

@ -82,7 +82,7 @@ function AuthApp() {
type: 'divider', type: 'divider',
}, },
{ {
label: <Link to='/login?out'>退出</Link>, label: <Link to='/p/dingding/qrcode?out'>退出</Link>,
key: '3', key: '3',
}, },
] ]

@ -38,7 +38,6 @@ function DingdingQRCode() {
fetch(`https://p9axztuwd7x8a7.mycht.cn/dingtalk/dingtalkwork/WhatsAppAuth?authCode=${authCode}`) fetch(`https://p9axztuwd7x8a7.mycht.cn/dingtalk/dingtalkwork/WhatsAppAuth?authCode=${authCode}`)
.then(response => response.json()) .then(response => response.json())
.then(json => { .then(json => {
// {"errcode":0,"errmsg":"ok","result":{"nick":"","unionId":"j7cuUCplZe1ZiiqjQNUUmFwiEiE","avatarUrl":"https://static-legacy.dingtalk.com/media/lALPBDDrhXr716HNAoDNAoA_640_640.png","openId":"iioljiPmZ4RPoOYpkFiSn7IKAiEiE","mobile":"18777396951","stateCode":"86","email":"lyj@hainatravel.com","opisn":"383"}}
if (json.errcode === 0) { if (json.errcode === 0) {
loginUser.userId = json.result.opisn loginUser.userId = json.result.opisn
loginUser.accountName = json.result.opisn loginUser.accountName = json.result.opisn

Loading…
Cancel
Save