自习室优化ok

lib/widgets/base/button/index.dart

@@ -1,8 +1,9 @@
-import 'package:app/config/theme/theme.dart';
+import 'package:app/global/theme/theme.dart';
 import 'package:flutter/material.dart';
 
 import '../config/config.dart';
 
+
 class Button extends StatelessWidget {
   final double? width;
   final String text;
@@ -12,14 +13,16 @@ class Button extends StatelessWidget {
   final VoidCallback? onPressed;
   final bool loading;
   final bool disabled;
+  final Widget? icon;
 
   const Button({
     super.key,
+    this.icon,
     this.width,
     this.textStyle = const TextStyle(),
     this.radius = const BorderRadius.all(Radius.circular(80)),
     required this.text,
-     this.onPressed,
+    this.onPressed,
     this.type = ThemeType.primary,
     this.loading = false,
     this.disabled = false,

lib/widgets/base/card/g_card.dart

@@ -1,4 +1,4 @@
-import 'package:app/config/theme/base/app_theme_ext.dart';
+import 'package:app/global/theme/base/app_theme_ext.dart';
 import 'package:flutter/material.dart';
 
 class GCard extends StatelessWidget {

lib/widgets/base/tag/index.dart

@@ -1,9 +1,10 @@
-import 'package:app/config/theme/base/app_theme_ext.dart';
+import 'package:app/global/theme/base/app_theme_ext.dart';
 import 'package:flutter/material.dart';
 
 import '../config/color.dart';
 import '../config/config.dart';
 
+
 class Tag extends StatelessWidget {
   final String text;
   final Color? color;