Merge branch 'gaolong_dev' into dev

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

@@ -229,10 +229,10 @@ class CommunityPage extends HookConsumerWidget with WidgetsBindingObserver {
                         color: ColorUtils.string2Color("#F0F8FF"),
                         boxShadow: index == curTagIdx ? [
                           BoxShadow(
-                            color: context.appColors.tabLightBlueShadow, // 设置阴影颜色
+                            color: DarkThemeUtil.multiColors(context, context.appColors.tabLightBlueShadow, darkColor: AppColorsTheme.colorPrimary,)??context.appColors.tabLightBlueShadow, // 设置阴影颜色
                             blurRadius: 5, // 设置模糊半径
                             spreadRadius: 0.05, // 控制阴影扩散
-                            offset: const Offset(0, 4), // 设置阴影偏移量
+                            offset: const Offset(0, 2), // 设置阴影偏移量
                           ),] : [],// 未选中时无阴影,
                       ),
                       child: MyAssetImage(

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

@@ -59,10 +59,10 @@ class PropertyPage extends HookConsumerWidget {
                       shape: BoxShape.circle, // 设置为圆形
                       boxShadow: tabsRouter.activeIndex == index ? [
                         BoxShadow(
-                          color: context.appColors.tabLightBlueShadow, // 设置阴影颜色
+                          color: DarkThemeUtil.multiColors(context, context.appColors.tabLightBlueShadow, darkColor: AppColorsTheme.colorPrimary,)??context.appColors.tabLightBlueShadow, // 设置阴影颜色
                           blurRadius: 5, // 设置模糊半径
                           spreadRadius: 0.05, // 控制阴影扩散
-                          offset: const Offset(0, 4), // 设置阴影偏移量
+                          offset: const Offset(0, 2), // 设置阴影偏移量
                         ),
                       ] : [],// 未选中时无阴影,
                     ),

packages/cpt_services/lib/components/chooseVisitTimeContent.dart

@@ -155,7 +155,7 @@ class ChooseVisitTimeContent extends HookConsumerWidget {
                   text: '$timeText',
                   padding: const EdgeInsets.only(left: 5, right: 5, top: 0, bottom: 0),
                   textColor: itemIsChecked ?context.appColors.textPrimary: context.appColors.textDarkGray999,
-                  backgroundColor: DarkThemeUtil.multiColors(context, itemIsChecked ?ColorUtils.string2Color("#D7F6FF") : context.appColors.disEnableGray, darkColor: itemIsChecked? AppColorsTheme.colorPrimary:Colors.black),
+                  backgroundColor: DarkThemeUtil.multiColors(context, itemIsChecked ?ColorUtils.string2Color("#D7F6FF") : context.appColors.disEnableGray, darkColor: itemIsChecked? AppColorsTheme.colorPrimary.withOpacity(0.6):Colors.black),
                   enable: enable.value,
                   disabledBackgroundColor: context.appColors.disEnableGray,
                   disabledTextColor: context.appColors.textWhite,

packages/cpt_services/lib/components/chooseVisitTimeTitle.dart

@@ -76,7 +76,7 @@ class ChooseVisitTimeTitle extends HookConsumerWidget {
                       width: 100,
                       height: 65,
                       decoration: BoxDecoration(
-                        color: item.isSelected ? DarkThemeUtil.multiColors(context,  ColorUtils.string2Color('#F5F5F7'), darkColor: AppColorsTheme.colorPrimary): context.appColors.whiteBG,
+                        color: item.isSelected ? DarkThemeUtil.multiColors(context,  ColorUtils.string2Color('#F5F5F7'), darkColor: AppColorsTheme.colorPrimary.withOpacity(0.3)): context.appColors.whiteBG,
                         borderRadius: const BorderRadius.only(topLeft: Radius.circular(10), topRight: Radius.circular(10)),
                       ),
                       child: Column(

packages/cpt_services/lib/components/repair_status_card_item.dart

@@ -74,12 +74,10 @@ class RepairStausCardItem extends HookConsumerWidget {
                         ),
                         // 状态
                         MyTextView(
-                          item?.orderStatus??"-",
-                          fontSize: 14,
-                          maxLines: 1,
-                          isFontRegular: true,
-                          textAlign: TextAlign.left,
-                          textColor: context.appColors.textPrimary,
+                          item?.orderStatus ?? '',
+                          fontSize: 12,
+                          fontWeight: FontWeight.w500,
+                          textColor: getStatusColor(context, item!),
                         ),
                       ],
                     ),
@@ -177,4 +175,15 @@ class RepairStausCardItem extends HookConsumerWidget {
       minHeight: btnItem['btnHeight']?.toDouble() + 5,
     ).marginOnly(left: 5);
   }
+
+  Color getStatusColor(BuildContext context,ServiceInProgressList item) {
+    switch (item.orderStatus) {
+      case 'In Progress':
+        return ColorUtils.string2Color('#FE4066');
+      case 'Complete':
+        return ColorUtils.string2Color('#00B03E');
+      default:
+        return context.appColors.textPrimary;
+    }
+  }
 }

packages/cpt_services/lib/components/status_card_item.dart

@@ -13,6 +13,7 @@ import 'package:shared/utils/log_utils.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_button.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 import '../constants_services.dart';
 
@@ -49,7 +50,7 @@ class StausCardItem extends HookConsumerWidget {
       height: cardHeight,
       alignment: Alignment.center,
       child: Padding(
-        padding: const EdgeInsets.only(left: 18.0, right: 18.0, ),
+        padding: const EdgeInsets.only(left: 15.0, right: 15.0, ),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisAlignment: MainAxisAlignment.center,
@@ -74,14 +75,37 @@ class StausCardItem extends HookConsumerWidget {
                       ),
                     ),
                     // 状态
-                    MyTextView(
-                      item?.orderStatus??"-",
-                      fontSize: 14,
-                      maxLines: 1,
-                      isFontRegular: true,
-                      textAlign: TextAlign.left,
-                      textColor: context.appColors.textPrimary,
-                    ),
+                    // MyButton(
+                    //   onPressed: null,
+                    //   text: item?.orderStatus??"-",
+                    //   textColor: getStatusColor(context, item!),
+                    //   fontSize: 14,
+                    //   backgroundColor: DarkThemeUtil.multiColors(context, context.appColors.whiteBG, darkColor: Colors.black),
+                    //   minHeight: 30,
+                    //   minWidth: 60,
+                    //   padding: const EdgeInsets.symmetric(horizontal: 10),
+                    //   radius: 5,
+                    //   side: BorderSide(color: getStatusColor(context, item!), width: 1),
+                    //   enableOverlay: false,
+                    //   elevation: 0,
+                    //   // fontWeight: FontWeight.w500,
+                    // )
+                    Container(
+                      padding: const EdgeInsets.all(5),
+                      decoration: BoxDecoration(
+                        borderRadius: BorderRadius.circular(5),
+                        border: Border.all(
+                          color: getStatusColor(context, item!),
+                          width: 1,
+                        ),
+                      ),
+                      child: MyTextView(
+                        item?.orderStatus ?? '',
+                        fontSize: 12,
+                        fontWeight: FontWeight.w500,
+                        textColor: getStatusColor(context, item!),
+                      ),
+                    )
                   ],
                 ),
                 // 公司名称
@@ -219,4 +243,19 @@ class StausCardItem extends HookConsumerWidget {
       minHeight: btnItem['btnHeight']?.toDouble() + 5,
     ).marginOnly(left: 5);
   }
+
+  Color getStatusColor(BuildContext context,GarageSaleHistoryList item) {
+    switch (item.orderStatus) {
+      case 'Wait Paid':
+        return ColorUtils.string2Color('#FE4066');
+      case 'Wait Service':
+        return ColorUtils.string2Color('#01B5EB');
+      case 'Complete':
+        return ColorUtils.string2Color('#00B03E');
+      case 'Canceled':
+        return ColorUtils.string2Color('#939393');
+      default:
+        return context.appColors.textPrimary;
+    }
+  }
 }

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

@@ -147,8 +147,8 @@ class RepairPage extends HookConsumerWidget with WidgetsBindingObserver {
               return [
                 SliverPersistentHeader(
                   delegate: CustomSliverPersistentHeaderDelegate(
-                    maxHeight: 140,
-                    minHeight: 140,
+                    maxHeight: 120,
+                    minHeight: 120,
                     child: _buildTopSection(context, ref, vm, state),
                   ),
                   pinned: currentPageIdx !=0? true:false,
@@ -209,10 +209,10 @@ class RepairPage extends HookConsumerWidget with WidgetsBindingObserver {
                     color: ColorUtils.string2Color("#F0F8FF"),
                     boxShadow: index == currentPageIdx ? [
                       BoxShadow(
-                        color: context.appColors.tabLightBlueShadow, // 设置阴影颜色
+                        color: DarkThemeUtil.multiColors(context, context.appColors.tabLightBlueShadow, darkColor: AppColorsTheme.colorPrimary,)??context.appColors.tabLightBlueShadow, // 设置阴影颜色
                         blurRadius: 5, // 设置模糊半径
                         spreadRadius: 0.05, // 控制阴影扩散
-                        offset: const Offset(0, 4), // 设置阴影偏移量
+                        offset: const Offset(0, 2), // 设置阴影偏移量
                       ),] : [],// 未选中时无阴影,
                   ),
                   child: MyAssetImage(

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

@@ -149,8 +149,8 @@ class ServicesPage extends HookConsumerWidget with WidgetsBindingObserver {
               return [
                 SliverPersistentHeader(
                   delegate: CustomSliverPersistentHeaderDelegate(
-                    maxHeight: 140,
-                    minHeight: 140,
+                    maxHeight: 120,
+                    minHeight: 120,
                     child: _buildTopSection(context, ref, vm, state),
                   ),
                   pinned: currentPageIdx !=0? true:false,
@@ -211,10 +211,10 @@ class ServicesPage extends HookConsumerWidget with WidgetsBindingObserver {
                     color: ColorUtils.string2Color("#F0F8FF"),
                     boxShadow: index == currentPageIdx ? [
                       BoxShadow(
-                        color: context.appColors.tabLightBlueShadow, // 设置阴影颜色
+                        color: DarkThemeUtil.multiColors(context, context.appColors.tabLightBlueShadow, darkColor: AppColorsTheme.colorPrimary,)??context.appColors.tabLightBlueShadow, // 设置阴影颜色
                         blurRadius: 5, // 设置模糊半径
                         spreadRadius: 0.05, // 控制阴影扩散
-                        offset: const Offset(0, 4), // 设置阴影偏移量
+                        offset: const Offset(0, 2), // 设置阴影偏移量
                       ),] : [],// 未选中时无阴影,
                   ),
                   child: MyAssetImage(

packages/cs_widgets/lib/my_button.dart

@@ -70,6 +70,7 @@ class MyButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    Color _textColor = textColor ?? Colors.white;
     return TextButton(
         onPressed: enable
             ? (type == ClickType.debounce
@@ -86,8 +87,8 @@ class MyButton extends StatelessWidget {
                     darkColor: Colors.grey);
               }
               return DarkThemeUtil.multiColors(
-                  context, textColor ?? Colors.white,
-                  darkColor: Colors.white);
+                  context, _textColor ,
+                  darkColor: textColor??Colors.white);
             },
           ),
           backgroundColor: MaterialStateProperty.resolveWith((states) {