diff --git a/pages/erpLoginConfirm/erpLoginConfirm.js b/pages/erpLoginConfirm/erpLoginConfirm.js index b28282e..999de43 100644 --- a/pages/erpLoginConfirm/erpLoginConfirm.js +++ b/pages/erpLoginConfirm/erpLoginConfirm.js @@ -44,10 +44,10 @@ Page({ return text }, extractTicket(value) { - return this.extractSceneValue(value, ['ticket']) + return this.extractSceneValue(value, ['ticket', 't']) }, extractSessionId(value) { - return this.extractSceneValue(value, ['session_id', 'sessionId']) + return this.extractSceneValue(value, ['session_id', 'sessionId', 's']) }, extractSceneValue(value, names) { const raw = this.decodeRepeated(value) diff --git a/scripts/test-erp-login-confirm.mjs b/scripts/test-erp-login-confirm.mjs index d06425f..af3ba57 100644 --- a/scripts/test-erp-login-confirm.mjs +++ b/scripts/test-erp-login-confirm.mjs @@ -22,6 +22,8 @@ assert.match(pageJs, /options\.session_id/); assert.match(pageJs, /options\.sessionId/); assert.match(pageJs, /extractTicket/); assert.match(pageJs, /extractSessionId/); +assert.match(pageJs, /\['ticket', 't'\]/); +assert.match(pageJs, /\['session_id', 'sessionId', 's'\]/); assert.match(pageJs, /confirmErpLogin/); assert.match(pageJs, /confirmErpLogin\(this\.data\.ticket,\s*this\.data\.sessionId,\s*phoneCode\)/); assert.match(pageJs, /cancelErpLogin\(this\.data\.ticket,\s*this\.data\.sessionId\)/);