登录注册与首页的相关修改

app/lib/main.dart

@@ -156,13 +156,13 @@ class MyApp extends HookConsumerWidget {
 
           //主题配置
           theme: ThemeData(
-            colorScheme: ColorScheme.fromSeed(seedColor: const Color(0xFF4161D0)),
+            colorScheme: ColorScheme.fromSeed(seedColor: AppColorsTheme.colorPrimary),
             useMaterial3: false,
           ).copyWith(extensions: [
             AppColorsTheme.light(),
           ]),
           darkTheme: ThemeData(
-            colorScheme: ColorScheme.fromSeed(seedColor: const Color(0xFF4161D0), brightness: Brightness.dark),
+            colorScheme: ColorScheme.fromSeed(seedColor: AppColorsTheme.colorPrimary, brightness: Brightness.dark),
             useMaterial3: false,
           ).copyWith(extensions: [
             AppColorsTheme.dark(),

packages/cpt_auth/lib/modules/sign_up/sign_up_view_model.dart

@@ -110,7 +110,7 @@ class SignUpViewModel extends _$SignUpViewModel {
             firstName: firstName,
             lastName: lastName,
             email: email,
-            phone: "${state.countryCode}$phone}",
+            phone: "${state.countryCode}$phone",
             password: password,
             confirmPassword: confirmPassword,
             verifyKey: key,

packages/cpt_community/lib/components/garage_card.dart

@@ -123,7 +123,7 @@ class GarageCard extends StatelessWidget {
                     maxLines: 1,
                     isTextEllipsis: true,
                     textAlign: TextAlign.start,
-                    textColor: ColorUtils.string2Color('#4161D0'),
+                    textColor: AppColorsTheme.colorPrimary,
                     fontSize: 18,
                     isFontMedium: true,
                   ),

packages/cpt_community/lib/modules/garage/garagesale_detail/garagesale_detail_page.dart

@@ -265,7 +265,7 @@ class GaragesaleDetailPage extends HookConsumerWidget {
 
     return Container(
       height: 50,
-      color: ColorUtils.string2Color('#4161D0'),
+      color: AppColorsTheme.colorPrimary,
       child: Row(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [

packages/cpt_main/lib/modules/feedback/item_feedback.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 class FeedbackItem extends StatelessWidget {
   final int index;
@@ -38,7 +39,12 @@ class FeedbackItem extends StatelessWidget {
         children: [
           Row(
             children: [
-              const MyAssetImage(Assets.mainFeedbackItemIcon, width: 42.5, height: 44),
+               MyAssetImage(
+                Assets.mainFeedbackItemIcon,
+                width: 42.5,
+                height: 44,
+                color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
+              ),
               Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [

packages/cpt_main/lib/modules/visitor/register/visitor_register_page.dart

@@ -13,6 +13,7 @@ import 'package:widgets/my_appbar.dart';
 import 'package:widgets/my_button.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 import 'package:widgets/my_text_field.dart';
 import 'package:widgets/shatter/form_require_text.dart';
@@ -149,7 +150,12 @@ class VisitorRegisterPage extends HookConsumerWidget {
               PickerContainer(
                 content: state.accessDate == null ? "" : DateTimeUtils.formatDate(state.accessDate, format: 'dd MMM yyyy'),
                 margin: const EdgeInsets.only(top: 16),
-                rightWidget: const MyAssetImage(Assets.mainVisitorRegisterDate, width: 21, height: 20),
+                rightWidget:  MyAssetImage(
+                  Assets.mainVisitorRegisterDate,
+                  width: 21,
+                  height: 20,
+                  color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary,darkColor: Colors.white),
+                ),
                 onClick: viewModel.pickAccessDate,
               ),
 

packages/cpt_notice_board/lib/modules/documents_list/page/documents_list_page.dart

@@ -67,7 +67,7 @@ class DocumentsListPage extends HookConsumerWidget {
           shape: RoundedRectangleBorder(
             borderRadius: BorderRadius.circular(5), // 圆角
             side: BorderSide(
-              color: ColorUtils.string2Color('#4161D0'),
+              color: AppColorsTheme.colorPrimary,
               width: 1.0,
             ), // 边框
           ),

packages/cpt_rewards/lib/modules/rewards/rewards_page.dart

@@ -239,9 +239,9 @@ class RewardsPage extends HookConsumerWidget {
                 flex: 1,
                 child: Container(
                   decoration: BoxDecoration(
-                    color: ColorUtils.string2Color('#4161D0'),
+                    color: AppColorsTheme.colorPrimary,
                     borderRadius: BorderRadius.circular(10),
-                    border: Border.all(color: ColorUtils.string2Color('#4161D0'), width: 1),
+                    border: Border.all(color:AppColorsTheme.colorPrimary, width: 1),
                   ),
                   height: 78,
                   child: Column(

packages/cpt_rewards/lib/modules/rewards_code/rewards_code_page.dart

@@ -62,7 +62,7 @@ class RewardsCodePage extends HookConsumerWidget {
               '$codes',
               style: TextStyle(
                   fontSize: 36.0,
-                  color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#4161D0'), darkColor: Colors.white),
+                  color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   fontWeight: FontWeight.w500),
             ),
           ],

packages/cpt_rewards/lib/modules/rewards_confirm/rewards_confirm_page.dart

@@ -282,7 +282,7 @@ class RewardsConfirmPage extends HookConsumerWidget {
                         '$amount',
                         style: TextStyle(
                             fontSize: 19.0,
-                            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#4161D0'), darkColor: Colors.white),
+                            color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                             fontWeight: FontWeight.w500),
                       ),
                     ],

packages/cpt_rewards/lib/modules/rewards_history/rewards_history_spent/rewards_history_spent_page.dart

@@ -71,7 +71,7 @@ class RewardsHistorySpentPage extends HookConsumerWidget {
             '$point',
             style: TextStyle(
                 fontSize: 20.0,
-                color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#4161D0'),darkColor: Colors.white),
+                color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary,darkColor: Colors.white),
                 fontWeight: FontWeight.w500), // 设置字体大小
           ),
         ],

packages/cpt_rewards/lib/modules/rewards_successful/rewards_successful_page.dart

@@ -315,7 +315,7 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
               S.current.you_have_paid_points,
               style: TextStyle(
                   fontSize: 18.0,
-                  color:  DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#4161D0'),darkColor: Colors.white),
+                  color:  DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary,darkColor: Colors.white),
                   fontWeight: FontWeight.w500),
             ).marginOnly(top: 12, bottom: 15),
             Text(

packages/cpt_services/lib/constants_services.dart

@@ -76,7 +76,7 @@ class servicesConstants {
        "text": S.current.contact_merchant,
        "type": "contactMerchant",
        'code': 1,
-       'btnColor': '#FF4161D0',
+       'btnColor': '#FF01B5EB',
        'btnWidth': 115.0,
        'btnHeight': 35.0,
      },
@@ -100,7 +100,7 @@ class servicesConstants {
       "text": S.current.evaluate,
       "type": "evaluate",
       'code': 4,
-      'btnColor': '#FF4161D0',
+      'btnColor': '#FF01B5EB',
       'btnWidth': 98.0,
       'btnHeight': 30.0,
     }

packages/cpt_services/lib/modules/services/service_repair_detail/service_repair_detail_vm.dart

@@ -391,7 +391,7 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
                     fontSize: 16,
                     isFontMedium: true,
                     textAlign: TextAlign.center,
-                    textColor: ColorUtils.string2Color("#4161D0"),
+                    textColor: AppColorsTheme.colorPrimary,
                   ),
                   const SizedBox(
                     height: 20,

packages/cs_domain/lib/repository/auth_repository.dart

@@ -5,6 +5,7 @@ import 'package:plugin_platform/platform_export.dart';
 import 'package:plugin_platform/http/dio_engine.dart';
 import 'package:plugin_platform/http/http_result.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:shared/utils/log_utils.dart';
 import 'package:shared/utils/util.dart';
 
 import '../constants/api_constants.dart';

packages/cs_plugin_platform/lib/engine/image/image_nine_grid.dart

@@ -7,6 +7,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'image_preview.dart';
 import 'package:cs_resources/generated/l10n.dart';
 
@@ -122,7 +123,12 @@ class _ImageNineGridState extends State<ImageNineGrid> {
               mainAxisAlignment: MainAxisAlignment.center,
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
-                const MyAssetImage(Assets.baseLibImageAddIcon, width: 211.5, height: 21.5),
+                 MyAssetImage(
+                  Assets.baseLibImageAddIcon,
+                  width: 211.5,
+                  height: 21.5,
+                  color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
+                ),
                 MyTextView(S.current.upload, fontSize: 10, isFontMedium: true, marginTop: 3, textColor: context.appColors.textDarkGray999),
               ],
             ),

packages/cs_resources/lib/theme/theme_config.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';