feat(client): 全模块 API 对接 + 修复登陆跳转 + 菜单 UI 优化
API 对接: - 入库/出库/库存/财务/往来单位/基础数据全部对接后端 REST API - 新增 repositories、providers、models 层,统一分层架构 - auth 从 flutter_secure_storage 迁移到 shared_preferences 登陆跳转修复: - 将 _RouterNotifier 提取为独立 Riverpod provider,appRouterProvider 使用 ref.read 避免依赖链导致 router 重建后跳回 /login - redirect 函数新增 initialized 守卫,防止 auth 未恢复时误重定向 - 添加调试日志(Router/Auth/ApiClient)定位 401 触发的 logout 链路 退出菜单 UI: - 去掉 ListTile,改用 Row + 自定义 padding,文字左对齐 - MouseRegion + AnimatedContainer 实现 hover 高亮(普通项蓝底/退出红底) - 菜单圆角 6px,elevation 8,分割线高度 1px Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
@@ -5,24 +6,24 @@ const _kAccessToken = 'access_token';
|
||||
const _kRefreshToken = 'refresh_token';
|
||||
const _kUsername = 'username';
|
||||
const _kRealName = 'real_name';
|
||||
const _kHotelNo = 'hotel_no';
|
||||
const _kHotelId = 'hotel_id';
|
||||
const _kShopNo = 'shop_no';
|
||||
const _kShopId = 'shop_id';
|
||||
|
||||
class AuthUser {
|
||||
final String accessToken;
|
||||
final String refreshToken;
|
||||
final String username;
|
||||
final String realName;
|
||||
final String hotelNo;
|
||||
final int hotelId;
|
||||
final String shopNo;
|
||||
final int shopId;
|
||||
|
||||
const AuthUser({
|
||||
required this.accessToken,
|
||||
required this.refreshToken,
|
||||
required this.username,
|
||||
required this.realName,
|
||||
required this.hotelNo,
|
||||
required this.hotelId,
|
||||
required this.shopNo,
|
||||
required this.shopId,
|
||||
});
|
||||
|
||||
// Kept for ApiClient compatibility
|
||||
@@ -47,8 +48,8 @@ class AuthNotifier extends StateNotifier<AuthState> {
|
||||
final refreshToken = prefs.getString(_kRefreshToken);
|
||||
final username = prefs.getString(_kUsername);
|
||||
final realName = prefs.getString(_kRealName);
|
||||
final hotelNo = prefs.getString(_kHotelNo);
|
||||
final hotelIdStr = prefs.getString(_kHotelId);
|
||||
final shopNo = prefs.getString(_kShopNo);
|
||||
final shopIdStr = prefs.getString(_kShopId);
|
||||
|
||||
if (accessToken != null && refreshToken != null && username != null) {
|
||||
state = AuthState(
|
||||
@@ -58,8 +59,8 @@ class AuthNotifier extends StateNotifier<AuthState> {
|
||||
refreshToken: refreshToken,
|
||||
username: username,
|
||||
realName: realName ?? username,
|
||||
hotelNo: hotelNo ?? '',
|
||||
hotelId: int.tryParse(hotelIdStr ?? '') ?? 0,
|
||||
shopNo: shopNo ?? '',
|
||||
shopId: int.tryParse(shopIdStr ?? '') ?? 0,
|
||||
),
|
||||
);
|
||||
return;
|
||||
@@ -71,14 +72,17 @@ class AuthNotifier extends StateNotifier<AuthState> {
|
||||
}
|
||||
|
||||
Future<void> login(AuthUser user) async {
|
||||
debugPrint('[Auth] login() called, username=${user.username} shopId=${user.shopId}');
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
await prefs.setString(_kAccessToken, user.accessToken);
|
||||
await prefs.setString(_kRefreshToken, user.refreshToken);
|
||||
await prefs.setString(_kUsername, user.username);
|
||||
await prefs.setString(_kRealName, user.realName);
|
||||
await prefs.setString(_kHotelNo, user.hotelNo);
|
||||
await prefs.setString(_kHotelId, user.hotelId.toString());
|
||||
await prefs.setString(_kShopNo, user.shopNo);
|
||||
await prefs.setString(_kShopId, user.shopId.toString());
|
||||
debugPrint('[Auth] login() setting state, token prefix: ${user.accessToken.substring(0, user.accessToken.length.clamp(0, 20))}...');
|
||||
state = AuthState(initialized: true, user: user);
|
||||
debugPrint('[Auth] login() state set, isLoggedIn=${state.isLoggedIn}');
|
||||
}
|
||||
|
||||
void updateAccessToken(String newToken) {
|
||||
@@ -92,20 +96,21 @@ class AuthNotifier extends StateNotifier<AuthState> {
|
||||
refreshToken: state.user!.refreshToken,
|
||||
username: state.user!.username,
|
||||
realName: state.user!.realName,
|
||||
hotelNo: state.user!.hotelNo,
|
||||
hotelId: state.user!.hotelId,
|
||||
shopNo: state.user!.shopNo,
|
||||
shopId: state.user!.shopId,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> logout() async {
|
||||
debugPrint('[Auth] logout() called! stack: ${StackTrace.current}');
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
await prefs.remove(_kAccessToken);
|
||||
await prefs.remove(_kRefreshToken);
|
||||
await prefs.remove(_kUsername);
|
||||
await prefs.remove(_kRealName);
|
||||
await prefs.remove(_kHotelNo);
|
||||
await prefs.remove(_kHotelId);
|
||||
await prefs.remove(_kShopNo);
|
||||
await prefs.remove(_kShopId);
|
||||
state = const AuthState(initialized: true);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user