update ui 样式

packages/cpt_community/lib/modules/community/community_page.dart

@@ -249,7 +249,7 @@ class CommunityPage extends HookConsumerWidget with WidgetsBindingObserver {
                     MyTextView(
                       item['title'],
                       fontSize: 15,
-                      textColor: index == curTagIdx ? ColorUtils.string2Color('#4161D0'): context.appColors.textBlack,
+                      textColor: index == curTagIdx ? context.appColors.textPrimary: context.appColors.textBlack,
                       textAlign: TextAlign.center,
                       isFontMedium: true,
                     ),

packages/cpt_community/lib/modules/community/following/following_page.dart

@@ -178,13 +178,13 @@ class FollowingPage extends HookConsumerWidget {
                   height: 45.5,
                   alignment: Alignment.center,
                   // decoration: BoxDecoration(
-                  //   color:  ColorUtils.string2Color('#4161D0'),
+                  //   color:  context.appColors.textPrimary,
                   //   borderRadius: BorderRadius.circular(5),
                   // ),
                   child: MyButton(
                     text: S.current.to_follow,
                     textColor: Colors.white,
-                    backgroundColor: ColorUtils.string2Color('#4161D0'),
+                    backgroundColor: context.appColors.textPrimary,
                     radius: 8,
                     minHeight: 27.5,
                     padding: const EdgeInsets.only(left: 5, right: 5,top:9,bottom:9),

packages/cpt_community/lib/modules/community/foryou/foryou_page.dart

@@ -185,13 +185,13 @@ class ForyouPage extends HookConsumerWidget {
                   height: 45.5,
                   alignment: Alignment.center,
                   // decoration: BoxDecoration(
-                  //   color:  ColorUtils.string2Color('#4161D0'),
+                  //   color:  context.appColors.textPrimary,
                   //   borderRadius: BorderRadius.circular(5),
                   // ),
                   child: MyButton(
                     text: S.current.to_follow,
                     textColor: Colors.white,
-                    backgroundColor: ColorUtils.string2Color('#4161D0'),
+                    backgroundColor: context.appColors.textPrimary,
                     radius: 8,
                     minHeight: 27.5,
                     padding: const EdgeInsets.only(left: 5, right: 5,top:9,bottom:9),

packages/cpt_community/lib/modules/community/news/news_page.dart

@@ -192,7 +192,7 @@ class NewsPage extends HookConsumerWidget {
                   height: 50.5,
                   alignment: Alignment.center,
                   // decoration: BoxDecoration(
-                  //   color:  ColorUtils.string2Color('#4161D0'),
+                  //   color:  context.appColors.textPrimary,
                   //   borderRadius: BorderRadius.circular(5),
                   // ),
                   child: HookBuilder(
@@ -202,7 +202,7 @@ class NewsPage extends HookConsumerWidget {
                         text: isFollowedState.value ? S.current.followed:S.current.to_follow,
                         textColor: isFollowedState.value ?  context.appColors.disEnableGray: context.appColors.textWhite,
                         disabledTextColor: context.appColors.disEnableGray,
-                        backgroundColor: isFollowedState.value ? Colors.transparent : ColorUtils.string2Color('#4161D0'),
+                        backgroundColor: isFollowedState.value ? Colors.transparent : context.appColors.textPrimary,
                         side: BorderSide(color: !isFollowedState.value ? Colors.transparent : context.appColors.disEnableGray, width: 0.5),
                         radius: 8,
                         minHeight: 27.5,

packages/cpt_community/lib/modules/community/newsfeed_detail/newsfeed_detail_page.dart

@@ -183,7 +183,7 @@ class NewsfeedDetailPage extends HookConsumerWidget {
               height: 45.5,
               alignment: Alignment.center,
               // decoration: BoxDecoration(
-              //   color:  ColorUtils.string2Color('#4161D0'),
+              //   color:  context.appColors.textPrimary,
               //   borderRadius: BorderRadius.circular(5),
               // ),
               child: HookBuilder(
@@ -193,7 +193,7 @@ class NewsfeedDetailPage extends HookConsumerWidget {
                       text: isFollowedState.value ?  S.current.followed:S.current.to_follow,
                       textColor: isFollowedState.value ?  context.appColors.disEnableGray: context.appColors.textWhite,
                       disabledTextColor: context.appColors.disEnableGray,
-                      backgroundColor: isFollowedState.value ? Colors.transparent : ColorUtils.string2Color('#4161D0'),
+                      backgroundColor: isFollowedState.value ? Colors.transparent : context.appColors.textPrimary,
                       side: BorderSide(color: !isFollowedState.value ? Colors.transparent : context.appColors.disEnableGray, width: 0.5),
                       radius: 8,
                       minHeight: 27.5,
@@ -252,7 +252,7 @@ class NewsfeedDetailPage extends HookConsumerWidget {
                       padding: const EdgeInsets.only(left: 15, right: 15,top: 14,bottom: 14),
                       child: Row(
                         children: [
-                          MyTextView(S.current.comment_count(commentCount),  textColor: ColorUtils.string2Color("#2956B7"), fontSize: 15, isFontLight: true,),
+                          MyTextView(S.current.comment_count(commentCount),  textColor: context.appColors.textPrimary, fontSize: 15, isFontLight: true,),
                         ]
                       )
                     )
@@ -379,7 +379,7 @@ class NewsfeedDetailPage extends HookConsumerWidget {
                     comment_name,
                     isFontRegular: true,
                     fontSize: 14,
-                    textColor: ColorUtils.string2Color('#2956B7'),
+                    textColor: context.appColors.textPrimary,
                     maxLines: 1,
                     isTextEllipsis: true,
                   ),
@@ -451,6 +451,8 @@ class NewsfeedDetailPage extends HookConsumerWidget {
                           alignment: Alignment.center,
                           padding: const EdgeInsets.only(left: 10,right: 10),
                           child: Wrap(
+                            alignment: WrapAlignment.center,
+                            runAlignment: WrapAlignment.center,
                             children: [
                               MyLikeButton(
                                 key: _likeButtonKey,
@@ -488,11 +490,19 @@ class NewsfeedDetailPage extends HookConsumerWidget {
                       crossAxisAlignment: CrossAxisAlignment.center,
                       children: [
                         Container(
+                          height: 40,
                           alignment: Alignment.center,
                           padding: const EdgeInsets.only(left: 10,right: 10),
                           child: Wrap(
+                            // alignment: WrapAlignment.center,
+                            runAlignment: WrapAlignment.center,
                             children: [
-                              MyLoadImage(
+                              // MyLoadImage(
+                              //   Assets.communityNewsfeedDetailComment,
+                              //   width: 17.5,
+                              //   height: 16.5,
+                              // ),
+                              const MyAssetImage(
                                 Assets.communityNewsfeedDetailComment,
                                 width: 17.5,
                                 height: 16.5,

packages/cpt_community/lib/modules/garage/garagesale_post/garagesale_post_vm.dart

@@ -475,6 +475,7 @@ class GaragesalePostVm extends _$GaragesalePostVm {
         contactValue: totalContactStr,
         imgList: state.imgList??[],
       );
+
       if(resResult.isSuccess){
         // 更新用户信息
         // UserConfigService.getInstance().refreshUserInfo();

packages/cpt_property/lib/modules/ioan/property_ioan_page.dart

@@ -70,7 +70,7 @@ class PropertyIoanPage extends HookConsumerWidget {
                 alignment: Alignment.center,
                 textAlign: TextAlign.center,
                 marginTop: 5.5,
-                backgroundColor: ColorUtils.string2Color('#4161D0')
+                backgroundColor: context.appColors.textPrimary
               ),
               Expanded(
                 child: Row(
@@ -80,7 +80,7 @@ class PropertyIoanPage extends HookConsumerWidget {
                         width: 105,
                         height: 105,
                         padding: const EdgeInsets.all(5),
-                        color: ColorUtils.string2Color('#4161D0'),
+                        color: context.appColors.textPrimary,
                         child: Column(
                           mainAxisAlignment: MainAxisAlignment.center,
                           crossAxisAlignment: CrossAxisAlignment.center,
@@ -103,7 +103,7 @@ class PropertyIoanPage extends HookConsumerWidget {
                         width: 105,
                         height: 105,
                         padding: const EdgeInsets.all(5),
-                        color: ColorUtils.string2Color('#4161D0'),
+                        color: context.appColors.textPrimary,
                         margin: const EdgeInsets.only(left: 18),
                         child: Column(
                             mainAxisAlignment: MainAxisAlignment.center,
@@ -137,7 +137,7 @@ class PropertyIoanPage extends HookConsumerWidget {
           boxHeight: 40.5,
           alignment: Alignment.center,
           textAlign: TextAlign.center,
-          backgroundColor: ColorUtils.string2Color('#4161D0'),
+          backgroundColor: context.appColors.textPrimary,
         ),
 
         const SizedBox(height: 20),
@@ -397,7 +397,7 @@ class PropertyIoanPage extends HookConsumerWidget {
           //   visible: state.loadingState == LoadState.State_Success,
           //   child: Container(
           //     height: 50,
-          //     color: ColorUtils.string2Color('#4161D0'),
+          //     color: context.appColors.textPrimary,
           //     child: Row(
           //       mainAxisAlignment: MainAxisAlignment.center,
           //       children: [

packages/cpt_property/lib/modules/property/page/property_page.dart

@@ -81,7 +81,7 @@ class PropertyPage extends HookConsumerWidget {
                     maxLines: 1, // 设置最大行数为2
                     isTextEllipsis: true, // 超出部分用省略号表示
                     fontSize: 13,
-                    textColor: currentTabIdx == index ? ColorUtils.string2Color('#4161D0'):context.appColors.textBlack,
+                    textColor: currentTabIdx == index ? context.appColors.textPrimary:context.appColors.textBlack,
                     isFontMedium: true,
                   ),
                 ],

packages/cpt_services/lib/modules/services/clean_order_detail/clean_order_detail_page.dart

@@ -127,7 +127,7 @@ class CleanOrderDetailPage extends HookConsumerWidget {
             color: context.appColors.whiteBG,
             width: double.infinity,
             margin: const EdgeInsets.only(left: 0, right: 0, top: 5, bottom: 0),
-            padding: const EdgeInsets.only(left: 10, right: 10, top: 18.5, bottom: 18.5),
+            padding: const EdgeInsets.only(left: 10, right: 10, top: 18.5, bottom: 0),
             child: _buildOrderScore(state, vm, context),
           ),
           // profile信息
@@ -135,7 +135,7 @@ class CleanOrderDetailPage extends HookConsumerWidget {
             color: context.appColors.whiteBG,
             width: double.infinity,
             margin: const EdgeInsets.only(left: 0, right: 0, top: 5, bottom: 0),
-            padding: const EdgeInsets.only(left: 10, right: 10, top: 18.5, bottom: 18.5),
+            padding: const EdgeInsets.only(left: 10, right: 10, top: 18.5, bottom: 0),
             child: _buildOrderProfile(state, vm, context),
           ),
           // 订单 服务项目

packages/cpt_services/lib/modules/services/history/history_page.dart

@@ -132,7 +132,7 @@ class HistoryPage extends HookConsumerWidget {
       ),
       child: StausCardItem(
         key: UniqueKey(),
-        cardHeight: 150.0,
+        cardHeight: 160.0,
         item: item,
         onClickCard: (dynamic value) async {},
       ),

packages/cpt_services/lib/modules/services/homeService/service_card_item.dart

@@ -108,24 +108,24 @@ class HomeServiceCard extends StatelessWidget {
                         isFontMedium: true,
                       ),
                       MyTextView(
-                        '\$$card_price',
+                        '\$${card_price}',
                         maxLines: 1,
                         isTextEllipsis: true,
                         textAlign: TextAlign.start,
-                        textColor: ColorUtils.string2Color('#4161D0'),
+                        textColor: context.appColors.textPrimary,
                         fontSize: 15,
                         isFontMedium: true,
                         marginLeft: 2,
                       ),
-                      // MyTextView(
-                      //   '$',
-                      //   maxLines: 1,
-                      //   isTextEllipsis: true,
-                      //   textAlign: TextAlign.start,
-                      //   textColor: ColorUtils.string2Color('#666666'),
-                      //   fontSize: 11,
-                      //   isFontMedium: true,
-                      // ),
+                      MyTextView(
+                        '/hr',
+                        maxLines: 1,
+                        isTextEllipsis: true,
+                        textAlign: TextAlign.start,
+                        textColor: ColorUtils.string2Color('#666666'),
+                        fontSize: 11,
+                        isFontMedium: true,
+                      ),
                     ],
                   ),
                 ),

packages/cpt_services/lib/modules/services/repair/repair_page.dart

@@ -145,8 +145,8 @@ class RepairPage extends HookConsumerWidget with WidgetsBindingObserver {
               return [
                 SliverPersistentHeader(
                   delegate: CustomSliverPersistentHeaderDelegate(
-                    maxHeight: 120,
-                    minHeight: 120,
+                    maxHeight: 140,
+                    minHeight: 140,
                     child: _buildTopSection(context, ref, vm, state),
                   ),
                   pinned: currentPageIdx !=0? true:false,
@@ -228,7 +228,7 @@ class RepairPage extends HookConsumerWidget with WidgetsBindingObserver {
                   item['title'],
                   fontSize: 15,
                   marginTop: 8,
-                  textColor: index == currentPageIdx ? ColorUtils.string2Color('#4161D0'): context.appColors.textBlack,
+                  textColor: index == currentPageIdx ? context.appColors.textPrimary: context.appColors.textBlack,
                   textAlign: TextAlign.center,
                   isFontMedium: true,
                 ),

packages/cpt_services/lib/modules/services/service_order_confirm/service_order_confirm_page.dart

@@ -312,7 +312,7 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
       children: [
         Row(
           mainAxisAlignment: MainAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             const MyAssetImage(
               Assets.serviceServiceAvatorIcon,

packages/cpt_services/lib/modules/services/service_pay_success/service_pay_success_page.dart

@@ -124,7 +124,7 @@ class ServicePaySuccessPage extends HookConsumerWidget {
             fontSize: 15,
             textColor: context.appColors.textBlack,
             textAlign: TextAlign.center,
-            marginTop: 38,
+            marginTop: 30,
             isFontRegular: true,
           ),
           MyTextView(
@@ -189,15 +189,15 @@ class ServicePaySuccessPage extends HookConsumerWidget {
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
           Container(
-            margin: const EdgeInsets.only(left: 15, right: 15, top: 15, bottom: 15),
+            margin: const EdgeInsets.only(left: 15, right: 15, top: 15, bottom: 0),
             child: _buildCardVisitTime(context, state, ref, ),
           ),
           Container(
-            margin: const EdgeInsets.only(left: 15, right: 15, top: 15, bottom: 15),
+            margin: const EdgeInsets.only(left: 15, right: 15, top: 15, bottom: 0),
             child: _buildCardService(context, state, ref, ),
           ),
           Container(
-            margin: const EdgeInsets.only(left: 15, right: 15, top: 15, bottom: 15),
+            margin: const EdgeInsets.only(left: 15, right: 15, top: 15, bottom: 0),
             child: _buildCardAddress(context, state, ref, ),
           ),
           Container(

packages/cpt_services/lib/modules/services/services_page.dart

@@ -148,8 +148,8 @@ class ServicesPage extends HookConsumerWidget with WidgetsBindingObserver {
               return [
                 SliverPersistentHeader(
                   delegate: CustomSliverPersistentHeaderDelegate(
-                    maxHeight: 120,
-                    minHeight: 120,
+                    maxHeight: 140,
+                    minHeight: 140,
                     child: _buildTopSection(context, ref, vm, state),
                   ),
                   pinned: currentPageIdx !=0? true:false,
@@ -231,7 +231,7 @@ class ServicesPage extends HookConsumerWidget with WidgetsBindingObserver {
                   item['title'],
                   fontSize: 15,
                   marginTop: 8,
-                  textColor: index == currentPageIdx ? ColorUtils.string2Color('#4161D0'): context.appColors.textBlack,
+                  textColor: index == currentPageIdx ? context.appColors.textPrimary: context.appColors.textBlack,
                   textAlign: TextAlign.center,
                   isFontMedium: true,
                 ),

packages/cs_resources/lib/generated/assets.dart

@@ -34,7 +34,9 @@ class Assets {
   static const String baseLibImageDefaultPlaceholder = 'assets/base_lib/image_default_placeholder.png';
   static const String baseLibItemMoreBlack = 'assets/base_lib/item_more_black.webp';
   static const String baseLibItemMoreIcon = 'assets/base_lib/item_more_icon.webp';
+  static const String baseLibNavbarBackIcon = 'assets/base_lib/navbar_back_icon.webp';
   static const String baseLibSearchIcon = 'assets/base_lib/search_icon.webp';
+  static const String baseLibSearchIcon1 = 'assets/base_lib/search_icon1.webp';
   static const String baseLibWhiteBack = 'assets/base_lib/white_back.webp';
   static const String baseServiceBorderWidgetDropDown = 'assets/base_service/border_widget_drop_down.webp';
   static const String baseServiceCheckBoxChecked = 'assets/base_service/check_box_checked.webp';

packages/cs_resources/lib/theme/app_colors_theme.dart

@@ -12,7 +12,8 @@ extension AppColorsThemeExtensions on BuildContext {
 class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
   //亮色主题的自定义颜色值
   static const color666666 = Color(0xFF666666);
-  static const _colorPrimary = Color(0xFF4161D0);
+  static const colorPrimary = Color(0xFF01B5EB);
+  static const _colorPrimary = Color(0xFF01B5EB);
   static const _colorFF5E75 = Color(0xFFFF5E75);
   static const _colorFCFCFC = Color(0xFFFCFCFC);
   static const _colorD7DBE7 = Color(0xffD7DBE7);

packages/cs_widgets/lib/my_appbar.dart

@@ -1,3 +1,4 @@
+import 'package:cs_resources/generated/assets.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:cs_resources/theme/theme_config.dart';
 import 'package:flutter/cupertino.dart';
@@ -14,9 +15,9 @@ class MyAppBar {
   static AppBar appBar(BuildContext context, String title,
       {void Function()? backCallback,
       Key? key,
-      String? backIconPath,
-      double? backIconWidth,
-      double? backIconHeight,
+      String? backIconPath = Assets.baseLibNavbarBackIcon,
+      double? backIconWidth = 44,
+      double? backIconHeight = 44,
       String? subTitle,
       Color backgroundColor = Colors.transparent,
       Color? titleColor,
@@ -42,7 +43,13 @@ class MyAppBar {
                     width: backIconWidth ?? 11,
                     height: backIconHeight ?? 18,
                   ),
-                  onPressed: backCallback,
+                  onPressed: (){
+                    if (backCallback != null) {
+                      backCallback();
+                    } else {
+                      appRouter.maybePop();
+                    }
+                  },
                 )
               : null) // 使用系统默认返回按钮
           : const SizedBox.shrink(),
@@ -87,9 +94,9 @@ class MyAppBar {
       {void Function()? backCallback,
       String? value,
       String? hintText,
-      String? backIconPath,
-      double? backIconWidth,
-      double? backIconHeight,
+      String? backIconPath = Assets.baseLibNavbarBackIcon,
+      double? backIconWidth = 44,
+      double? backIconHeight = 44,
       Color textColor = Colors.black,
       Color backgroundColor = Colors.transparent,
       ValueChanged<String>? onSearch,
@@ -115,7 +122,13 @@ class MyAppBar {
                 width: backIconWidth ?? 11,
                 height: backIconHeight ?? 18,
               ),
-              onPressed: backCallback,
+              onPressed: (){
+                if (backCallback != null) {
+                  backCallback();
+                } else {
+                  appRouter.maybePop();
+                }
+              },
             )
           : null,
       iconTheme: IconThemeData(color: isDarkMode ? Colors.white : Theme.of(context).colorScheme.primary),
@@ -146,9 +159,9 @@ class MyAppBar {
     BuildContext context,
     String title, {
     void Function()? backCallback,
-    String? backIconPath,
-    double? backIconWidth,
-    double? backIconHeight,
+    String? backIconPath = Assets.baseLibNavbarBackIcon,
+    double? backIconWidth = 44,
+    double? backIconHeight = 44,
     String? subTitle,
     Color backgroundColor = Colors.transparent,
     bool showBottomDivider = false,
@@ -265,9 +278,9 @@ class MyAppBar {
     void Function()? backCallback,
     String? value,
     String? hintText,
-    String? backIconPath,
-    double? backIconWidth,
-    double? backIconHeight,
+    String? backIconPath = Assets.baseLibNavbarBackIcon,
+    double? backIconWidth = 44,
+    double? backIconHeight = 44,
     Color backgroundColor = Colors.transparent,
     ValueChanged<String>? onSearch,
     ValueChanged<String>? onChanged,

packages/cs_widgets/lib/my_checkbox_group.dart

@@ -20,8 +20,8 @@ class MyCheckboxGroup extends StatefulWidget {
     this.nameStr = 'name',
     required this.onChanged,
     this.defaultSelectedItems,
-    this.acviteColor = const Color(0xFF4161D0),
-    this.borderSideColor = const Color(0xFF4161D0),
+    this.acviteColor = AppColorsTheme.colorPrimary,
+    this.borderSideColor = AppColorsTheme.colorPrimary,
     this.labelStyle = const TextStyle(
       fontSize: 14,
       fontWeight: FontWeight.w500,

pubspec.yaml

@@ -9,4 +9,4 @@ dependencies:
   flutter_lints: ^2.0.1
 
 dev_dependencies:
-  melos: ^6.1.0
+  melos: ^6.1.0