Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3a154198e9 | |||
| c84c9df5d4 |
@@ -113,8 +113,11 @@ export default {
|
||||
});
|
||||
|
||||
const data = res.data || {};
|
||||
console.log('[loading] login response:', JSON.stringify(data, null, 2));
|
||||
|
||||
if (data.code === 0 && data.data) {
|
||||
const result = data.data;
|
||||
console.log('[loading] login result:', JSON.stringify(result, null, 2));
|
||||
|
||||
// 清除 URL 中的 code 参数,避免刷新重复处理
|
||||
const url = new URL(window.location.href);
|
||||
@@ -126,11 +129,13 @@ export default {
|
||||
// 已注册 → 缓存 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));
|
||||
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 {
|
||||
@@ -152,6 +157,14 @@ export default {
|
||||
},
|
||||
|
||||
goToRegister() {
|
||||
// 记录扫码时的原始 URL,注册完成后跳回
|
||||
const scanUrl = this.deviceId
|
||||
? `/pages/index/index?device_id=${this.deviceId}`
|
||||
: '';
|
||||
if (scanUrl) {
|
||||
uni.setStorageSync('__scan_redirect_url', scanUrl);
|
||||
}
|
||||
|
||||
const url = this.deviceId
|
||||
? `/pages/register/register?device_id=${this.deviceId}`
|
||||
: '/pages/register/register';
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
<!-- 蓝色个人信息区域 -->
|
||||
<view class="user-header">
|
||||
<view class="user-info">
|
||||
<view class="avatar-wrapper">
|
||||
<view class="avatar-wrapper" @click="handleAvatarClick">
|
||||
<image class="avatar" :src="userInfo.avatar || '/static/default-avatar.png'" mode="aspectFill" />
|
||||
</view>
|
||||
<view class="user-detail">
|
||||
@@ -122,6 +122,13 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 退出登录 -->
|
||||
<view class="menu-list logout-btn" @click="handleLogout">
|
||||
<view class="menu-item">
|
||||
<text class="menu-text" style="color: #e4393c; text-align: center; width: 100%;">退出登录</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 开发调试工具(仅开发环境显示) -->
|
||||
<view v-if="isDev" class="dev-tools">
|
||||
<view class="dev-tools-title">开发工具</view>
|
||||
@@ -171,6 +178,8 @@ export default {
|
||||
categoryList: [],
|
||||
activeCategory: 'all',
|
||||
userInfo: { nickname: '', phone: '', avatar: '' },
|
||||
avatarClickCount: 0,
|
||||
avatarClickTimer: null,
|
||||
menuList: [
|
||||
{ title: '我的订单', action: 'order' },
|
||||
{ title: '常见问题', action: 'faq' },
|
||||
@@ -254,11 +263,13 @@ export default {
|
||||
// 从缓存加载用户信息
|
||||
loadUserInfo() {
|
||||
const cached = getCachedUserInfo();
|
||||
console.log('[index] getCachedUserInfo:', JSON.stringify(cached, null, 2));
|
||||
if (cached) {
|
||||
this.userInfo = { ...this.userInfo, ...cached };
|
||||
} else {
|
||||
this.userInfo = { nickname: '', phone: '', avatar: '' };
|
||||
}
|
||||
console.log('[index] this.userInfo:', JSON.stringify(this.userInfo, null, 2));
|
||||
},
|
||||
async fetchProducts() {
|
||||
this.loading = true;
|
||||
@@ -307,6 +318,39 @@ export default {
|
||||
},
|
||||
handleNavPrev() { this.currentTab = 'home'; },
|
||||
handleNavNext() { uni.showToast({ title: '暂无下一页', icon: 'none' }); },
|
||||
handleAvatarClick() {
|
||||
this.avatarClickCount++;
|
||||
clearTimeout(this.avatarClickTimer);
|
||||
|
||||
if (this.avatarClickCount >= 10) {
|
||||
// 点击10次,清除缓存
|
||||
this.avatarClickCount = 0;
|
||||
this.clearCacheAndReload();
|
||||
} else {
|
||||
// 2秒后重置计数
|
||||
this.avatarClickTimer = setTimeout(() => {
|
||||
this.avatarClickCount = 0;
|
||||
}, 2000);
|
||||
}
|
||||
},
|
||||
handleLogout() {
|
||||
uni.showModal({
|
||||
title: '退出登录',
|
||||
content: '确定要退出登录吗?',
|
||||
success: (res) => {
|
||||
if (res.confirm) {
|
||||
this.clearCacheAndReload();
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
clearCacheAndReload() {
|
||||
uni.clearStorageSync();
|
||||
uni.showToast({ title: '已退出登录', icon: 'success' });
|
||||
setTimeout(() => {
|
||||
location.reload();
|
||||
}, 1000);
|
||||
},
|
||||
onVConsoleChange(e) {
|
||||
const enabled = e.detail.value;
|
||||
if (enabled) {
|
||||
@@ -455,6 +499,7 @@ page { height: 100%; background-color: #fff; }
|
||||
.menu-item:last-child { border-bottom: none; }
|
||||
.menu-text { font-size: 30rpx; color: #333; }
|
||||
.menu-arrow { font-size: 28rpx; color: #ccc; }
|
||||
.logout-btn { margin-top: 20rpx; }
|
||||
|
||||
/* 开发工具区域 */
|
||||
.dev-tools { margin-top: 20rpx; background-color: #fff; border-radius: 16rpx; overflow: hidden; }
|
||||
|
||||
@@ -201,9 +201,14 @@ export default {
|
||||
uni.hideLoading();
|
||||
uni.showToast({ title: '注册成功', icon: 'success' });
|
||||
|
||||
// 跳转首页
|
||||
// 跳转到扫码时的页面(优先使用缓存的扫码URL)
|
||||
setTimeout(() => {
|
||||
const url = this.deviceId
|
||||
const scanRedirectUrl = uni.getStorageSync('__scan_redirect_url');
|
||||
uni.removeStorageSync('__scan_redirect_url'); // 使用后立即清除
|
||||
|
||||
const url = scanRedirectUrl
|
||||
? scanRedirectUrl
|
||||
: this.deviceId
|
||||
? `/pages/index/index?device_id=${this.deviceId}`
|
||||
: '/pages/index/index';
|
||||
uni.redirectTo({ url });
|
||||
|
||||
@@ -72,7 +72,9 @@ export function logout() {
|
||||
*/
|
||||
export function getCachedUserInfo() {
|
||||
try {
|
||||
return uni.getStorageSync('user_info') || null;
|
||||
const userInfo = uni.getStorageSync('user_info');
|
||||
console.log('[auth-guard] getCachedUserInfo raw:', JSON.stringify(userInfo, null, 2));
|
||||
return userInfo || null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user