Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9439bcf9d7 | |||
| d862cad1a0 |
@@ -30,10 +30,29 @@ export default {
|
||||
}
|
||||
|
||||
// 从 URL 参数获取 code(App.vue 跳转时带过来)
|
||||
let code = options.code || '';
|
||||
// 支付宝回调参数名是 auth_code,微信是 code
|
||||
let code = options.code || options.auth_code || '';
|
||||
if (!code) {
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
code = urlParams.get('code') || '';
|
||||
code = urlParams.get('code') || urlParams.get('auth_code') || '';
|
||||
}
|
||||
|
||||
// 解析 state 参数(OAuth 标准保证 state 原样回传,包含 action 和 device_id)
|
||||
if (!this.action || !this.deviceId) {
|
||||
const stateRaw = options.state || '';
|
||||
if (stateRaw) {
|
||||
try {
|
||||
const stateObj = JSON.parse(decodeURIComponent(stateRaw));
|
||||
if (!this.action && stateObj.action) {
|
||||
this.action = stateObj.action;
|
||||
}
|
||||
if (!this.deviceId && stateObj.device_id) {
|
||||
this.deviceId = stateObj.device_id;
|
||||
}
|
||||
} catch (_) {
|
||||
// state 解析失败,继续用 localStorage 兜底
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 兜底:从 localStorage 恢复(页面复用时 onLoad 不触发,localStorage 由跳转函数清理)
|
||||
@@ -155,6 +174,7 @@ export default {
|
||||
// 立即清除 URL 中的 code 参数,避免刷新重复处理
|
||||
const url = new URL(window.location.href);
|
||||
url.searchParams.delete('code');
|
||||
url.searchParams.delete('auth_code');
|
||||
url.searchParams.delete('state');
|
||||
window.history.replaceState({}, '', url.toString());
|
||||
|
||||
@@ -316,6 +336,7 @@ export default {
|
||||
// 立即清除 URL 中的 code/action 参数,避免刷新重复处理
|
||||
const url = new URL(window.location.href);
|
||||
url.searchParams.delete('code');
|
||||
url.searchParams.delete('auth_code');
|
||||
url.searchParams.delete('state');
|
||||
url.searchParams.delete('action');
|
||||
window.history.replaceState({}, '', url.toString());
|
||||
|
||||
Reference in New Issue
Block a user