This commit is contained in:
+56
-54
@@ -51,7 +51,7 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
/**
|
||||
* 发起 OAuth 授权
|
||||
* 发起 OAuth 授权(静默授权,只获取 openid)
|
||||
*/
|
||||
async startAuth() {
|
||||
const platform = detectPlatform();
|
||||
@@ -71,15 +71,16 @@ export default {
|
||||
window.location.origin.replace(/^http:/, 'https:') + window.location.pathname
|
||||
);
|
||||
|
||||
// 使用 snsapi_base 静默授权,不弹窗
|
||||
const res = await gatewayGet('/api/v1/user/auth/url', {
|
||||
app_no: appNo,
|
||||
scopes: 'snsapi_userinfo',
|
||||
scopes: 'snsapi_base',
|
||||
redirect_uri: redirectUri,
|
||||
});
|
||||
|
||||
const data = res.data || {};
|
||||
if (data.code === 0 && data.data && data.data.auth_url) {
|
||||
// 跳转微信授权页
|
||||
// 跳转微信授权页(静默,不弹窗)
|
||||
window.location.href = data.data.auth_url;
|
||||
} else {
|
||||
uni.showToast({ title: data.message || '获取授权失败', icon: 'none' });
|
||||
@@ -93,7 +94,7 @@ export default {
|
||||
},
|
||||
|
||||
/**
|
||||
* 处理授权回调(从 URL 中获取 code 后调用后端 /login)
|
||||
* 处理授权回调(从 URL 中获取 code 后换取 openid,再用 openid 登录)
|
||||
*/
|
||||
async handleCallback(code) {
|
||||
const appNo = uni.getStorageSync('app_no') || getAppNo(detectPlatform());
|
||||
@@ -107,6 +108,7 @@ export default {
|
||||
try {
|
||||
this.statusText = '正在验证身份...';
|
||||
|
||||
// 用 code 换取 openid(后端处理,前端只传 code)
|
||||
const res = await gatewayPost('/api/v1/user/login', {
|
||||
app_no: appNo,
|
||||
code: code,
|
||||
@@ -125,17 +127,17 @@ export default {
|
||||
url.searchParams.delete('state');
|
||||
window.history.replaceState({}, '', url.toString());
|
||||
|
||||
// 存储 openid
|
||||
uni.setStorageSync('openid', result.openid);
|
||||
|
||||
if (result.register) {
|
||||
// 已注册 → 缓存 JWT → 跳转首页
|
||||
uni.setStorageSync('token', result.token);
|
||||
uni.setStorageSync('user_info', result.user_info);
|
||||
console.log('[loading] stored user_info:', JSON.stringify(result.user_info, null, 2));
|
||||
// 不再存储 user_info,点击"我的"时再获取
|
||||
this.goToHome();
|
||||
} else {
|
||||
// 未注册 → 缓存临时数据 → 跳转注册页
|
||||
uni.setStorageSync('temp_token', result.temp_token);
|
||||
uni.setStorageSync('auth_info', result.auth_info);
|
||||
console.log('[loading] stored auth_info:', JSON.stringify(result.auth_info, null, 2));
|
||||
this.goToRegister();
|
||||
}
|
||||
} else {
|
||||
@@ -176,60 +178,60 @@ export default {
|
||||
},
|
||||
|
||||
/**
|
||||
* Mock 登录(开发环境模拟不同用户状态)
|
||||
* Mock 登录(跳过微信授权,调用真实登录接口)
|
||||
*/
|
||||
async mockLogin() {
|
||||
const mode = config.mockWechatLogin;
|
||||
const mock = config.mockUser;
|
||||
const mockOpenid = mock.user_info.open_id;
|
||||
|
||||
if (mode === 'register' || mode === 'login') {
|
||||
// 调用真实登录接口,用测试 code
|
||||
this.statusText = '模拟:获取授权信息...';
|
||||
const appNo = uni.getStorageSync('app_no') || getAppNo(detectPlatform()) || config.mockAppNo;
|
||||
|
||||
try {
|
||||
const res = await gatewayPost('/api/v1/user/login', {
|
||||
app_no: appNo,
|
||||
code: 'test_code',
|
||||
});
|
||||
|
||||
const data = res.data || {};
|
||||
if (data.code === 0 && data.data) {
|
||||
const result = data.data;
|
||||
|
||||
if (result.register) {
|
||||
// 已注册
|
||||
uni.setStorageSync('token', result.token);
|
||||
uni.setStorageSync('user_info', result.user_info);
|
||||
console.log('[Auth] Mock: existing user → home');
|
||||
this.goToHome();
|
||||
} else {
|
||||
// 未注册 → 存真实的 temp_token,合并 mock 头像昵称
|
||||
const authInfo = {
|
||||
...mock.user_info,
|
||||
...result.auth_info,
|
||||
};
|
||||
uni.setStorageSync('temp_token', result.temp_token);
|
||||
uni.setStorageSync('auth_info', authInfo);
|
||||
console.log('[Auth] Mock: new user → register, temp_token:', result.temp_token);
|
||||
this.goToRegister();
|
||||
}
|
||||
} else {
|
||||
uni.showToast({ title: data.message || '登录接口返回异常', icon: 'none' });
|
||||
console.error('[Auth] Mock login failed:', data);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('[Auth] Mock login error:', e);
|
||||
uni.showToast({ title: '网络请求失败', icon: 'none' });
|
||||
}
|
||||
|
||||
} else {
|
||||
// 'skip' → 直接登录
|
||||
// 'skip' 模式直接登录,不调接口
|
||||
if (mode === 'skip') {
|
||||
this.statusText = '模拟登录中...';
|
||||
uni.setStorageSync('token', mock.token);
|
||||
uni.setStorageSync('user_info', mock.user_info);
|
||||
console.log('[Auth] Mock: skip → home');
|
||||
uni.setStorageSync('openid', mockOpenid);
|
||||
console.log('[Auth] Mock skip → home');
|
||||
setTimeout(() => this.goToHome(), 500);
|
||||
return;
|
||||
}
|
||||
|
||||
// 'register' / 'login' 模式:调用真实登录接口,传 mock openid
|
||||
this.statusText = '模拟:调用登录接口...';
|
||||
const appNo = uni.getStorageSync('app_no') || config.mockAppNo;
|
||||
|
||||
try {
|
||||
const res = await gatewayPost('/api/v1/user/login', {
|
||||
app_no: appNo,
|
||||
openid: mockOpenid,
|
||||
});
|
||||
|
||||
const data = res.data || {};
|
||||
console.log('[Auth] Mock login response:', JSON.stringify(data, null, 2));
|
||||
|
||||
if (data.code === 0 && data.data) {
|
||||
const result = data.data;
|
||||
|
||||
// 存储 openid
|
||||
uni.setStorageSync('openid', result.openid || mockOpenid);
|
||||
|
||||
if (result.register) {
|
||||
// 已注册 → 存 token → 跳首页
|
||||
uni.setStorageSync('token', result.token);
|
||||
console.log('[Auth] Mock: existing user → home');
|
||||
this.goToHome();
|
||||
} else {
|
||||
// 未注册 → 存 temp_token → 跳注册页
|
||||
uni.setStorageSync('temp_token', result.temp_token);
|
||||
console.log('[Auth] Mock: new user → register');
|
||||
this.goToRegister();
|
||||
}
|
||||
} else {
|
||||
uni.showToast({ title: data.message || '登录失败', icon: 'none' });
|
||||
console.error('[Auth] Mock login failed:', data);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('[Auth] Mock login error:', e);
|
||||
uni.showToast({ title: '网络请求失败', icon: 'none' });
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user