diff --git a/client/lib/screens/stock_in/stock_in_list_screen.dart b/client/lib/screens/stock_in/stock_in_list_screen.dart index d2b3db6..3b24a98 100644 --- a/client/lib/screens/stock_in/stock_in_list_screen.dart +++ b/client/lib/screens/stock_in/stock_in_list_screen.dart @@ -1072,26 +1072,29 @@ class _StockInDetailDialogState extends ConsumerState<_StockInDetailDialog> { children: [ Container( padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8), - decoration: const BoxDecoration( - color: AppTheme.brand50, - border: Border(bottom: BorderSide(color: AppTheme.border)), + decoration: BoxDecoration( + color: context.tokens.brand50, + border: Border( + bottom: BorderSide(color: context.tokens.border)), ), child: Row( children: [ IconButton( - icon: const Icon(Icons.arrow_back, color: AppTheme.primaryDark), + icon: Icon(Icons.arrow_back, + color: context.tokens.primaryDark), tooltip: '返回', onPressed: () => Navigator.of(context).pop(), ), - const Text('入库单详情', + Text('入库单详情', style: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: AppTheme.primaryDark)), + color: context.tokens.primaryDark)), const Spacer(), if (_loadedOrder != null) IconButton( - icon: const Icon(Icons.print_outlined, color: AppTheme.primaryDark), + icon: Icon(Icons.print_outlined, + color: context.tokens.primaryDark), tooltip: '打印', onPressed: () => showStockInOrderPrint(context, ref, _loadedOrder!), ), diff --git a/client/lib/screens/stock_out/stock_out_list_screen.dart b/client/lib/screens/stock_out/stock_out_list_screen.dart index 73d5930..c8a50eb 100644 --- a/client/lib/screens/stock_out/stock_out_list_screen.dart +++ b/client/lib/screens/stock_out/stock_out_list_screen.dart @@ -983,26 +983,29 @@ class _StockOutDetailDialogState extends ConsumerState<_StockOutDetailDialog> { children: [ Container( padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8), - decoration: const BoxDecoration( - color: AppTheme.brand50, - border: Border(bottom: BorderSide(color: AppTheme.border)), + decoration: BoxDecoration( + color: context.tokens.brand50, + border: Border( + bottom: BorderSide(color: context.tokens.border)), ), child: Row( children: [ IconButton( - icon: const Icon(Icons.arrow_back, color: AppTheme.primaryDark), + icon: Icon(Icons.arrow_back, + color: context.tokens.primaryDark), tooltip: '返回', onPressed: () => Navigator.of(context).pop(), ), - const Text('出库单详情', + Text('出库单详情', style: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: AppTheme.primaryDark)), + color: context.tokens.primaryDark)), const Spacer(), if (_loadedOrder != null) IconButton( - icon: const Icon(Icons.print_outlined, color: AppTheme.primaryDark), + icon: Icon(Icons.print_outlined, + color: context.tokens.primaryDark), tooltip: '打印', onPressed: () => showStockOutOrderPrint(context, ref, _loadedOrder!), ), diff --git a/client/lib/widgets/order_print_preview_dialog.dart b/client/lib/widgets/order_print_preview_dialog.dart index 526c1e0..bc1f1ea 100644 --- a/client/lib/widgets/order_print_preview_dialog.dart +++ b/client/lib/widgets/order_print_preview_dialog.dart @@ -5,7 +5,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:printing/printing.dart'; import '../core/auth/auth_state.dart'; import '../core/errors/error_reporter.dart'; -import '../core/theme/app_theme.dart'; +import '../core/theme/context_tokens.dart'; import '../core/responsive/responsive.dart'; import '../core/utils/print_util.dart'; import '../models/shop.dart'; @@ -112,9 +112,9 @@ class _OrderPrintPreviewDialogState extends State { Container( padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 14), - decoration: const BoxDecoration( - color: AppTheme.primary, - borderRadius: BorderRadius.only( + decoration: BoxDecoration( + color: context.tokens.primary, + borderRadius: const BorderRadius.only( topLeft: Radius.circular(12), topRight: Radius.circular(12), ), @@ -163,7 +163,7 @@ class _OrderPrintPreviewDialogState extends State { fontSize: 12, color: _error.isNotEmpty ? Colors.red - : AppTheme.textSecondary), + : context.tokens.muted), ), ), TextButton( diff --git a/client/test/golden/goldens/stock_in_form_a.png b/client/test/golden/goldens/stock_in_form_a.png index 5d97383..32eef7d 100644 Binary files a/client/test/golden/goldens/stock_in_form_a.png and b/client/test/golden/goldens/stock_in_form_a.png differ diff --git a/client/test/golden/goldens/stock_in_form_b.png b/client/test/golden/goldens/stock_in_form_b.png index bfa33ca..a4f5d08 100644 Binary files a/client/test/golden/goldens/stock_in_form_b.png and b/client/test/golden/goldens/stock_in_form_b.png differ diff --git a/client/test/golden/goldens/stock_in_form_c.png b/client/test/golden/goldens/stock_in_form_c.png index 0d3b3dd..1647b66 100644 Binary files a/client/test/golden/goldens/stock_in_form_c.png and b/client/test/golden/goldens/stock_in_form_c.png differ diff --git a/client/test/golden/goldens/stock_in_form_mobile_a.png b/client/test/golden/goldens/stock_in_form_mobile_a.png index ab7faf1..af4ebd9 100644 Binary files a/client/test/golden/goldens/stock_in_form_mobile_a.png and b/client/test/golden/goldens/stock_in_form_mobile_a.png differ diff --git a/client/test/golden/goldens/stock_in_form_mobile_b.png b/client/test/golden/goldens/stock_in_form_mobile_b.png index e2fac58..c4a3ec3 100644 Binary files a/client/test/golden/goldens/stock_in_form_mobile_b.png and b/client/test/golden/goldens/stock_in_form_mobile_b.png differ diff --git a/client/test/golden/goldens/stock_in_form_mobile_c.png b/client/test/golden/goldens/stock_in_form_mobile_c.png index e46dd5c..c642cf1 100644 Binary files a/client/test/golden/goldens/stock_in_form_mobile_c.png and b/client/test/golden/goldens/stock_in_form_mobile_c.png differ diff --git a/client/test/golden/goldens/stock_out_form_a.png b/client/test/golden/goldens/stock_out_form_a.png index bc90142..a521fa7 100644 Binary files a/client/test/golden/goldens/stock_out_form_a.png and b/client/test/golden/goldens/stock_out_form_a.png differ diff --git a/client/test/golden/goldens/stock_out_form_b.png b/client/test/golden/goldens/stock_out_form_b.png index b068752..4bd726e 100644 Binary files a/client/test/golden/goldens/stock_out_form_b.png and b/client/test/golden/goldens/stock_out_form_b.png differ diff --git a/client/test/golden/goldens/stock_out_form_c.png b/client/test/golden/goldens/stock_out_form_c.png index 2dc71ef..b22a064 100644 Binary files a/client/test/golden/goldens/stock_out_form_c.png and b/client/test/golden/goldens/stock_out_form_c.png differ diff --git a/client/test/golden/goldens/stock_out_form_mobile_a.png b/client/test/golden/goldens/stock_out_form_mobile_a.png index 036918f..cbe9326 100644 Binary files a/client/test/golden/goldens/stock_out_form_mobile_a.png and b/client/test/golden/goldens/stock_out_form_mobile_a.png differ diff --git a/client/test/golden/goldens/stock_out_form_mobile_b.png b/client/test/golden/goldens/stock_out_form_mobile_b.png index 0215f4b..9b0c616 100644 Binary files a/client/test/golden/goldens/stock_out_form_mobile_b.png and b/client/test/golden/goldens/stock_out_form_mobile_b.png differ diff --git a/client/test/golden/goldens/stock_out_form_mobile_c.png b/client/test/golden/goldens/stock_out_form_mobile_c.png index 4878990..d88f928 100644 Binary files a/client/test/golden/goldens/stock_out_form_mobile_c.png and b/client/test/golden/goldens/stock_out_form_mobile_c.png differ