bug 修复 及暗黑模式调整

melos.yaml

@@ -37,7 +37,7 @@ scripts:
     description: 在每个子组件中运行 flutter pub get，用来获取和安装这些包的所有依赖
 
   build_runner_all:
-    run: dart pub global run melos exec -- "dart run build_runner build"
+    run: dart pub global run melos exec -- "dart pub run build_runner build"
     description: 如果模块包含 build_runner，执行 build_runner build 命令
     filters:
       dependsOn:
@@ -80,11 +80,11 @@ scripts:
     description: Run `dart run build_runner build` in profile module
 
   build_runner_property:
-    run: cd "$MELOS_ROOT_PATH/packages/cpt_property" && flutter pub run build_runner build --delete-conflicting-outputs --verbose
+    run: cd "$MELOS_ROOT_PATH/packages/cpt_property" && dart run build_runner build --delete-conflicting-outputs --verbose
     description: Run `dart run build_runner build` in property module
 
   watch_runner_property:
-    run: cd "$MELOS_ROOT_PATH/packages/cpt_property" && flutter pub run build_runner watch --delete-conflicting-outputs --verbose
+    run: cd "$MELOS_ROOT_PATH/packages/cpt_property" && dart run build_runner watch --delete-conflicting-outputs --verbose
     description: Run `dart run build_runner build` in property module
 
   build_runner_rewards:

packages/cpt_community/lib/components/garage_card.dart

@@ -217,7 +217,7 @@ class CollectionWidget extends HookConsumerWidget {
         height: 30,
         alignment: Alignment.center,
         // decoration: BoxDecoration(
-        //   color: ColorUtils.string2Color('#E5E5E5'),
+        //   color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
         //   borderRadius: BorderRadius.circular(15),
         // ),
         child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [

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

@@ -15,6 +15,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../router/page/community_page_router.dart';
@@ -249,7 +250,7 @@ class CommunityPage extends HookConsumerWidget with WidgetsBindingObserver {
                     MyTextView(
                       item['title'],
                       fontSize: 15,
-                      textColor: index == curTagIdx ? context.appColors.textPrimary: context.appColors.textBlack,
+                      textColor: DarkThemeUtil.multiColors(context, index == curTagIdx ? context.appColors.textPrimary: context.appColors.textBlack, darkColor: index == curTagIdx? AppColorsTheme.colorPrimary: Colors.white),
                       textAlign: TextAlign.center,
                       isFontMedium: true,
                     ),
@@ -274,7 +275,7 @@ class CommunityPage extends HookConsumerWidget with WidgetsBindingObserver {
        }
        return Container(
         width: double.infinity,
-        color: ColorUtils.string2Color('#F2F3F6'),
+        color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F2F3F6'), darkColor: Colors.white60),
         child: Center(
           child: NewsfeedTabs(
             key: UniqueKey(),
@@ -312,7 +313,7 @@ class CommunityPage extends HookConsumerWidget with WidgetsBindingObserver {
           height: 65.5,
           width: double.infinity,
           padding: const EdgeInsets.only(left: 20, right: 20),
-          color: Colors.white,
+          color: DarkThemeUtil.multiColors(context, context.appColors.whiteBG, darkColor: Colors.black),
           child: Row(
             children: [
               // const MyAssetImage(Assets.communityNewsFeed, width: 45,height: 45,),
@@ -326,12 +327,12 @@ class CommunityPage extends HookConsumerWidget with WidgetsBindingObserver {
               Expanded(
                 child: MyTextView(
                   S.current.what_on_your_mind,
-                  textColor: context.appColors.textBlack,
+                  textColor: DarkThemeUtil.multiColors(context, context.appColors.textBlack, darkColor: Colors.white),
                   fontSize: 15,
                   marginLeft: 15,
                   alignment: Alignment.centerLeft,
                   textAlign: TextAlign.left,
-                  backgroundColor: ColorUtils.string2Color('#ffffff'),
+                  backgroundColor: DarkThemeUtil.multiColors(context, context.appColors.textWhite, darkColor: Colors.black),
                   maxLines: 1,
                   isFontMedium: true,
                 ),
@@ -354,7 +355,7 @@ class CommunityPage extends HookConsumerWidget with WidgetsBindingObserver {
           height: 65.5,
           width: double.infinity,
           padding: const EdgeInsets.only(left: 20, right: 20),
-          color: Colors.white,
+          color: DarkThemeUtil.multiColors(context, context.appColors.whiteBG, darkColor: Colors.black),
           child: Row(
             children: [
               MyLoadImage(
@@ -367,7 +368,8 @@ class CommunityPage extends HookConsumerWidget with WidgetsBindingObserver {
               Expanded(
                 child: MyTextView(
                   S.current.sell_item,
-                  textColor: context.appColors.textBlack,
+                  // S.current.rent_item,
+                  textColor: DarkThemeUtil.multiColors(context, context.appColors.textBlack, darkColor: Colors.white),
                   fontSize: 15,
                   marginLeft: 15,
                   alignment: Alignment.centerLeft,

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

@@ -58,7 +58,7 @@ class FollowingPage extends HookConsumerWidget {
       //   "following",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      // backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      // backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
         body: Column(
           mainAxisSize: MainAxisSize.max,
           children: [

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

@@ -59,7 +59,7 @@ class ForyouPage extends HookConsumerWidget {
       //   "foryou",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      // backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      // backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
         body: Column(
           mainAxisSize: MainAxisSize.max,
           children: [

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

@@ -19,6 +19,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 import 'package:easy_refresh/easy_refresh.dart';
 
@@ -62,7 +63,7 @@ class NewsPage extends HookConsumerWidget {
       //   "news",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: Column(
         mainAxisSize: MainAxisSize.max,
         children: [
@@ -130,6 +131,7 @@ class NewsPage extends HookConsumerWidget {
           borderRadius: BorderRadius.circular(10),
           boxShadow: [
             BoxShadow(
+              // color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#E4E7EB").withOpacity(0.5), darkColor: Colors.transparent)??Colors.transparent,
               color: ColorUtils.string2Color("#E4E7EB").withOpacity(0.5),
               spreadRadius: 0,
               blurRadius: 4,
@@ -204,9 +206,9 @@ class NewsPage extends HookConsumerWidget {
                     // ),
                     child: MyButton(
                       text: card_followed ? S.current.followed:S.current.to_follow,
-                      textColor: card_followed ?  context.appColors.disEnableGray: context.appColors.textWhite,
+                      textColor: DarkThemeUtil.multiColors(context, card_followed ? context.appColors.disEnableGray: context.appColors.textWhite, darkColor: card_followed ? context.appColors.textWhite: context.appColors.textWhite),
                       disabledTextColor: context.appColors.disEnableGray,
-                      backgroundColor: card_followed ? Colors.transparent : context.appColors.textPrimary,
+                      backgroundColor: DarkThemeUtil.multiColors(context, card_followed ? Colors.transparent : context.appColors.textPrimary, darkColor: card_followed ? Colors.white38 : AppColorsTheme.colorPrimary),
                       side: BorderSide(color: !card_followed ? 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

@@ -21,6 +21,7 @@ import 'package:widgets/my_button.dart';
 import 'package:widgets/my_like_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_button.dart';
 
@@ -72,7 +73,7 @@ class NewsfeedDetailPage extends HookConsumerWidget {
         S.current.news_feed_detail,
         backgroundColor: context.appColors.backgroundWhite,
       ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: Column(
           mainAxisSize: MainAxisSize.max,
           children:[
@@ -442,7 +443,7 @@ class NewsfeedDetailPage extends HookConsumerWidget {
         child: Container(
             height: 60,
             width: MediaQuery.of(context).size.width,
-            color: context.appColors.textPrimary,
+            color: DarkThemeUtil.multiColors(context, context.appColors.textPrimary, darkColor: Colors.black),
             child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 crossAxisAlignment: CrossAxisAlignment.center,
@@ -476,7 +477,7 @@ class NewsfeedDetailPage extends HookConsumerWidget {
 
                               MyTextView(
                                 S.current.like,
-                                textColor: context.appColors.whiteBG,
+                                textColor: DarkThemeUtil.multiColors(context, context.appColors.textWhite, darkColor: Colors.white),
                                 fontSize: 14,
                                 isFontRegular: true,
                               )
@@ -515,7 +516,7 @@ class NewsfeedDetailPage extends HookConsumerWidget {
                               const SizedBox(width: 10,),
                               MyTextView(
                                 S.current.comment,
-                                textColor: context.appColors.whiteBG,
+                                textColor: DarkThemeUtil.multiColors(context, context.appColors.textWhite, darkColor: Colors.white),
                                 fontSize: 14,
                                 isFontRegular: true,
                               ),

packages/cpt_community/lib/modules/community/newsfeed_post/newsfeed_post_page.dart

@@ -12,6 +12,7 @@ import 'package:shared/utils/color_utils.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:widgets/my_text_field.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 import 'package:widgets/my_button.dart';
 
@@ -42,7 +43,7 @@ class NewsfeedPostPage extends HookConsumerWidget {
         S.current.create_post,
         backgroundColor: context.appColors.backgroundWhite,
       ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: Column(
           children: [
             Expanded(
@@ -59,7 +60,7 @@ class NewsfeedPostPage extends HookConsumerWidget {
                             height: 200,
                             padding: const EdgeInsets.all(15),
                             decoration: BoxDecoration(
-                                color: Colors.white,
+                                color: context.appColors.whiteBG,
                                 borderRadius: BorderRadius.circular(5),
                                 boxShadow: [
                                   BoxShadow(
@@ -78,7 +79,7 @@ class NewsfeedPostPage extends HookConsumerWidget {
                             margin: const EdgeInsets.only(left:15, right:15, top: 20, bottom: 20),
                             padding: const EdgeInsets.all(15),
                             decoration: BoxDecoration(
-                                color: Colors.white,
+                                color: context.appColors.whiteBG,
                                 borderRadius: BorderRadius.circular(5),
                                 boxShadow: [
                                   BoxShadow(
@@ -106,7 +107,7 @@ class NewsfeedPostPage extends HookConsumerWidget {
                         radius: 0,
                         minHeight: 50,
                         backgroundColor: context.appColors.textPrimary,
-                        textColor: Colors.white,
+                        textColor: context.appColors.textWhite,
                         fontWeight: FontWeight.w500,
                         fontSize: 16,
                         onPressed: () {

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

@@ -10,6 +10,7 @@ import 'package:widgets/my_load_image.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 import 'community_page.dart';
 import 'community_vm.dart';
@@ -96,7 +97,8 @@ class NewsfeedTabs extends HookConsumerWidget {
       height: 43,
       margin: margin,
       decoration: index==curTabIdx? BoxDecoration(
-        color: index==curTabIdx? context.appColors.btnBgDefault: ColorUtils.string2Color("#F2F3F6"),
+        // color: index==curTabIdx? context.appColors.btnBgDefault: ColorUtils.string2Color("#F2F3F6"),
+        color: DarkThemeUtil.multiColors(context, index==curTabIdx? context.appColors.btnBgDefault: ColorUtils.string2Color("#F2F3F6"), darkColor: index==curTabIdx? context.appColors.btnBgDefault: ColorUtils.string2Color("#F2F3F6")),
         borderRadius: BorderRadius.circular(20),
         boxShadow: [
           BoxShadow(
@@ -117,7 +119,7 @@ class NewsfeedTabs extends HookConsumerWidget {
                 fontSize: 16,
                 textAlign: TextAlign.center,
                 isFontMedium: true,
-                textColor: index == curTabIdx ? Colors.white :ColorUtils.string2Color("#000000"),
+                textColor: DarkThemeUtil.multiColors(context, index==curTabIdx? context.appColors.textWhite: ColorUtils.string2Color("#000000"), darkColor: index==curTabIdx? Colors.white: ColorUtils.string2Color("#000000")),
               ),
             ).onTap((){
               // Log.d("----currentCatgoryIdx----$currentCatgoryIdx-------");

packages/cpt_community/lib/modules/garage/for_rent/for_rent_page.dart

@@ -17,6 +17,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../components/garage_card.dart';
@@ -58,7 +59,7 @@ class ForrentPage extends HookConsumerWidget {
       //   "Forrent",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-        backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+        backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,
@@ -116,7 +117,7 @@ class ForrentPage extends HookConsumerWidget {
           borderRadius: BorderRadius.circular(8),
           boxShadow: [
             BoxShadow(
-              color: ColorUtils.string2Color('#E5E5E5'),
+              color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
               offset: const Offset(0, 2),
               blurRadius: 8,
             ),

packages/cpt_community/lib/modules/garage/for_sale/for_sale_page.dart

@@ -19,6 +19,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../components/garage_card.dart';
@@ -62,7 +63,7 @@ class ForsalePage extends HookConsumerWidget {
       //   "Forsale",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: SizedBox(
         width: double.infinity,
         height: double.infinity,
@@ -120,7 +121,7 @@ class ForsalePage extends HookConsumerWidget {
           borderRadius: BorderRadius.circular(8),
           boxShadow: [
             BoxShadow(
-              color: ColorUtils.string2Color('#E5E5E5'),
+              color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
               offset: const Offset(0, 2),
               blurRadius: 8,
             ),

packages/cpt_community/lib/modules/my_following/components/item_following.dart

@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shared/utils/log_utils.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_button.dart';
 import 'package:widgets/my_load_image.dart';
@@ -63,6 +64,7 @@ class MyFollowingListItem extends StatelessWidget {
               ),
               // _buildIsFollowButton(context),
               itemType == MyFollowingType['isFollowType'] ? HookConsumer(
+                key: ValueKey(itemObj['id']), // 唯一标识每个 item
                 builder: (context, ref, child) {
                   final isFollow = useState<bool>(true);
                   return  MyButton(
@@ -71,10 +73,12 @@ class MyFollowingListItem extends StatelessWidget {
                       final vm = ref.read(itemFollowingVmProvider.notifier);
                       // todo 调用接口 然后更新状态
                       int to_user_id = itemObj['id'];
-                      bool asyncResult = await vm.handlerFollow(context, to_user_id, isFollow.value, itemType!);
-                      if(asyncResult){
-                        isFollow.value = !isFollow.value;
-                      }
+                      vm.handlerFollow(context, to_user_id, isFollow.value, itemType!, (asyncResult){
+                        if(asyncResult){
+                          isFollow.value = !isFollow.value;
+                        }
+                      });
+
                     },
                     textColor: isFollow.value? context.appColors.textDarkGray : context.appColors.textWhite,
                     side: isFollow.value?  BorderSide(color: context.appColors.textDarkGray,width: 0.5) : BorderSide.none,

packages/cpt_community/lib/modules/my_following/components/item_following_vm.dart

@@ -1,7 +1,10 @@
+import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:plugin_basic/provider/user_config/user_config_service.dart';
+import 'package:plugin_platform/engine/dialog/dialog_engine.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shared/utils/log_utils.dart';
+import 'package:widgets/dialog/app_custom_dialog.dart';
 
 import '../../../respository/common_newsfeed.dart';
 import '../my_follow/my_follow_vm.dart';
@@ -29,12 +32,37 @@ class ItemFollowingVm extends _$ItemFollowingVm {
   }
 
   // 关注/取消关注
-  Future<bool> handlerFollow(BuildContext? context, int to_user_id, bool isFollow, String itemType) async{
+  handlerFollow(BuildContext? context, int to_user_id, bool isFollow, String itemType, Function(bool)? callback) async{
     Log.d("点击了 关注");
+    if(isFollow){
+      await DialogEngine.show(
+          tag: "cancelFollow",
+          position: DialogPosition.center,
+          widget: AppCustomDialog(
+            message: 'Are you sure you want to cancel follow',
+            dialogWidth: MediaQuery.of(context!).size.width * 0.8,
+            // contentBoxMaxHeight: 350,
+            // contentBoxMinHeight: 300,
+            isShowConfirmBtn:  true,
+            isShowCancelBtn: true,
+            confirmTxt: "Ok",
+            confirmAction: (){
+              // 点击了确定
+              Log.d("----点击了确定按钮");
+              excuteCancelFollow(context, to_user_id, isFollow, itemType!, callback);
+            },
+          )
+      );
+
+    }
+  }
+
+  Future<bool> excuteCancelFollow(BuildContext context, int to_user_id, bool isFollow, String itemType, Function(bool)? callback) async{
     try {
       final result = await commonNewsFeedRespositoryInstance.handlerFollowOrCancel({
         "to_user_id": to_user_id,
       });
+      bool flag = false;
       if(result.isSuccess){
         if(itemType == MyFollowingType['isFollowType']){
           // 删除 my_follow_list 中 id 为 to_user_id 的item
@@ -43,13 +71,15 @@ class ItemFollowingVm extends _$ItemFollowingVm {
         }else if(itemType == MyFollowingType['isFollowerType']){
           // final myFlowerVm = ref.read(myFollowerVmProvider.notifier);
         }
-
         // 同步用户信息
         UserConfigService.getInstance().refreshUserInfo();
-        return true;
+        flag = true;
       }else {
-        return false;
+        flag = false;
       }
+      callback?.call(flag);
+      return flag;
+
     }catch(error){
       Log.d("error: $error");
       return false;

packages/cpt_community/lib/modules/my_following/my_follow/my_follow_page.dart

@@ -16,6 +16,7 @@ import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:widgets/search_app_bar.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../router/page/community_page_router.dart';
@@ -41,7 +42,7 @@ class MyFollowPage extends HookConsumerWidget {
     final vm = ref.read(myFollowVmProvider.notifier);
     final state = ref.watch(myFollowVmProvider);
     final useSearchBar = useState(false);
-    // 用于存储前一次的滚动位置
+    // 存储前一次的滚动位置
     final previousOffset = useState(0.0);
 
     useEffect(() {
@@ -65,7 +66,7 @@ class MyFollowPage extends HookConsumerWidget {
         //   '${useSearchBar.value}',
         //   backgroundColor: context.appColors.whiteBG,
         // ),
-        backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+        backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
         body: Container(
           height: double.infinity,
           width: double.infinity,
@@ -79,7 +80,7 @@ class MyFollowPage extends HookConsumerWidget {
                 // Log.d("---最大滚动距离-----${metrics.maxScrollExtent}-------");
                 if (currentOffset > prevOffset) {
                   // 向上滚动
-                  // 日志输出当前滚动偏移量和前一次滚动偏移量
+                  // 当前滚动偏移量和前一次滚动偏移量
                   // Log.d('--向上滚动---当前currentOffset: $currentOffset, previousOffset: $prevOffset---------');
                   if(useSearchBar.value == false && metrics.maxScrollExtent >=0 && currentOffset >= 110){
                     // 滚动到110 时 将 titlebar 换成 searchbar
@@ -87,7 +88,7 @@ class MyFollowPage extends HookConsumerWidget {
                   }
                 } else if (currentOffset < prevOffset) {
                   // 向下滚动
-                  // 日志输出当前滚动偏移量和前一次滚动偏移量
+                  // 当前滚动偏移量和前一次滚动偏移量
                   // Log.d('--向下滚动---当前currentOffset: $currentOffset, previousOffset: $prevOffset---------');
                   if(useSearchBar.value == true && metrics.maxScrollExtent >=0 && currentOffset <= 110){
                     // 滚动到110 时 将 searchbar 换成 titlebar
@@ -97,8 +98,6 @@ class MyFollowPage extends HookConsumerWidget {
                 // 更新前一次的滚动位置
                 previousOffset.value = currentOffset;
               }
-
-              // 返回 true 表示通知被消耗
               return false;
             },
             child: EasyRefresh(
@@ -157,6 +156,9 @@ class MyFollowPage extends HookConsumerWidget {
 
   Widget _buildFollowItem(BuildContext context,WidgetRef ref, Map<String, dynamic> item, vm, index, totalIndex) {
     bool isLast = index == totalIndex - 1;
+    Log.d("----isLast----$isLast");
+    Log.d("----item----$item");
+    Log.d("-----item---- ${MyFollowingType['isFollowType']}");
     return MyFollowingListItem(
         itemObj: item,
         itemType: MyFollowingType['isFollowType'],

packages/cpt_community/lib/modules/my_following/my_follow/my_follow_vm.dart

@@ -180,7 +180,7 @@ class MyFollowVm extends _$MyFollowVm {
   }
 
   softDeleteItem(int id){
-    state.list!.removeWhere((element) => element['id'] == id);
+    state.list!.removeWhere((element) => element['id'] as int == id);
     state = state.copyWith(list: state.list);
     // 更新 my_posts_tabs 里面的数字
     updateMyFollowingTabsNum(tabsNamesData['Follow'], state.list!.length, 0);

packages/cpt_community/lib/modules/my_following/my_follower/my_follower_page.dart

@@ -16,6 +16,7 @@ import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:widgets/search_app_bar.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../router/page/community_page_router.dart';
@@ -65,7 +66,7 @@ class MyFollowerPage extends HookConsumerWidget {
       //   "following",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-        backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+        backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
         body: Container(
           height: double.infinity,
           width: double.infinity,
@@ -79,7 +80,7 @@ class MyFollowerPage extends HookConsumerWidget {
                 // Log.d("---最大滚动距离-----${metrics.maxScrollExtent}-------");
                 if (currentOffset > prevOffset) {
                   // 向上滚动
-                  // 日志输出当前滚动偏移量和前一次滚动偏移量
+                  // 当前滚动偏移量和前一次滚动偏移量
                   // Log.d('--向上滚动---当前currentOffset: $currentOffset, previousOffset: $prevOffset---------');
                   if(useSearchBar.value == false && metrics.maxScrollExtent >=0 && currentOffset >= 110){
                     // 滚动到110 时 将 titlebar 换成 searchbar
@@ -87,7 +88,7 @@ class MyFollowerPage extends HookConsumerWidget {
                   }
                 } else if (currentOffset < prevOffset) {
                   // 向下滚动
-                  // 日志输出当前滚动偏移量和前一次滚动偏移量
+                  // 当前滚动偏移量和前一次滚动偏移量
                   // Log.d('--向下滚动---当前currentOffset: $currentOffset, previousOffset: $prevOffset---------');
                   if(useSearchBar.value == true && metrics.maxScrollExtent >=0 && currentOffset <= 110){
                     // 滚动到110 时 将 searchbar 换成 titlebar
@@ -98,7 +99,6 @@ class MyFollowerPage extends HookConsumerWidget {
                 previousOffset.value = currentOffset;
               }
 
-              // 返回 true 表示通知被消耗
               return false;
             },
             child: EasyRefresh(

packages/cpt_community/lib/modules/my_following/my_following_page.dart

@@ -17,6 +17,7 @@ import 'package:widgets/my_appbar.dart';
 import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/search_app_bar.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../components/newfeed_card_header.dart';
@@ -101,7 +102,7 @@ class MyFollowingPage extends HookConsumerWidget {
     return Scaffold(
       appBar: _buildPageAppBar(context, ref, state),
       // appBar: MyAppBar.searchAppBar(context),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: Column(
         children:[
           Expanded(

packages/cpt_community/lib/modules/my_posts/components/my_posts_sale_rent_item.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:shared/utils/color_utils.dart';
 import 'package:shared/utils/log_utils.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 import '../../../components/garage_card.dart';
 import 'my_posts_sale_rent_item_vm.dart';
@@ -25,7 +26,7 @@ class MyPostsSaleRentItem extends HookConsumerWidget {
           borderRadius: BorderRadius.circular(8),
           boxShadow: [
             BoxShadow(
-              color: ColorUtils.string2Color('#E5E5E5'),
+              color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
               offset: const Offset(0, 2),
               blurRadius: 8,
             ),

packages/cpt_community/lib/modules/my_posts/my_posts_forrent/my_posts_forrent_page.dart

@@ -14,6 +14,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../components/garage_card.dart';
@@ -54,7 +55,7 @@ class MyPostsForRentPage extends HookConsumerWidget {
       //   "MyPostsForRent",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,

packages/cpt_community/lib/modules/my_posts/my_posts_forsale/my_posts_forsale_page.dart

@@ -14,6 +14,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../components/garage_card.dart';
@@ -55,7 +56,7 @@ class MyPostsForSalePage extends HookConsumerWidget {
       //   "MyPostsForSale",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,

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

@@ -13,6 +13,7 @@ import 'package:widgets/load_state_layout.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 '../../../router/page/property_page_router.dart';
 import 'property_ioan_vm.dart';
@@ -53,7 +54,7 @@ class PropertyIoanPage extends HookConsumerWidget {
           height: 210,
           decoration: BoxDecoration(
             borderRadius: BorderRadius.circular(0),
-            color: ColorUtils.string2Color('#FEFEFE'),
+            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#FEFEFE'), darkColor: Colors.black),
             image: const DecorationImage(
               image: AssetImage('packages/cs_resources/${Assets.propertyHomeLoanBg}'), // 使用包中的资源
               fit: BoxFit.cover,
@@ -63,14 +64,14 @@ class PropertyIoanPage extends HookConsumerWidget {
             children: [
               MyTextView(
                 S.current.exclusive_rates,
-                textColor: ColorUtils.string2Color('#FEFEFE'),
+                textColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#FEFEFE'), darkColor: Colors.black),
                 fontSize: 15,
                 boxWidth: 237,
                 boxHeight: 35,
                 alignment: Alignment.center,
                 textAlign: TextAlign.center,
                 marginTop: 5.5,
-                backgroundColor: context.appColors.textPrimary
+                backgroundColor: DarkThemeUtil.multiColors(context, context.appColors.textPrimary, darkColor: Colors.black),
               ),
               Expanded(
                 child: Row(
@@ -80,7 +81,7 @@ class PropertyIoanPage extends HookConsumerWidget {
                         width: 105,
                         height: 105,
                         padding: const EdgeInsets.all(5),
-                        color: context.appColors.textPrimary,
+                        color: DarkThemeUtil.multiColors(context, context.appColors.textPrimary, darkColor: Colors.black),
                         child: Column(
                           mainAxisAlignment: MainAxisAlignment.center,
                           crossAxisAlignment: CrossAxisAlignment.center,
@@ -103,7 +104,7 @@ class PropertyIoanPage extends HookConsumerWidget {
                         width: 105,
                         height: 105,
                         padding: const EdgeInsets.all(5),
-                        color: context.appColors.textPrimary,
+                        color: DarkThemeUtil.multiColors(context, context.appColors.textPrimary, darkColor: Colors.black),
                         margin: const EdgeInsets.only(left: 18),
                         child: Column(
                             mainAxisAlignment: MainAxisAlignment.center,
@@ -262,7 +263,7 @@ class PropertyIoanPage extends HookConsumerWidget {
         children: [
           MyTextView(
             S.current.choose_best_package,
-            textColor: context.appColors.textBlack,
+            textColor: DarkThemeUtil.multiColors(context, context.appColors.textBlack, darkColor: Colors.white),
             fontSize: 18,
             isFontMedium: true,
             marginTop: 20,
@@ -271,7 +272,7 @@ class PropertyIoanPage extends HookConsumerWidget {
           ),
           MyTextView(
             S.current.text_no_hidden_fees,
-            textColor: context.appColors.textBlack,
+            textColor: DarkThemeUtil.multiColors(context, context.appColors.textBlack, darkColor: Colors.white),
             fontSize: 15,
             textAlign: TextAlign.center,
             marginBottom: 20,
@@ -288,7 +289,7 @@ class PropertyIoanPage extends HookConsumerWidget {
         children: [
           MyTextView(
            S.current.what_do_we_offer,
-            textColor: context.appColors.textBlack,
+            textColor: DarkThemeUtil.multiColors(context, context.appColors.textBlack, darkColor: Colors.white),
             fontSize: 18,
             isFontMedium: true,
             marginTop: 16.5,
@@ -371,7 +372,7 @@ class PropertyIoanPage extends HookConsumerWidget {
     }, []);
 
     return Scaffold(
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       // appBar: AppBar(title: Text("资产")),
       body: Column(
         children: [
@@ -406,7 +407,7 @@ class PropertyIoanPage extends HookConsumerWidget {
           //         MyTextView(
           //           "Request a Quote",
           //           fontSize: 16,
-          //           textColor: Colors.white,
+          //           textColor: context.appColors.textWhite,
           //           isFontMedium: true,
           //         ),
           //       ],

packages/cpt_property/lib/modules/news/page/property_news_page.dart

@@ -13,6 +13,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/load_state_layout.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:cs_resources/generated/assets.dart';
 
@@ -42,7 +43,6 @@ class PropertyNewsPage extends HookConsumerWidget {
         width: cardLeftWidth,
         decoration: BoxDecoration(
           color: ColorUtils.string2Color('#F2F3F6'),
-          // color: Colors.red,
           borderRadius: const BorderRadius.only(
             topLeft: Radius.circular(8),
             bottomLeft: Radius.circular(8),
@@ -200,8 +200,7 @@ class PropertyNewsPage extends HookConsumerWidget {
 
     return Scaffold(
       // appBar: AppBar(title: Text("资产")),
-      // backgroundColor: context.appColors.backgroundDefault,
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: SizedBox(
         width: double.infinity,
         height: double.infinity,

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

@@ -12,6 +12,7 @@ import 'package:widgets/my_load_image.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 import '../../../router/page/property_page_router.dart';
 import '../vm/property_vm.dart';

packages/cpt_property/lib/modules/rent/page/property_rent_page.dart

@@ -13,6 +13,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/load_state_layout.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:cs_resources/generated/assets.dart';
 
@@ -49,12 +50,12 @@ class PropertyRentPage extends HookConsumerWidget {
   Widget _buildItemRightSection(BuildContext context,WidgetRef ref, Map<String, dynamic> item, _vm) {
     String price = item.getValue('price', '');
     return Container(
-      color: context.appColors.textWhite,
+      color: DarkThemeUtil.multiColors(context, context.appColors.textWhite, darkColor: Colors.black), // 背景颜色
       child: TextButton(
         onPressed: (){},
         style: TextButton.styleFrom(
           foregroundColor: context.appColors.textBlack,
-          backgroundColor: ColorUtils.string2Color('#EFF3FF'), // 背景颜色
+          backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#EFF3FF'), darkColor: Colors.black), // 背景颜色
           // minimumSize: const Size(71, 30), // 最小宽度和高度
           padding: const EdgeInsets.symmetric(horizontal: 17.5, vertical: 7.5), // 内边距
           shape: RoundedRectangleBorder(
@@ -138,7 +139,7 @@ class PropertyRentPage extends HookConsumerWidget {
     }, []);
     return Scaffold(
       // appBar: AppBar(title: Text("资产")),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,

packages/cpt_property/lib/modules/sale/page/property_sale_page.dart

@@ -12,6 +12,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/load_state_layout.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:cs_resources/generated/assets.dart';
 
@@ -47,13 +48,13 @@ class PropertySalePage extends HookConsumerWidget {
   Widget _buildItemRightSection(BuildContext context,WidgetRef ref, Map<String, dynamic>item, _vm) {
     String price = item.getValue('price', '');
     return Container(
-      color: context.appColors.textWhite,
+      color: DarkThemeUtil.multiColors(context, context.appColors.textWhite, darkColor: Colors.black), // 背景颜
       width: 120,
       child: TextButton(
         onPressed: (){},
         style: TextButton.styleFrom(
           foregroundColor: context.appColors.textBlack,
-          backgroundColor: ColorUtils.string2Color('#EFF3FF'), // 背景颜色
+          backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#EFF3FF'), darkColor: Colors.black), // 背景颜
           // minimumSize: const Size(91.5, 44), // 最小宽度和高度
           padding: const EdgeInsets.symmetric(horizontal: 11.0, vertical: 14), // 内边距
           shape: RoundedRectangleBorder(
@@ -124,7 +125,7 @@ class PropertySalePage extends HookConsumerWidget {
 
     return Scaffold(
       // appBar: AppBar(title: Text("资产")),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: EasyRefresh(
         controller: _vm.refreshController,
         // 上拉加载

packages/cpt_services/lib/components/chooseAirConditionContent_vm.g.dart

@@ -7,7 +7,7 @@ part of 'chooseAirConditionContent_vm.dart';
 // **************************************************************************
 
 String _$chooseAirConditionContentVmHash() =>
-    r'54d8f91a4ffe39cc789fd1500b4a8e37b4e0a5b0';
+    r'8ada9dea431ef72afb15bccca9720ecb32d02579';
 
 /// See also [ChooseAirConditionContentVm].
 @ProviderFor(ChooseAirConditionContentVm)

packages/cpt_services/lib/components/chooseHouseCleanContent.dart

@@ -11,6 +11,7 @@ import 'package:shared/utils/color_utils.dart';
 import 'package:shared/utils/log_utils.dart';
 import 'package:widgets/my_button.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_cart_num.dart';
 import 'chooseHouseCleanContent_state.dart';
@@ -77,7 +78,7 @@ class ChooseHouseCleanContent extends HookConsumerWidget {
     return Container(
       padding: const EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 10),
       margin: const EdgeInsets.only(left: 15, right: 15, top: 0, bottom: 0),
-      color: ColorUtils.string2Color('#F8F8F8'),
+      color: context.appColors.whiteBG,
       child: Column(
         children: [
           Row(
@@ -127,8 +128,9 @@ class ChooseHouseCleanContent extends HookConsumerWidget {
                 fontSize: 19,
                 fontWeight: FontWeight.w500,
                 enable: !isDisable,
-                textColor:  !isChecked? context.appColors.textPrimary : context.appColors.textWhite,
-                backgroundColor: !isChecked ? context.appColors.textWhite : context.appColors.textPrimary,
+                textColor:  DarkThemeUtil.multiColors(context, !isChecked? context.appColors.textPrimary : context.appColors.textWhite, darkColor: isChecked? context.appColors.textPrimary :Colors.white)  ,
+                // backgroundColor: !isChecked ? context.appColors.textWhite : context.appColors.textPrimary,
+                backgroundColor: !isChecked ? context.appColors.textWhite : AppColorsTheme.colorPrimary,
                 disabledBackgroundColor: context.appColors.disEnableGray,
                 disabledTextColor: context.appColors.textWhite,
               ),

packages/cpt_services/lib/components/chooseHouseCleanContent_vm.g.dart

@@ -7,7 +7,7 @@ part of 'chooseHouseCleanContent_vm.dart';
 // **************************************************************************
 
 String _$chooseHouseCleanContentVmHash() =>
-    r'acb10c35766b4580f8f01dd53555e24817941f1e';
+    r'3743258e9d8389c5552a89aa7a6717e038d16bb0';
 
 /// See also [ChooseHouseCleanContentVm].
 @ProviderFor(ChooseHouseCleanContentVm)

packages/cpt_services/lib/components/chooseVisitTimeBottomFooter.dart

@@ -11,6 +11,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:shared/utils/log_utils.dart';
 import 'package:widgets/ext/ex_widget.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_cart_num.dart';
 
@@ -69,7 +70,7 @@ class ChooseVisitTimeBottomFooter extends HookConsumerWidget {
                       MyTextView(
                         "\$$totalPrice",
                         fontSize: 18,
-                        textColor: Colors.white,
+                        textColor: context.appColors.textWhite,
                         isFontRegular: true,
                         maxLines:2,
                         isTextEllipsis: true,
@@ -80,11 +81,11 @@ class ChooseVisitTimeBottomFooter extends HookConsumerWidget {
                   ),
                 ),
               ],
-            ).backgroundColor(context.appColors.textPrimary),
+            ).backgroundColor(DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: AppColorsTheme.colorPrimary)),
           ),
           Expanded(
             child: Container(
-              color: context.appColors.redDefault,
+              color: DarkThemeUtil.multiColors(context, context.appColors.redDefault, darkColor: context.appColors.redDefault),
               child: Center(
                 child: MyTextView(
                  S.current.confirm,

packages/cpt_services/lib/components/chooseVisitTimeTitle.dart

@@ -9,10 +9,12 @@ import 'package:flutter/material.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:plugin_basic/provider/app_config/app_config_service.dart';
 import 'package:shared/utils/color_utils.dart';
 import 'package:shared/utils/log_utils.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import 'chooseVisitTimeTitle_state.dart';
@@ -74,7 +76,7 @@ class ChooseVisitTimeTitle extends HookConsumerWidget {
                       width: 100,
                       height: 65,
                       decoration: BoxDecoration(
-                        color: item.isSelected ? ColorUtils.string2Color('#F5F5F7'): context.appColors.whiteBG,
+                        color: item.isSelected ? DarkThemeUtil.multiColors(context,  ColorUtils.string2Color('#F5F5F7'), darkColor: AppColorsTheme.colorPrimary): context.appColors.whiteBG,
                         borderRadius: const BorderRadius.only(topLeft: Radius.circular(10), topRight: Radius.circular(10)),
                       ),
                       child: Column(

packages/cpt_services/lib/modules/services/clean_order_cancel_success/clean_order_cancel_success_page.dart

@@ -10,6 +10,7 @@ import 'package:widgets/my_button.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import '../../../router/page/services_page_router.dart';
 
 @RoutePage()
@@ -46,7 +47,7 @@ class CleanOrderCancelSuccessPage extends HookConsumerWidget {
           S.current.cancellation_of_order,
           backgroundColor: context.appColors.whiteBG,
         ),
-        backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+        backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F2F3F6'), darkColor: Colors.black)?? Colors.black,
         body: Center(
           child: Container(
             margin: const EdgeInsets.only(top: 50),

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

@@ -23,6 +23,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../components/chooseHouseCleanContent.dart';
@@ -79,7 +80,7 @@ class CleanOrderDetailPage extends HookConsumerWidget {
         S.current.order_details,
         backgroundColor: context.appColors.whiteBG,
       ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F2F3F6'), darkColor: Colors.black)?? Colors.black,
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,

packages/cpt_services/lib/modules/services/clean_order_detail/clean_order_detail_vm.g.dart

@@ -7,7 +7,7 @@ part of 'clean_order_detail_vm.dart';
 // **************************************************************************
 
 String _$cleanOrderDetailVmHash() =>
-    r'fcfa75c5fcdae98cdcc58d6b872100967a9a3c16';
+    r'4d097e6e4a597cc6e047ae2f78afc9792e5ce513';
 
 /// See also [CleanOrderDetailVm].
 @ProviderFor(CleanOrderDetailVm)

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

@@ -19,6 +19,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../constants_services.dart';
@@ -63,7 +64,7 @@ class HistoryPage extends HookConsumerWidget {
       //   "History",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F2F3F6'), darkColor: Colors.black)?? Colors.black,
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,
@@ -124,7 +125,7 @@ class HistoryPage extends HookConsumerWidget {
         borderRadius: BorderRadius.circular(8),
         boxShadow: [
           BoxShadow(
-            color: ColorUtils.string2Color('#E5E5E5'),
+            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
             offset: const Offset(0, 2),
             blurRadius: 8,
           ),

packages/cpt_services/lib/modules/services/history/history_vm.g.dart

@@ -6,7 +6,7 @@ part of 'history_vm.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$historyVmHash() => r'89aa7cc56fe2bb8cf7a7a2d7087f3ca431417819';
+String _$historyVmHash() => r'e27a0b2491a494df57ba02b193bb7ad6ca384b54';
 
 /// See also [HistoryVm].
 @ProviderFor(HistoryVm)

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

@@ -21,6 +21,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../router/page/services_page_router.dart';
@@ -63,7 +64,7 @@ class HomeServicePage extends HookConsumerWidget {
       //   "HomeService",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black)  ,
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,
@@ -133,7 +134,8 @@ class HomeServicePage extends HookConsumerWidget {
           borderRadius: BorderRadius.circular(8),
           boxShadow: [
             BoxShadow(
-              color: ColorUtils.string2Color('#E5E5E5'),
+              // color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
+              color: DarkThemeUtil.multiColors(context, DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent, darkColor: Colors.transparent)?? Colors.transparent,
               offset: const Offset(0, 2),
               blurRadius: 8,
             ),

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

@@ -366,7 +366,6 @@ class HomeServiceVm extends _$HomeServiceVm {
           confirmTxt: "Ok",
           messageBuilder: (BuildContext context){
             return Container(
-              color: context.appColors.textWhite,
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.start,

packages/cpt_services/lib/modules/services/homeService/home_service_vm.g.dart

@@ -6,7 +6,7 @@ part of 'home_service_vm.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$homeServiceVmHash() => r'318c976134aacfdc5ed6c7c8a641351822c48b32';
+String _$homeServiceVmHash() => r'5fbefc1a636113fd7813b1adfdcfa4d75dc6c88e';
 
 /// See also [HomeServiceVm].
 @ProviderFor(HomeServiceVm)

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

@@ -177,7 +177,7 @@ class CollectionWidget extends HookConsumerWidget {
     return Container(
         alignment: Alignment.center,
         // decoration: BoxDecoration(
-        //   color: ColorUtils.string2Color('#E5E5E5'),
+        //   color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
         //   borderRadius: BorderRadius.circular(15),
         // ),
         child: Row(

packages/cpt_services/lib/modules/services/inProgress/in_progress_page.dart

@@ -19,6 +19,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../constants_services.dart';
@@ -63,7 +64,7 @@ class InProgressPage extends HookConsumerWidget {
       //   "InProgress",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F2F3F6'), darkColor: Colors.black)?? Colors.black,
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,
@@ -117,7 +118,7 @@ class InProgressPage extends HookConsumerWidget {
         borderRadius: BorderRadius.circular(8),
         boxShadow: [
           BoxShadow(
-            color: ColorUtils.string2Color('#E5E5E5'),
+            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
             offset: const Offset(0, 2),
             blurRadius: 8,
           ),

packages/cpt_services/lib/modules/services/inProgress/in_progress_vm.g.dart

@@ -6,7 +6,7 @@ part of 'in_progress_vm.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$inProgressVmHash() => r'cf2b1d13c3c134c4b8a29e257fda6e652af9061d';
+String _$inProgressVmHash() => r'90feaa9478c9575831a324bcd841a3617f6b745c';
 
 /// See also [InProgressVm].
 @ProviderFor(InProgressVm)

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

@@ -17,6 +17,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../components/repair_status_card_item.dart';
@@ -64,7 +65,7 @@ class RepairHistoryPage extends HookConsumerWidget {
       //   "History",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F2F3F6'), darkColor: Colors.black)?? Colors.black,
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,
@@ -119,7 +120,7 @@ class RepairHistoryPage extends HookConsumerWidget {
         borderRadius: BorderRadius.circular(8),
         boxShadow: [
           BoxShadow(
-            color: ColorUtils.string2Color('#E5E5E5'),
+            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
             offset: const Offset(0, 2),
             blurRadius: 8,
           ),

packages/cpt_services/lib/modules/services/repair_history/history_vm.g.dart

@@ -6,7 +6,7 @@ part of 'history_vm.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$repairHistoryVmHash() => r'02b81fc894e21133f15ca8b36d8026e2c195880e';
+String _$repairHistoryVmHash() => r'0de804caabed7fa85241a0c1493e12d989883847';
 
 /// See also [RepairHistoryVm].
 @ProviderFor(RepairHistoryVm)

packages/cpt_services/lib/modules/services/repair_homeService/home_service_page.dart

@@ -21,6 +21,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../router/page/services_page_router.dart';
@@ -63,7 +64,7 @@ class RepairHomeServicePage extends HookConsumerWidget {
       //   "RepairHomeService",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F2F3F6'), darkColor: Colors.black)?? Colors.black,
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,
@@ -135,7 +136,7 @@ class RepairHomeServicePage extends HookConsumerWidget {
           borderRadius: BorderRadius.circular(8),
           boxShadow: [
             BoxShadow(
-              color: ColorUtils.string2Color('#E5E5E5'),
+              color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
               offset: const Offset(0, 2),
               blurRadius: 8,
             ),

packages/cpt_services/lib/modules/services/repair_homeService/home_service_vm.dart

@@ -350,7 +350,6 @@ class RepairHomeServiceVm extends _$RepairHomeServiceVm {
           confirmTxt: "Ok",
           messageBuilder: (BuildContext context){
             return Container(
-              color: context.appColors.textWhite,
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.start,

packages/cpt_services/lib/modules/services/repair_homeService/home_service_vm.g.dart

@@ -7,7 +7,7 @@ part of 'home_service_vm.dart';
 // **************************************************************************
 
 String _$repairHomeServiceVmHash() =>
-    r'4006150cdf360bf7db04f0c4e591f14e32e38990';
+    r'd80c22edbf6ac292d571c1fe4bf8a7d92d74a174';
 
 /// See also [RepairHomeServiceVm].
 @ProviderFor(RepairHomeServiceVm)

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

@@ -177,7 +177,7 @@ class CollectionWidget extends HookConsumerWidget {
     return Container(
         alignment: Alignment.center,
         // decoration: BoxDecoration(
-        //   color: ColorUtils.string2Color('#E5E5E5'),
+        //   color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
         //   borderRadius: BorderRadius.circular(15),
         // ),
         child: Row(

packages/cpt_services/lib/modules/services/repair_inProgress/in_progress_page.dart

@@ -20,6 +20,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../components/repair_status_card_item.dart';
@@ -66,7 +67,7 @@ class RepairInProgressPage extends HookConsumerWidget {
       //   "InProgress",
       //   backgroundColor: context.appColors.whiteBG,
       // ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F2F3F6'), darkColor: Colors.black)?? Colors.black,
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,
@@ -124,7 +125,7 @@ class RepairInProgressPage extends HookConsumerWidget {
         borderRadius: BorderRadius.circular(8),
         boxShadow: [
           BoxShadow(
-            color: ColorUtils.string2Color('#E5E5E5'),
+            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
             offset: const Offset(0, 2),
             blurRadius: 8,
           ),

packages/cpt_services/lib/modules/services/repair_inProgress/in_progress_vm.g.dart

@@ -7,7 +7,7 @@ part of 'in_progress_vm.dart';
 // **************************************************************************
 
 String _$repairInProgressVmHash() =>
-    r'a35790c3e5285086a1bf7792c6c7d3c704e4bfa9';
+    r'4b35fb3bccf222443a31ea4c465d9f437db0166d';
 
 /// See also [RepairInProgressVm].
 @ProviderFor(RepairInProgressVm)

packages/cpt_services/lib/modules/services/service_clean_detail/service_clean_detail_page.dart

@@ -21,6 +21,7 @@ import 'package:widgets/my_appbar.dart';
 import 'package:widgets/my_like_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:shared/utils/richText_utils.dart';
 
@@ -393,7 +394,7 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
               borderRadius: BorderRadius.circular(8),
               // boxShadow: [
               //   BoxShadow(
-              //     color: ColorUtils.string2Color('#E5E5E5'),
+              //     color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
               //     offset: const Offset(0, 2),
               //     blurRadius: 8,
               //   ),
@@ -488,6 +489,7 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
         children: [
           Container(
             width: 122,
+            color: Colors.red,
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               crossAxisAlignment: CrossAxisAlignment.center,
@@ -529,7 +531,7 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
                       MyTextView(
                         "${_likes_count.value}",
                         fontSize: 18,
-                        textColor: Colors.white,
+                        textColor: context.appColors.textWhite,
                         isFontRegular: true,
                         marginLeft: 5,
                         marginRight: 15,
@@ -562,11 +564,11 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
           ),
           Expanded(
             child: Container(
-              color: context.appColors.redDefault,
+              color: DarkThemeUtil.multiColors(context, context.appColors.redDefault, darkColor: Colors.red),
               child: Center(
                 child: MyTextView(
                  S.current.book_now,
-                  textColor: context.appColors.textWhite,
+                  textColor: DarkThemeUtil.multiColors(context,context.appColors.textWhite, darkColor: Colors.white),
                   fontSize: 17,
                   isFontMedium: true,
                   textAlign: TextAlign.center,

packages/cpt_services/lib/modules/services/service_clean_detail/service_clean_detail_vm.g.dart

@@ -7,7 +7,7 @@ part of 'service_clean_detail_vm.dart';
 // **************************************************************************
 
 String _$serviceCleanDetailVmHash() =>
-    r'd1d4a37356ed36d9d30fd6ee92c9fa2a2b8b71c6';
+    r'4be2e42e6620aeca1428f68309bb928c63cc9911';
 
 /// See also [ServiceCleanDetailVm].
 @ProviderFor(ServiceCleanDetailVm)

packages/cpt_services/lib/modules/services/service_evaluate_create/service_evaluate_create_page.dart

@@ -20,6 +20,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 import 'package:widgets/shatter/form_require_text.dart';
 import 'package:widgets/my_text_field.dart';
@@ -71,7 +72,7 @@ class ServiceEvaluateCreatePage extends HookConsumerWidget {
         backgroundColor: context.appColors.whiteBG,
         showBottomDivider:true,
       ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F2F3F6'), darkColor: Colors.black)?? Colors.black,
       body: Column(
           children: [
             Expanded(

packages/cpt_services/lib/modules/services/service_evaluate_create_success/evaluate_create_success_page.dart

@@ -20,6 +20,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../router/page/services_page_router.dart';
@@ -59,7 +60,7 @@ class EvaluateCreateSuccessPage extends HookConsumerWidget {
           S.current.evaluation,
           backgroundColor: context.appColors.whiteBG,
         ),
-        backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+        backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F2F3F6'), darkColor: Colors.black)?? Colors.black,
         body: Center(
           child: Container(
             margin: EdgeInsets.only(top: 50),

packages/cpt_services/lib/modules/services/service_evaluate_list/service_evaluate_list_page.dart

@@ -18,6 +18,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../components/user_evaluate_card_item.dart';
@@ -68,7 +69,7 @@ class ServiceEvaluateListPage extends HookConsumerWidget {
         S.current.service_evaluate_list,
         backgroundColor: context.appColors.whiteBG,
       ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F2F3F6'), darkColor: Colors.black)?? Colors.black,
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,
@@ -122,7 +123,7 @@ class ServiceEvaluateListPage extends HookConsumerWidget {
         borderRadius: BorderRadius.circular(8),
         boxShadow: [
           BoxShadow(
-            color: ColorUtils.string2Color('#E5E5E5'),
+            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#E5E5E5'), darkColor: Colors.transparent)?? Colors.transparent,
             offset: const Offset(0, 2),
             blurRadius: 8,
           ),

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

@@ -27,6 +27,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../components/chooseAirConditionContent_state.dart';
@@ -80,7 +81,7 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
        S.current.confirm_order,
         backgroundColor: context.appColors.whiteBG,
       ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black),
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,
@@ -154,13 +155,13 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
             }),
           ),
           // 订单 card 信息
-          Container(
-            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),
-            child: _buildOrderPayCardInfo(state, vm, context),
-          ),
+          // Container(
+          //   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),
+          //   child: _buildOrderPayCardInfo(state, vm, context),
+          // ),
 
           // 订单备注
           Container(
@@ -355,7 +356,7 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
           return  Container(
             padding: const EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 10),
             margin: const EdgeInsets.only(left: 15, right: 15, top: 0, bottom: 0),
-            color: ColorUtils.string2Color('#F8F8F8'),
+            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F8F8F8'), darkColor: context.appColors.textWhite),
             child: Column(
               children: [
                 Row(
@@ -432,7 +433,7 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
           return  Container(
             padding: const EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 10),
             margin: const EdgeInsets.only(left: 15, right: 15, top: 0, bottom: 0),
-            color: ColorUtils.string2Color('#F8F8F8'),
+            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F8F8F8'), darkColor: context.appColors.textWhite),
             child: Column(
               children: [
                 Row(
@@ -758,7 +759,7 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
                       MyTextView(
                         "\$$totalPrice",
                         fontSize: 18,
-                        textColor: Colors.white,
+                        textColor: context.appColors.textWhite,
                         isFontRegular: true,
                         marginLeft: 5,
                         marginRight: 15,
@@ -774,11 +775,11 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
           ),
           Expanded(
             child: Container(
-              color: context.appColors.redDefault,
+              color: DarkThemeUtil.multiColors(context, context.appColors.redDefault, darkColor: Colors.red),
               child: Center(
                 child: MyTextView(
                   S.current.pay_now,
-                  textColor: context.appColors.textWhite,
+                  textColor: DarkThemeUtil.multiColors(context,context.appColors.textWhite, darkColor: Colors.white),
                   fontSize: 17,
                   isFontMedium: true,
                   textAlign: TextAlign.center,

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

@@ -337,26 +337,26 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
       params.addAll(flattenedProducts);
       Log.d("最终的参数params:  $params");
 
-      // final result = await servicesRespositoryInstance.fetchPaidServiceBook(params);
-      // if(result.isSuccess){
-      //   state = state.copyWith(paidServicePaySuccessInfo: result.data as PaidServicePaySuccessInfoEntity);
-      //   // 成功后 去支付成功页面
-      //   // ServicePaySuccessPage.startInstance();
-      //   context.appRouter.pushAndPopUntil(const ServicePaySuccessPageRoute(), predicate: (Route<dynamic> route) {       // 根据具体条件返回 true 或 false
-      //     // Log.d("888 ${route.settings}");
-      //     return route.settings.name != 'ServiceOrderConfirmPageRoute';
-      //   });
-      // } else {
-      //   String errorMessage = result.errorMsg!;
-      //   // changeLoadingState(LoadState.State_Error, errorMessage);
-      //   ToastEngine.show(result.errorMsg ?? "Network Load Error");
-      // }
-
-
-      context.appRouter.pushAndPopUntil(const ServicePaySuccessPageRoute(), predicate: (Route<dynamic> route) {       // 根据具体条件返回 true 或 false
-        // Log.d("888 ${route.settings}");
-        return route.settings.name != 'ServiceOrderConfirmPageRoute';
-      });
+      final result = await servicesRespositoryInstance.fetchPaidServiceBook(params);
+      if(result.isSuccess){
+        state = state.copyWith(paidServicePaySuccessInfo: result.data as PaidServicePaySuccessInfoEntity);
+        // 成功后 去支付成功页面
+        // ServicePaySuccessPage.startInstance();
+        // context.appRouter.pushAndPopUntil(const ServicePaySuccessPageRoute(), predicate: (Route<dynamic> route) {       // 根据具体条件返回 true 或 false
+        //   // Log.d("888 ${route.settings}");
+        //   return route.settings.name != 'ServiceOrderConfirmPageRoute';
+        // });
+      } else {
+        String errorMessage = result.errorMsg!;
+        // changeLoadingState(LoadState.State_Error, errorMessage);
+        ToastEngine.show(result.errorMsg ?? "Network Load Error");
+      }
+
+
+      // context.appRouter.pushAndPopUntil(const ServicePaySuccessPageRoute(), predicate: (Route<dynamic> route) {       // 根据具体条件返回 true 或 false
+      //   // Log.d("888 ${route.settings}");
+      //   return route.settings.name != 'ServiceOrderConfirmPageRoute';
+      // });
 
     } catch (e) {
       ToastEngine.show("Error: $e");

packages/cpt_services/lib/modules/services/service_order_confirm/service_order_confirm_vm.g.dart

@@ -7,7 +7,7 @@ part of 'service_order_confirm_vm.dart';
 // **************************************************************************
 
 String _$serviceOrderConfirmVmHash() =>
-    r'b7cf5a927676989e18f7723f78c5535300082b02';
+    r'ffb82d32c89ebf7a6b89c818ef99f78ea9b52194';
 
 /// See also [ServiceOrderConfirmVm].
 @ProviderFor(ServiceOrderConfirmVm)

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

@@ -18,6 +18,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../constants_services.dart';
@@ -63,7 +64,7 @@ class ServicePaySuccessPage extends HookConsumerWidget {
         S.current.pay_success,
         backgroundColor: context.appColors.whiteBG,
       ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#F2F3F6'), darkColor: Colors.black)?? Colors.black,
       body: SizedBox(
           width: double.infinity,
           height: double.infinity,

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

@@ -7,7 +7,7 @@ part of 'service_repair_detail_vm.dart';
 // **************************************************************************
 
 String _$serviceRepairDetailVmHash() =>
-    r'2a6458bfaa88196839a05fd1ac64a32e77490a4c';
+    r'e8e3f35fdceeb8b45af6ab561896a0c8af00be05';
 
 /// See also [ServiceRepairDetailVm].
 @ProviderFor(ServiceRepairDetailVm)

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

@@ -20,7 +20,9 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_text_view.dart';
 import 'package:widgets/my_appbar.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 
 import '../../router/page/services_page_router.dart';
 
@@ -64,7 +66,7 @@ class ServicesMainPage extends HookConsumerWidget {
         S.current.service,
         backgroundColor: context.appColors.whiteBG,
       ),
-      backgroundColor: ColorUtils.string2Color("#F2F3F6"),
+      backgroundColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.black)  ,
       body: Column(
         children: [
           Expanded(

packages/cs_domain/lib/entity/paid_service_pay_success_info_entity.dart

@@ -22,6 +22,7 @@ class PaidServicePaySuccessInfoEntity {
 	PaidServicePaySuccessInfoEstate? estate;
 	@JSONField(name: "estate_unit")
 	PaidServicePaySuccessInfoEstateUnit? estateUnit;
+	PaidServicePaySuccessInfoOrder? order;
 
 	PaidServicePaySuccessInfoEntity();
 
@@ -166,4 +167,30 @@ class PaidServicePaySuccessInfoEstateUnit {
 	String toString() {
 		return jsonEncode(this);
 	}
+}
+
+@JsonSerializable()
+class PaidServicePaySuccessInfoOrder {
+	int? id;
+	@JSONField(name: "total_amount")
+	String? totalAmount;
+	@JSONField(name: "order_amount")
+	String? orderAmount;
+	@JSONField(name: "deposit_amount")
+	String? depositAmount;
+	@JSONField(name: "payment_status")
+	int? paymentStatus;
+	@JSONField(name: "refund_status")
+	int? refundStatus;
+
+	PaidServicePaySuccessInfoOrder();
+
+	factory PaidServicePaySuccessInfoOrder.fromJson(Map<String, dynamic> json) => $PaidServicePaySuccessInfoOrderFromJson(json);
+
+	Map<String, dynamic> toJson() => $PaidServicePaySuccessInfoOrderToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
 }

packages/cs_domain/lib/generated/json/facility_book_entity.g.dart

@@ -7,16 +7,22 @@ FacilityBookEntity $FacilityBookEntityFromJson(Map<String, dynamic> json) {
   if (remainQuota != null) {
     facilityBookEntity.remainQuota = remainQuota;
   }
-  final String? quotaResetOn = jsonConvert.convert<String>(json['quota_reset_on']);
+  final String? quotaResetOn = jsonConvert.convert<String>(
+      json['quota_reset_on']);
   if (quotaResetOn != null) {
     facilityBookEntity.quotaResetOn = quotaResetOn;
   }
-  final FacilityBookFacilityType? facilityType = jsonConvert.convert<FacilityBookFacilityType>(json['facility_type']);
+  final FacilityBookFacilityType? facilityType = jsonConvert.convert<
+      FacilityBookFacilityType>(json['facility_type']);
   if (facilityType != null) {
     facilityBookEntity.facilityType = facilityType;
   }
-  final List<FacilityBookFacilities>? facilities = (json['facilities'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FacilityBookFacilities>(e) as FacilityBookFacilities).toList();
+  final List<FacilityBookFacilities>? facilities = (json['facilities'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<FacilityBookFacilities>(e) as FacilityBookFacilities)
+      .toList();
   if (facilities != null) {
     facilityBookEntity.facilities = facilities;
   }
@@ -47,9 +53,11 @@ extension FacilityBookEntityExtension on FacilityBookEntity {
   }
 }
 
-FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(Map<String, dynamic> json) {
+FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(
+    Map<String, dynamic> json) {
   final FacilityBookFacilityType facilityBookFacilityType = FacilityBookFacilityType();
-  final int? bookAdvanceDays = jsonConvert.convert<int>(json['book_advance_days']);
+  final int? bookAdvanceDays = jsonConvert.convert<int>(
+      json['book_advance_days']);
   if (bookAdvanceDays != null) {
     facilityBookFacilityType.bookAdvanceDays = bookAdvanceDays;
   }
@@ -57,14 +65,16 @@ FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(Map<String, dynamic>
   if (quota != null) {
     facilityBookFacilityType.quota = quota;
   }
-  final String? quotaResetType = jsonConvert.convert<String>(json['quota_reset_type']);
+  final String? quotaResetType = jsonConvert.convert<String>(
+      json['quota_reset_type']);
   if (quotaResetType != null) {
     facilityBookFacilityType.quotaResetType = quotaResetType;
   }
   return facilityBookFacilityType;
 }
 
-Map<String, dynamic> $FacilityBookFacilityTypeToJson(FacilityBookFacilityType entity) {
+Map<String, dynamic> $FacilityBookFacilityTypeToJson(
+    FacilityBookFacilityType entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['book_advance_days'] = entity.bookAdvanceDays;
   data['quota'] = entity.quota;
@@ -85,7 +95,8 @@ extension FacilityBookFacilityTypeExtension on FacilityBookFacilityType {
   }
 }
 
-FacilityBookFacilities $FacilityBookFacilitiesFromJson(Map<String, dynamic> json) {
+FacilityBookFacilities $FacilityBookFacilitiesFromJson(
+    Map<String, dynamic> json) {
   final FacilityBookFacilities facilityBookFacilities = FacilityBookFacilities();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -95,15 +106,19 @@ FacilityBookFacilities $FacilityBookFacilitiesFromJson(Map<String, dynamic> json
   if (name != null) {
     facilityBookFacilities.name = name;
   }
-  final List<FacilityBookFacilitiesPeriods>? periods = (json['periods'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FacilityBookFacilitiesPeriods>(e) as FacilityBookFacilitiesPeriods).toList();
+  final List<FacilityBookFacilitiesPeriods>? periods = (json['periods'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<FacilityBookFacilitiesPeriods>(
+          e) as FacilityBookFacilitiesPeriods).toList();
   if (periods != null) {
     facilityBookFacilities.periods = periods;
   }
   return facilityBookFacilities;
 }
 
-Map<String, dynamic> $FacilityBookFacilitiesToJson(FacilityBookFacilities entity) {
+Map<String, dynamic> $FacilityBookFacilitiesToJson(
+    FacilityBookFacilities entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -124,7 +139,8 @@ extension FacilityBookFacilitiesExtension on FacilityBookFacilities {
   }
 }
 
-FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(Map<String, dynamic> json) {
+FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(
+    Map<String, dynamic> json) {
   final FacilityBookFacilitiesPeriods facilityBookFacilitiesPeriods = FacilityBookFacilitiesPeriods();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -157,7 +173,8 @@ FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(Map<String,
   return facilityBookFacilitiesPeriods;
 }
 
-Map<String, dynamic> $FacilityBookFacilitiesPeriodsToJson(FacilityBookFacilitiesPeriods entity) {
+Map<String, dynamic> $FacilityBookFacilitiesPeriodsToJson(
+    FacilityBookFacilitiesPeriods entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['start'] = entity.start;

packages/cs_domain/lib/generated/json/facility_index_entity.g.dart

@@ -15,8 +15,10 @@ FacilityIndexEntity $FacilityIndexEntityFromJson(Map<String, dynamic> json) {
   if (name != null) {
     facilityIndexEntity.name = name;
   }
-  final List<String>? mapResources = (json['map_resources'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<String>(e) as String).toList();
+  final List<String>? mapResources = (json['map_resources'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<String>(e) as String)
+      .toList();
   if (mapResources != null) {
     facilityIndexEntity.mapResources = mapResources;
   }

packages/cs_domain/lib/generated/json/facility_page_entity.g.dart

@@ -21,12 +21,15 @@ FacilityPageEntity $FacilityPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     facilityPageEntity.countPage = countPage;
   }
-  final String? totalDeposit = jsonConvert.convert<String>(json['total_deposit']);
+  final String? totalDeposit = jsonConvert.convert<String>(
+      json['total_deposit']);
   if (totalDeposit != null) {
     facilityPageEntity.totalDeposit = totalDeposit;
   }
-  final List<FacilityDetail>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FacilityDetail>(e) as FacilityDetail).toList();
+  final List<FacilityDetail>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<FacilityDetail>(e) as FacilityDetail)
+      .toList();
   if (list != null) {
     facilityPageEntity.list = list;
   }
@@ -65,23 +68,28 @@ extension FacilityPageEntityExtension on FacilityPageEntity {
 
 FacilityDetail $FacilityDetailFromJson(Map<String, dynamic> json) {
   final FacilityDetail facilityDetail = FacilityDetail();
-  final FacilityPageListBooking? booking = jsonConvert.convert<FacilityPageListBooking>(json['booking']);
+  final FacilityPageListBooking? booking = jsonConvert.convert<
+      FacilityPageListBooking>(json['booking']);
   if (booking != null) {
     facilityDetail.booking = booking;
   }
-  final FacilityPageListFacility? facility = jsonConvert.convert<FacilityPageListFacility>(json['facility']);
+  final FacilityPageListFacility? facility = jsonConvert.convert<
+      FacilityPageListFacility>(json['facility']);
   if (facility != null) {
     facilityDetail.facility = facility;
   }
-  final FacilityPageListTimePeriod? timePeriod = jsonConvert.convert<FacilityPageListTimePeriod>(json['time_period']);
+  final FacilityPageListTimePeriod? timePeriod = jsonConvert.convert<
+      FacilityPageListTimePeriod>(json['time_period']);
   if (timePeriod != null) {
     facilityDetail.timePeriod = timePeriod;
   }
-  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(json['account']);
+  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(
+      json['account']);
   if (account != null) {
     facilityDetail.account = account;
   }
-  final FacilityOrder? order = jsonConvert.convert<FacilityOrder>(json['order']);
+  final FacilityOrder? order = jsonConvert.convert<FacilityOrder>(
+      json['order']);
   if (order != null) {
     facilityDetail.order = order;
   }
@@ -115,7 +123,8 @@ extension FacilityDetailExtension on FacilityDetail {
   }
 }
 
-FacilityPageListBooking $FacilityPageListBookingFromJson(Map<String, dynamic> json) {
+FacilityPageListBooking $FacilityPageListBookingFromJson(
+    Map<String, dynamic> json) {
   final FacilityPageListBooking facilityPageListBooking = FacilityPageListBooking();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -137,18 +146,21 @@ FacilityPageListBooking $FacilityPageListBookingFromJson(Map<String, dynamic> js
   if (deposit != null) {
     facilityPageListBooking.deposit = deposit;
   }
-  final String? depositRefund = jsonConvert.convert<String>(json['deposit_refund']);
+  final String? depositRefund = jsonConvert.convert<String>(
+      json['deposit_refund']);
   if (depositRefund != null) {
     facilityPageListBooking.depositRefund = depositRefund;
   }
-  final String? depositRefundAt = jsonConvert.convert<String>(json['deposit_refund_at']);
+  final String? depositRefundAt = jsonConvert.convert<String>(
+      json['deposit_refund_at']);
   if (depositRefundAt != null) {
     facilityPageListBooking.depositRefundAt = depositRefundAt;
   }
   return facilityPageListBooking;
 }
 
-Map<String, dynamic> $FacilityPageListBookingToJson(FacilityPageListBooking entity) {
+Map<String, dynamic> $FacilityPageListBookingToJson(
+    FacilityPageListBooking entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['date'] = entity.date;
@@ -181,7 +193,8 @@ extension FacilityPageListBookingExtension on FacilityPageListBooking {
   }
 }
 
-FacilityPageListFacility $FacilityPageListFacilityFromJson(Map<String, dynamic> json) {
+FacilityPageListFacility $FacilityPageListFacilityFromJson(
+    Map<String, dynamic> json) {
   final FacilityPageListFacility facilityPageListFacility = FacilityPageListFacility();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -198,7 +211,8 @@ FacilityPageListFacility $FacilityPageListFacilityFromJson(Map<String, dynamic>
   return facilityPageListFacility;
 }
 
-Map<String, dynamic> $FacilityPageListFacilityToJson(FacilityPageListFacility entity) {
+Map<String, dynamic> $FacilityPageListFacilityToJson(
+    FacilityPageListFacility entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -219,7 +233,8 @@ extension FacilityPageListFacilityExtension on FacilityPageListFacility {
   }
 }
 
-FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(Map<String, dynamic> json) {
+FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(
+    Map<String, dynamic> json) {
   final FacilityPageListTimePeriod facilityPageListTimePeriod = FacilityPageListTimePeriod();
   final String? price = jsonConvert.convert<String>(json['price']);
   if (price != null) {
@@ -232,7 +247,8 @@ FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(Map<String, dynam
   return facilityPageListTimePeriod;
 }
 
-Map<String, dynamic> $FacilityPageListTimePeriodToJson(FacilityPageListTimePeriod entity) {
+Map<String, dynamic> $FacilityPageListTimePeriodToJson(
+    FacilityPageListTimePeriod entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['price'] = entity.price;
   data['deposit'] = entity.deposit;
@@ -264,7 +280,8 @@ FacilityOrder $FacilityOrderFromJson(Map<String, dynamic> json) {
   if (orderAmount != null) {
     facilityOrder.orderAmount = orderAmount;
   }
-  final String? depositAmount = jsonConvert.convert<String>(json['deposit_amount']);
+  final String? depositAmount = jsonConvert.convert<String>(
+      json['deposit_amount']);
   if (depositAmount != null) {
     facilityOrder.depositAmount = depositAmount;
   }

packages/cs_domain/lib/generated/json/feedback_detail_entity.g.dart

@@ -30,12 +30,17 @@ FeedbackDetailEntity $FeedbackDetailEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     feedbackDetailEntity.createdAt = createdAt;
   }
-  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(json['category']);
+  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(
+      json['category']);
   if (category != null) {
     feedbackDetailEntity.category = category;
   }
-  final List<FeedbackDetailReplies>? replies = (json['replies'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FeedbackDetailReplies>(e) as FeedbackDetailReplies).toList();
+  final List<FeedbackDetailReplies>? replies = (json['replies'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<FeedbackDetailReplies>(e) as FeedbackDetailReplies)
+      .toList();
   if (replies != null) {
     feedbackDetailEntity.replies = replies;
   }
@@ -78,7 +83,8 @@ extension FeedbackDetailEntityExtension on FeedbackDetailEntity {
   }
 }
 
-FeedbackDetailReplies $FeedbackDetailRepliesFromJson(Map<String, dynamic> json) {
+FeedbackDetailReplies $FeedbackDetailRepliesFromJson(
+    Map<String, dynamic> json) {
   final FeedbackDetailReplies feedbackDetailReplies = FeedbackDetailReplies();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -97,14 +103,16 @@ FeedbackDetailReplies $FeedbackDetailRepliesFromJson(Map<String, dynamic> json)
   if (createdAt != null) {
     feedbackDetailReplies.createdAt = createdAt;
   }
-  final IdNameEntity? accountable = jsonConvert.convert<IdNameEntity>(json['accountable']);
+  final IdNameEntity? accountable = jsonConvert.convert<IdNameEntity>(
+      json['accountable']);
   if (accountable != null) {
     feedbackDetailReplies.accountable = accountable;
   }
   return feedbackDetailReplies;
 }
 
-Map<String, dynamic> $FeedbackDetailRepliesToJson(FeedbackDetailReplies entity) {
+Map<String, dynamic> $FeedbackDetailRepliesToJson(
+    FeedbackDetailReplies entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;

packages/cs_domain/lib/generated/json/feedback_list_entity.g.dart

@@ -21,8 +21,11 @@ FeedbackListEntity $FeedbackListEntityFromJson(Map<String, dynamic> json) {
   if (limit != null) {
     feedbackListEntity.limit = limit;
   }
-  final List<FeedbackItemEntity>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FeedbackItemEntity>(e) as FeedbackItemEntity).toList();
+  final List<FeedbackItemEntity>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<FeedbackItemEntity>(e) as FeedbackItemEntity)
+      .toList();
   if (list != null) {
     feedbackListEntity.list = list;
   }
@@ -78,7 +81,8 @@ FeedbackItemEntity $FeedbackItemEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     feedbackItemEntity.createdAt = createdAt;
   }
-  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(json['category']);
+  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(
+      json['category']);
   if (category != null) {
     feedbackItemEntity.category = category;
   }

packages/cs_domain/lib/generated/json/form_content_entity.g.dart

@@ -5,20 +5,25 @@ import 'dart:typed_data';
 
 FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   final FormContentEntity formContentEntity = FormContentEntity();
-  final String? typeOfApplication = jsonConvert.convert<String>(json['type_of_application']);
+  final String? typeOfApplication = jsonConvert.convert<String>(
+      json['type_of_application']);
   if (typeOfApplication != null) {
     formContentEntity.typeOfApplication = typeOfApplication;
   }
-  final String? notesToRecipient = jsonConvert.convert<String>(json['notes_to_recipient']);
+  final String? notesToRecipient = jsonConvert.convert<String>(
+      json['notes_to_recipient']);
   if (notesToRecipient != null) {
     formContentEntity.notesToRecipient = notesToRecipient;
   }
-  final String? notesToManagement = jsonConvert.convert<String>(json['notes_to_management']);
+  final String? notesToManagement = jsonConvert.convert<String>(
+      json['notes_to_management']);
   if (notesToManagement != null) {
     formContentEntity.notesToManagement = notesToManagement;
   }
-  final List<String>? attachments = (json['attachments'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<String>(e) as String).toList();
+  final List<String>? attachments = (json['attachments'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<String>(e) as String)
+      .toList();
   if (attachments != null) {
     formContentEntity.attachments = attachments;
   }
@@ -30,11 +35,13 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (signatureByteData != null) {
     formContentEntity.signatureByteData = signatureByteData;
   }
-  final String? ownershipStatus = jsonConvert.convert<String>(json['ownership_status']);
+  final String? ownershipStatus = jsonConvert.convert<String>(
+      json['ownership_status']);
   if (ownershipStatus != null) {
     formContentEntity.ownershipStatus = ownershipStatus;
   }
-  final String? vehicleNumber = jsonConvert.convert<String>(json['vehicle_number']);
+  final String? vehicleNumber = jsonConvert.convert<String>(
+      json['vehicle_number']);
   if (vehicleNumber != null) {
     formContentEntity.vehicleNumber = vehicleNumber;
   }
@@ -42,7 +49,8 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (iuNumber != null) {
     formContentEntity.iuNumber = iuNumber;
   }
-  final String? vehicleMakeModelColour = jsonConvert.convert<String>(json['vehicle_make_model_colour']);
+  final String? vehicleMakeModelColour = jsonConvert.convert<String>(
+      json['vehicle_make_model_colour']);
   if (vehicleMakeModelColour != null) {
     formContentEntity.vehicleMakeModelColour = vehicleMakeModelColour;
   }
@@ -54,27 +62,33 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (endDate != null) {
     formContentEntity.endDate = endDate;
   }
-  final String? timeOrArrival = jsonConvert.convert<String>(json['time_or_arrival']);
+  final String? timeOrArrival = jsonConvert.convert<String>(
+      json['time_or_arrival']);
   if (timeOrArrival != null) {
     formContentEntity.timeOrArrival = timeOrArrival;
   }
-  final String? movingCompany = jsonConvert.convert<String>(json['moving_company']);
+  final String? movingCompany = jsonConvert.convert<String>(
+      json['moving_company']);
   if (movingCompany != null) {
     formContentEntity.movingCompany = movingCompany;
   }
-  final String? personInCharge = jsonConvert.convert<String>(json['person_in_charge']);
+  final String? personInCharge = jsonConvert.convert<String>(
+      json['person_in_charge']);
   if (personInCharge != null) {
     formContentEntity.personInCharge = personInCharge;
   }
-  final String? mobileNumber = jsonConvert.convert<String>(json['mobile_number']);
+  final String? mobileNumber = jsonConvert.convert<String>(
+      json['mobile_number']);
   if (mobileNumber != null) {
     formContentEntity.mobileNumber = mobileNumber;
   }
-  final String? companyAddress = jsonConvert.convert<String>(json['company_address']);
+  final String? companyAddress = jsonConvert.convert<String>(
+      json['company_address']);
   if (companyAddress != null) {
     formContentEntity.companyAddress = companyAddress;
   }
-  final String? dateOfEntry = jsonConvert.convert<String>(json['date_of_entry']);
+  final String? dateOfEntry = jsonConvert.convert<String>(
+      json['date_of_entry']);
   if (dateOfEntry != null) {
     formContentEntity.dateOfEntry = dateOfEntry;
   }
@@ -82,31 +96,38 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (guestName != null) {
     formContentEntity.guestName = guestName;
   }
-  final String? guestMobileNumber = jsonConvert.convert<String>(json['guest_mobile_number']);
+  final String? guestMobileNumber = jsonConvert.convert<String>(
+      json['guest_mobile_number']);
   if (guestMobileNumber != null) {
     formContentEntity.guestMobileNumber = guestMobileNumber;
   }
-  final String? renovationStartDate = jsonConvert.convert<String>(json['renovation_start_date']);
+  final String? renovationStartDate = jsonConvert.convert<String>(
+      json['renovation_start_date']);
   if (renovationStartDate != null) {
     formContentEntity.renovationStartDate = renovationStartDate;
   }
-  final String? renovationEndDate = jsonConvert.convert<String>(json['renovation_end_date']);
+  final String? renovationEndDate = jsonConvert.convert<String>(
+      json['renovation_end_date']);
   if (renovationEndDate != null) {
     formContentEntity.renovationEndDate = renovationEndDate;
   }
-  final String? hackingStartDate = jsonConvert.convert<String>(json['hacking_start_date']);
+  final String? hackingStartDate = jsonConvert.convert<String>(
+      json['hacking_start_date']);
   if (hackingStartDate != null) {
     formContentEntity.hackingStartDate = hackingStartDate;
   }
-  final String? hackingEndDate = jsonConvert.convert<String>(json['hacking_end_date']);
+  final String? hackingEndDate = jsonConvert.convert<String>(
+      json['hacking_end_date']);
   if (hackingEndDate != null) {
     formContentEntity.hackingEndDate = hackingEndDate;
   }
-  final String? renovationCompany = jsonConvert.convert<String>(json['renovation_company']);
+  final String? renovationCompany = jsonConvert.convert<String>(
+      json['renovation_company']);
   if (renovationCompany != null) {
     formContentEntity.renovationCompany = renovationCompany;
   }
-  final String? listOfRenovationWorks = jsonConvert.convert<String>(json['list_of_renovation_works']);
+  final String? listOfRenovationWorks = jsonConvert.convert<String>(
+      json['list_of_renovation_works']);
   if (listOfRenovationWorks != null) {
     formContentEntity.listOfRenovationWorks = listOfRenovationWorks;
   }
@@ -183,7 +204,8 @@ extension FormContentEntityExtension on FormContentEntity {
       ..ownershipStatus = ownershipStatus ?? this.ownershipStatus
       ..vehicleNumber = vehicleNumber ?? this.vehicleNumber
       ..iuNumber = iuNumber ?? this.iuNumber
-      ..vehicleMakeModelColour = vehicleMakeModelColour ?? this.vehicleMakeModelColour
+      ..vehicleMakeModelColour = vehicleMakeModelColour ??
+          this.vehicleMakeModelColour
       ..startDate = startDate ?? this.startDate
       ..endDate = endDate ?? this.endDate
       ..timeOrArrival = timeOrArrival ?? this.timeOrArrival
@@ -199,6 +221,7 @@ extension FormContentEntityExtension on FormContentEntity {
       ..hackingStartDate = hackingStartDate ?? this.hackingStartDate
       ..hackingEndDate = hackingEndDate ?? this.hackingEndDate
       ..renovationCompany = renovationCompany ?? this.renovationCompany
-      ..listOfRenovationWorks = listOfRenovationWorks ?? this.listOfRenovationWorks;
+      ..listOfRenovationWorks = listOfRenovationWorks ??
+          this.listOfRenovationWorks;
   }
 }

packages/cs_domain/lib/generated/json/form_detail_entity.g.dart

@@ -13,7 +13,8 @@ FormDetailEntity $FormDetailEntityFromJson(Map<String, dynamic> json) {
   if (userId != null) {
     formDetailEntity.userId = userId;
   }
-  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(json['content']);
+  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(
+      json['content']);
   if (content != null) {
     formDetailEntity.content = content;
   }
@@ -90,7 +91,8 @@ FormOrder $FormOrderFromJson(Map<String, dynamic> json) {
   if (orderAmount != null) {
     formOrder.orderAmount = orderAmount;
   }
-  final String? depositAmount = jsonConvert.convert<String>(json['deposit_amount']);
+  final String? depositAmount = jsonConvert.convert<String>(
+      json['deposit_amount']);
   if (depositAmount != null) {
     formOrder.depositAmount = depositAmount;
   }

packages/cs_domain/lib/generated/json/form_list_entity.g.dart

@@ -7,7 +7,8 @@ FormListEntity $FormListEntityFromJson(Map<String, dynamic> json) {
   if (id != null) {
     formListEntity.id = id;
   }
-  final String? typeId = jsonConvert.convert<String>(json['online_form_type_id']);
+  final String? typeId = jsonConvert.convert<String>(
+      json['online_form_type_id']);
   if (typeId != null) {
     formListEntity.typeId = typeId;
   }

packages/cs_domain/lib/generated/json/form_option_entity.g.dart

@@ -3,12 +3,14 @@ import 'package:domain/entity/form_option_entity.dart';
 
 FormOptionEntity $FormOptionEntityFromJson(Map<String, dynamic> json) {
   final FormOptionEntity formOptionEntity = FormOptionEntity();
-  final List<String>? typeOfApplication = (json['type_of_application'] as List<dynamic>?)?.map(
+  final List<String>? typeOfApplication = (json['type_of_application'] as List<
+      dynamic>?)?.map(
           (e) => jsonConvert.convert<String>(e) as String).toList();
   if (typeOfApplication != null) {
     formOptionEntity.typeOfApplication = typeOfApplication;
   }
-  final List<String>? ownershipStatus = (json['ownership_status'] as List<dynamic>?)?.map(
+  final List<String>? ownershipStatus = (json['ownership_status'] as List<
+      dynamic>?)?.map(
           (e) => jsonConvert.convert<String>(e) as String).toList();
   if (ownershipStatus != null) {
     formOptionEntity.ownershipStatus = ownershipStatus;

packages/cs_domain/lib/generated/json/form_order_entity.g.dart

@@ -15,7 +15,8 @@ FormOrderEntity $FormOrderEntityFromJson(Map<String, dynamic> json) {
   if (status != null) {
     formOrderEntity.status = status;
   }
-  final FormOrderOrder? order = jsonConvert.convert<FormOrderOrder>(json['order']);
+  final FormOrderOrder? order = jsonConvert.convert<FormOrderOrder>(
+      json['order']);
   if (order != null) {
     formOrderEntity.order = order;
   }
@@ -60,15 +61,18 @@ FormOrderOrder $FormOrderOrderFromJson(Map<String, dynamic> json) {
   if (orderAmount != null) {
     formOrderOrder.orderAmount = orderAmount;
   }
-  final String? depositAmount = jsonConvert.convert<String>(json['deposit_amount']);
+  final String? depositAmount = jsonConvert.convert<String>(
+      json['deposit_amount']);
   if (depositAmount != null) {
     formOrderOrder.depositAmount = depositAmount;
   }
-  final String? paymentStatus = jsonConvert.convert<String>(json['payment_status']);
+  final String? paymentStatus = jsonConvert.convert<String>(
+      json['payment_status']);
   if (paymentStatus != null) {
     formOrderOrder.paymentStatus = paymentStatus;
   }
-  final String? refundStatus = jsonConvert.convert<String>(json['refund_status']);
+  final String? refundStatus = jsonConvert.convert<String>(
+      json['refund_status']);
   if (refundStatus != null) {
     formOrderOrder.refundStatus = refundStatus;
   }

packages/cs_domain/lib/generated/json/form_submitted_entity.g.dart

@@ -13,7 +13,8 @@ FormSubmittedEntity $FormSubmittedEntityFromJson(Map<String, dynamic> json) {
   if (userId != null) {
     formSubmittedEntity.userId = userId;
   }
-  final String? estateOnlineFormId = jsonConvert.convert<String>(json['estate_online_form_id']);
+  final String? estateOnlineFormId = jsonConvert.convert<String>(
+      json['estate_online_form_id']);
   if (estateOnlineFormId != null) {
     formSubmittedEntity.estateOnlineFormId = estateOnlineFormId;
   }
@@ -29,15 +30,18 @@ FormSubmittedEntity $FormSubmittedEntityFromJson(Map<String, dynamic> json) {
   if (approvedOn != null) {
     formSubmittedEntity.approvedOn = approvedOn;
   }
-  final FormSubmittedEstateOnlineForm? estateOnlineForm = jsonConvert.convert<FormSubmittedEstateOnlineForm>(json['estate_online_form']);
+  final FormSubmittedEstateOnlineForm? estateOnlineForm = jsonConvert.convert<
+      FormSubmittedEstateOnlineForm>(json['estate_online_form']);
   if (estateOnlineForm != null) {
     formSubmittedEntity.estateOnlineForm = estateOnlineForm;
   }
-  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(json['account']);
+  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(
+      json['account']);
   if (account != null) {
     formSubmittedEntity.account = account;
   }
-  final FormSubmittedOrder? order = jsonConvert.convert<FormSubmittedOrder>(json['order']);
+  final FormSubmittedOrder? order = jsonConvert.convert<FormSubmittedOrder>(
+      json['order']);
   if (order != null) {
     formSubmittedEntity.order = order;
   }
@@ -83,7 +87,8 @@ extension FormSubmittedEntityExtension on FormSubmittedEntity {
   }
 }
 
-FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(Map<String, dynamic> json) {
+FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(
+    Map<String, dynamic> json) {
   final FormSubmittedEstateOnlineForm formSubmittedEstateOnlineForm = FormSubmittedEstateOnlineForm();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -104,7 +109,8 @@ FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(Map<String,
   return formSubmittedEstateOnlineForm;
 }
 
-Map<String, dynamic> $FormSubmittedEstateOnlineFormToJson(FormSubmittedEstateOnlineForm entity) {
+Map<String, dynamic> $FormSubmittedEstateOnlineFormToJson(
+    FormSubmittedEstateOnlineForm entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['icon'] = entity.icon;
@@ -142,7 +148,8 @@ FormSubmittedOrder $FormSubmittedOrderFromJson(Map<String, dynamic> json) {
   if (orderAmount != null) {
     formSubmittedOrder.orderAmount = orderAmount;
   }
-  final String? depositAmount = jsonConvert.convert<String>(json['deposit_amount']);
+  final String? depositAmount = jsonConvert.convert<String>(
+      json['deposit_amount']);
   if (depositAmount != null) {
     formSubmittedOrder.depositAmount = depositAmount;
   }

packages/cs_domain/lib/generated/json/form_submitted_page_entity.g.dart

@@ -3,7 +3,8 @@ import 'package:domain/entity/form_submitted_page_entity.dart';
 import 'package:domain/entity/form_submitted_entity.dart';
 
 
-FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(Map<String, dynamic> json) {
+FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(
+    Map<String, dynamic> json) {
   final FormSubmittedPageEntity formSubmittedPageEntity = FormSubmittedPageEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -21,15 +22,19 @@ FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(Map<String, dynamic> js
   if (countPage != null) {
     formSubmittedPageEntity.countPage = countPage;
   }
-  final List<FormSubmittedEntity>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FormSubmittedEntity>(e) as FormSubmittedEntity).toList();
+  final List<FormSubmittedEntity>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<FormSubmittedEntity>(e) as FormSubmittedEntity)
+      .toList();
   if (list != null) {
     formSubmittedPageEntity.list = list;
   }
   return formSubmittedPageEntity;
 }
 
-Map<String, dynamic> $FormSubmittedPageEntityToJson(FormSubmittedPageEntity entity) {
+Map<String, dynamic> $FormSubmittedPageEntityToJson(
+    FormSubmittedPageEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

packages/cs_domain/lib/generated/json/garage_sale_history_entity.g.dart

@@ -3,7 +3,8 @@ import 'package:domain/entity/garage_sale_history_entity.dart';
 import 'package:domain/entity/id_name_entity.dart';
 
 
-GarageSaleHistoryEntity $GarageSaleHistoryEntityFromJson(Map<String, dynamic> json) {
+GarageSaleHistoryEntity $GarageSaleHistoryEntityFromJson(
+    Map<String, dynamic> json) {
   final GarageSaleHistoryEntity garageSaleHistoryEntity = GarageSaleHistoryEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -21,15 +22,19 @@ GarageSaleHistoryEntity $GarageSaleHistoryEntityFromJson(Map<String, dynamic> js
   if (countPage != null) {
     garageSaleHistoryEntity.countPage = countPage;
   }
-  final List<GarageSaleHistoryList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<GarageSaleHistoryList>(e) as GarageSaleHistoryList).toList();
+  final List<GarageSaleHistoryList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<GarageSaleHistoryList>(e) as GarageSaleHistoryList)
+      .toList();
   if (list != null) {
     garageSaleHistoryEntity.list = list;
   }
   return garageSaleHistoryEntity;
 }
 
-Map<String, dynamic> $GarageSaleHistoryEntityToJson(GarageSaleHistoryEntity entity) {
+Map<String, dynamic> $GarageSaleHistoryEntityToJson(
+    GarageSaleHistoryEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -56,7 +61,8 @@ extension GarageSaleHistoryEntityExtension on GarageSaleHistoryEntity {
   }
 }
 
-GarageSaleHistoryList $GarageSaleHistoryListFromJson(Map<String, dynamic> json) {
+GarageSaleHistoryList $GarageSaleHistoryListFromJson(
+    Map<String, dynamic> json) {
   final GarageSaleHistoryList garageSaleHistoryList = GarageSaleHistoryList();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -74,23 +80,30 @@ GarageSaleHistoryList $GarageSaleHistoryListFromJson(Map<String, dynamic> json)
   if (createdAt != null) {
     garageSaleHistoryList.createdAt = createdAt;
   }
-  final IdNameEntity? service = jsonConvert.convert<IdNameEntity>(json['service']);
+  final IdNameEntity? service = jsonConvert.convert<IdNameEntity>(
+      json['service']);
   if (service != null) {
     garageSaleHistoryList.service = service;
   }
-  final IdNameEntity? merchant = jsonConvert.convert<IdNameEntity>(json['merchant']);
+  final IdNameEntity? merchant = jsonConvert.convert<IdNameEntity>(
+      json['merchant']);
   if (merchant != null) {
     garageSaleHistoryList.merchant = merchant;
   }
-  final List<GarageSaleHistoryListOrderProducts>? orderProducts = (json['order_products'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<GarageSaleHistoryListOrderProducts>(e) as GarageSaleHistoryListOrderProducts).toList();
+  final List<
+      GarageSaleHistoryListOrderProducts>? orderProducts = (json['order_products'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<GarageSaleHistoryListOrderProducts>(
+          e) as GarageSaleHistoryListOrderProducts).toList();
   if (orderProducts != null) {
     garageSaleHistoryList.orderProducts = orderProducts;
   }
   return garageSaleHistoryList;
 }
 
-Map<String, dynamic> $GarageSaleHistoryListToJson(GarageSaleHistoryList entity) {
+Map<String, dynamic> $GarageSaleHistoryListToJson(
+    GarageSaleHistoryList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['sn'] = entity.sn;
@@ -123,7 +136,8 @@ extension GarageSaleHistoryListExtension on GarageSaleHistoryList {
   }
 }
 
-GarageSaleHistoryListOrderProducts $GarageSaleHistoryListOrderProductsFromJson(Map<String, dynamic> json) {
+GarageSaleHistoryListOrderProducts $GarageSaleHistoryListOrderProductsFromJson(
+    Map<String, dynamic> json) {
   final GarageSaleHistoryListOrderProducts garageSaleHistoryListOrderProducts = GarageSaleHistoryListOrderProducts();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -141,14 +155,16 @@ GarageSaleHistoryListOrderProducts $GarageSaleHistoryListOrderProductsFromJson(M
   if (totalAmount != null) {
     garageSaleHistoryListOrderProducts.totalAmount = totalAmount;
   }
-  final String? plannedServiceAt = jsonConvert.convert<String>(json['planned_service_at']);
+  final String? plannedServiceAt = jsonConvert.convert<String>(
+      json['planned_service_at']);
   if (plannedServiceAt != null) {
     garageSaleHistoryListOrderProducts.plannedServiceAt = plannedServiceAt;
   }
   return garageSaleHistoryListOrderProducts;
 }
 
-Map<String, dynamic> $GarageSaleHistoryListOrderProductsToJson(GarageSaleHistoryListOrderProducts entity) {
+Map<String, dynamic> $GarageSaleHistoryListOrderProductsToJson(
+    GarageSaleHistoryListOrderProducts entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['product_name'] = entity.productName;

packages/cs_domain/lib/generated/json/garage_sale_rent_detail_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/garage_sale_rent_detail_entity.dart';
 
-GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(Map<String, dynamic> json) {
+GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final GarageSaleRentDetailEntity garageSaleRentDetailEntity = GarageSaleRentDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -36,14 +37,16 @@ GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(Map<String, dynam
   if (contact != null) {
     garageSaleRentDetailEntity.contact = contact;
   }
-  final GarageSaleRentDetailAccount? account = jsonConvert.convert<GarageSaleRentDetailAccount>(json['account']);
+  final GarageSaleRentDetailAccount? account = jsonConvert.convert<
+      GarageSaleRentDetailAccount>(json['account']);
   if (account != null) {
     garageSaleRentDetailEntity.account = account;
   }
   return garageSaleRentDetailEntity;
 }
 
-Map<String, dynamic> $GarageSaleRentDetailEntityToJson(GarageSaleRentDetailEntity entity) {
+Map<String, dynamic> $GarageSaleRentDetailEntityToJson(
+    GarageSaleRentDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;
@@ -82,7 +85,8 @@ extension GarageSaleRentDetailEntityExtension on GarageSaleRentDetailEntity {
   }
 }
 
-GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(Map<String, dynamic> json) {
+GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(
+    Map<String, dynamic> json) {
   final GarageSaleRentDetailAccount garageSaleRentDetailAccount = GarageSaleRentDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -99,7 +103,8 @@ GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(Map<String, dyn
   return garageSaleRentDetailAccount;
 }
 
-Map<String, dynamic> $GarageSaleRentDetailAccountToJson(GarageSaleRentDetailAccount entity) {
+Map<String, dynamic> $GarageSaleRentDetailAccountToJson(
+    GarageSaleRentDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/garage_sale_rent_entity.g.dart

@@ -19,8 +19,11 @@ GarageSaleRentEntity $GarageSaleRentEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     garageSaleRentEntity.countPage = countPage;
   }
-  final List<GarageSaleRentList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<GarageSaleRentList>(e) as GarageSaleRentList).toList();
+  final List<GarageSaleRentList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<GarageSaleRentList>(e) as GarageSaleRentList)
+      .toList();
   if (list != null) {
     garageSaleRentEntity.list = list;
   }
@@ -85,7 +88,8 @@ GarageSaleRentList $GarageSaleRentListFromJson(Map<String, dynamic> json) {
   if (likesCount != null) {
     garageSaleRentList.likesCount = likesCount;
   }
-  final GarageSaleRentListAccount? account = jsonConvert.convert<GarageSaleRentListAccount>(json['account']);
+  final GarageSaleRentListAccount? account = jsonConvert.convert<
+      GarageSaleRentListAccount>(json['account']);
   if (account != null) {
     garageSaleRentList.account = account;
   }
@@ -128,7 +132,8 @@ extension GarageSaleRentListExtension on GarageSaleRentList {
   }
 }
 
-GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(Map<String, dynamic> json) {
+GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(
+    Map<String, dynamic> json) {
   final GarageSaleRentListAccount garageSaleRentListAccount = GarageSaleRentListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -145,7 +150,8 @@ GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(Map<String, dynamic
   return garageSaleRentListAccount;
 }
 
-Map<String, dynamic> $GarageSaleRentListAccountToJson(GarageSaleRentListAccount entity) {
+Map<String, dynamic> $GarageSaleRentListAccountToJson(
+    GarageSaleRentListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/home_list_entity.g.dart

@@ -3,23 +3,39 @@ import 'package:domain/entity/home_list_entity.dart';
 
 HomeListEntity $HomeListEntityFromJson(Map<String, dynamic> json) {
   final HomeListEntity homeListEntity = HomeListEntity();
-  final List<HomeListBanners>? banners = (json['banners'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<HomeListBanners>(e) as HomeListBanners).toList();
+  final List<HomeListBanners>? banners = (json['banners'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<HomeListBanners>(e) as HomeListBanners)
+      .toList();
   if (banners != null) {
     homeListEntity.banners = banners;
   }
-  final List<HomeListLatestTransactions>? latestTransactions = (json['latest_transactions'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<HomeListLatestTransactions>(e) as HomeListLatestTransactions).toList();
+  final List<
+      HomeListLatestTransactions>? latestTransactions = (json['latest_transactions'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<HomeListLatestTransactions>(
+          e) as HomeListLatestTransactions).toList();
   if (latestTransactions != null) {
     homeListEntity.latestTransactions = latestTransactions;
   }
-  final List<HomeListPropertyNews>? propertyNews = (json['property_news'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews).toList();
+  final List<
+      HomeListPropertyNews>? propertyNews = (json['property_news'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews)
+      .toList();
   if (propertyNews != null) {
     homeListEntity.propertyNews = propertyNews;
   }
-  final List<HomeListPropertyNews>? strataManagementGuides = (json['strata_management_guides'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews).toList();
+  final List<
+      HomeListPropertyNews>? strataManagementGuides = (json['strata_management_guides'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews)
+      .toList();
   if (strataManagementGuides != null) {
     homeListEntity.strataManagementGuides = strataManagementGuides;
   }
@@ -29,9 +45,11 @@ HomeListEntity $HomeListEntityFromJson(Map<String, dynamic> json) {
 Map<String, dynamic> $HomeListEntityToJson(HomeListEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['banners'] = entity.banners.map((v) => v.toJson()).toList();
-  data['latest_transactions'] = entity.latestTransactions.map((v) => v.toJson()).toList();
+  data['latest_transactions'] =
+      entity.latestTransactions.map((v) => v.toJson()).toList();
   data['property_news'] = entity.propertyNews.map((v) => v.toJson()).toList();
-  data['strata_management_guides'] = entity.strataManagementGuides.map((v) => v.toJson()).toList();
+  data['strata_management_guides'] =
+      entity.strataManagementGuides.map((v) => v.toJson()).toList();
   return data;
 }
 
@@ -46,7 +64,8 @@ extension HomeListEntityExtension on HomeListEntity {
       ..banners = banners ?? this.banners
       ..latestTransactions = latestTransactions ?? this.latestTransactions
       ..propertyNews = propertyNews ?? this.propertyNews
-      ..strataManagementGuides = strataManagementGuides ?? this.strataManagementGuides;
+      ..strataManagementGuides = strataManagementGuides ??
+          this.strataManagementGuides;
   }
 }
 
@@ -88,7 +107,8 @@ extension HomeListBannersExtension on HomeListBanners {
   }
 }
 
-HomeListLatestTransactions $HomeListLatestTransactionsFromJson(Map<String, dynamic> json) {
+HomeListLatestTransactions $HomeListLatestTransactionsFromJson(
+    Map<String, dynamic> json) {
   final HomeListLatestTransactions homeListLatestTransactions = HomeListLatestTransactions();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -113,7 +133,8 @@ HomeListLatestTransactions $HomeListLatestTransactionsFromJson(Map<String, dynam
   return homeListLatestTransactions;
 }
 
-Map<String, dynamic> $HomeListLatestTransactionsToJson(HomeListLatestTransactions entity) {
+Map<String, dynamic> $HomeListLatestTransactionsToJson(
+    HomeListLatestTransactions entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['type'] = entity.type;

packages/cs_domain/lib/generated/json/latest_news_detail_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/latest_news_detail_entity.dart';
 
-LatestNewsDetailEntity $LatestNewsDetailEntityFromJson(Map<String, dynamic> json) {
+LatestNewsDetailEntity $LatestNewsDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final LatestNewsDetailEntity latestNewsDetailEntity = LatestNewsDetailEntity();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -30,7 +31,8 @@ LatestNewsDetailEntity $LatestNewsDetailEntityFromJson(Map<String, dynamic> json
   return latestNewsDetailEntity;
 }
 
-Map<String, dynamic> $LatestNewsDetailEntityToJson(LatestNewsDetailEntity entity) {
+Map<String, dynamic> $LatestNewsDetailEntityToJson(
+    LatestNewsDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['type'] = entity.type;

packages/cs_domain/lib/generated/json/latest_news_page_entity.g.dart

@@ -19,8 +19,10 @@ LatestNewsPageEntity $LatestNewsPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     latestNewsPageEntity.countPage = countPage;
   }
-  final List<LatestNewsList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<LatestNewsList>(e) as LatestNewsList).toList();
+  final List<LatestNewsList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<LatestNewsList>(e) as LatestNewsList)
+      .toList();
   if (list != null) {
     latestNewsPageEntity.list = list;
   }

packages/cs_domain/lib/generated/json/myfollowing_list_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/myfollowing_list_entity.dart';
 
-MyfollowingListEntity $MyfollowingListEntityFromJson(Map<String, dynamic> json) {
+MyfollowingListEntity $MyfollowingListEntityFromJson(
+    Map<String, dynamic> json) {
   final MyfollowingListEntity myfollowingListEntity = MyfollowingListEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -18,7 +19,8 @@ MyfollowingListEntity $MyfollowingListEntityFromJson(Map<String, dynamic> json)
   return myfollowingListEntity;
 }
 
-Map<String, dynamic> $MyfollowingListEntityToJson(MyfollowingListEntity entity) {
+Map<String, dynamic> $MyfollowingListEntityToJson(
+    MyfollowingListEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/myposts_newsfeed_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/myposts_newsfeed_entity.dart';
 
-MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(Map<String, dynamic> json) {
+MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(
+    Map<String, dynamic> json) {
   final MypostsNewsfeedEntity mypostsNewsfeedEntity = MypostsNewsfeedEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,19 @@ MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(Map<String, dynamic> json)
   if (countPage != null) {
     mypostsNewsfeedEntity.countPage = countPage;
   }
-  final List<MypostsNewsfeedList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<MypostsNewsfeedList>(e) as MypostsNewsfeedList).toList();
+  final List<MypostsNewsfeedList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<MypostsNewsfeedList>(e) as MypostsNewsfeedList)
+      .toList();
   if (list != null) {
     mypostsNewsfeedEntity.list = list;
   }
   return mypostsNewsfeedEntity;
 }
 
-Map<String, dynamic> $MypostsNewsfeedEntityToJson(MypostsNewsfeedEntity entity) {
+Map<String, dynamic> $MypostsNewsfeedEntityToJson(
+    MypostsNewsfeedEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -85,7 +90,8 @@ MypostsNewsfeedList $MypostsNewsfeedListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     mypostsNewsfeedList.createdAt = createdAt;
   }
-  final MypostsNewsfeedListAccount? account = jsonConvert.convert<MypostsNewsfeedListAccount>(json['account']);
+  final MypostsNewsfeedListAccount? account = jsonConvert.convert<
+      MypostsNewsfeedListAccount>(json['account']);
   if (account != null) {
     mypostsNewsfeedList.account = account;
   }
@@ -128,7 +134,8 @@ extension MypostsNewsfeedListExtension on MypostsNewsfeedList {
   }
 }
 
-MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(Map<String, dynamic> json) {
+MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(
+    Map<String, dynamic> json) {
   final MypostsNewsfeedListAccount mypostsNewsfeedListAccount = MypostsNewsfeedListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -149,7 +156,8 @@ MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(Map<String, dynam
   return mypostsNewsfeedListAccount;
 }
 
-Map<String, dynamic> $MypostsNewsfeedListAccountToJson(MypostsNewsfeedListAccount entity) {
+Map<String, dynamic> $MypostsNewsfeedListAccountToJson(
+    MypostsNewsfeedListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/myposts_sale_rent_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/myposts_sale_rent_entity.dart';
 
-MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(Map<String, dynamic> json) {
+MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(
+    Map<String, dynamic> json) {
   final MypostsSaleRentEntity mypostsSaleRentEntity = MypostsSaleRentEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,19 @@ MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(Map<String, dynamic> json)
   if (countPage != null) {
     mypostsSaleRentEntity.countPage = countPage;
   }
-  final List<MypostsSaleRentList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<MypostsSaleRentList>(e) as MypostsSaleRentList).toList();
+  final List<MypostsSaleRentList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<MypostsSaleRentList>(e) as MypostsSaleRentList)
+      .toList();
   if (list != null) {
     mypostsSaleRentEntity.list = list;
   }
   return mypostsSaleRentEntity;
 }
 
-Map<String, dynamic> $MypostsSaleRentEntityToJson(MypostsSaleRentEntity entity) {
+Map<String, dynamic> $MypostsSaleRentEntityToJson(
+    MypostsSaleRentEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

packages/cs_domain/lib/generated/json/newsfeed_comment_publish_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/newsfeed_comment_publish_entity.dart';
 
-NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(Map<String, dynamic> json) {
+NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedCommentPublishEntity newsfeedCommentPublishEntity = NewsfeedCommentPublishEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -18,7 +19,8 @@ NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(Map<String, d
   return newsfeedCommentPublishEntity;
 }
 
-Map<String, dynamic> $NewsfeedCommentPublishEntityToJson(NewsfeedCommentPublishEntity entity) {
+Map<String, dynamic> $NewsfeedCommentPublishEntityToJson(
+    NewsfeedCommentPublishEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;

packages/cs_domain/lib/generated/json/newsfeed_detail_entity.g.dart

@@ -40,12 +40,17 @@ NewsfeedDetailEntity $NewsfeedDetailEntityFromJson(Map<String, dynamic> json) {
   if (liked != null) {
     newsfeedDetailEntity.liked = liked;
   }
-  final NewsfeedDetailAccount? account = jsonConvert.convert<NewsfeedDetailAccount>(json['account']);
+  final NewsfeedDetailAccount? account = jsonConvert.convert<
+      NewsfeedDetailAccount>(json['account']);
   if (account != null) {
     newsfeedDetailEntity.account = account;
   }
-  final List<NewsfeedDetailComments>? comments = (json['comments'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NewsfeedDetailComments>(e) as NewsfeedDetailComments).toList();
+  final List<NewsfeedDetailComments>? comments = (json['comments'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<NewsfeedDetailComments>(e) as NewsfeedDetailComments)
+      .toList();
   if (comments != null) {
     newsfeedDetailEntity.comments = comments;
   }
@@ -97,7 +102,8 @@ extension NewsfeedDetailEntityExtension on NewsfeedDetailEntity {
   }
 }
 
-NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(Map<String, dynamic> json) {
+NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedDetailAccount newsfeedDetailAccount = NewsfeedDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -118,7 +124,8 @@ NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(Map<String, dynamic> json)
   return newsfeedDetailAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailAccountToJson(NewsfeedDetailAccount entity) {
+Map<String, dynamic> $NewsfeedDetailAccountToJson(
+    NewsfeedDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -142,7 +149,8 @@ extension NewsfeedDetailAccountExtension on NewsfeedDetailAccount {
   }
 }
 
-NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(Map<String, dynamic> json) {
+NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedDetailComments newsfeedDetailComments = NewsfeedDetailComments();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -156,18 +164,21 @@ NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(Map<String, dynamic> json
   if (createdAt != null) {
     newsfeedDetailComments.createdAt = createdAt;
   }
-  final NewsfeedDetailCommentsAccount? account = jsonConvert.convert<NewsfeedDetailCommentsAccount>(json['account']);
+  final NewsfeedDetailCommentsAccount? account = jsonConvert.convert<
+      NewsfeedDetailCommentsAccount>(json['account']);
   if (account != null) {
     newsfeedDetailComments.account = account;
   }
-  final NewsfeedDetailCommentsToAccount? toAccount = jsonConvert.convert<NewsfeedDetailCommentsToAccount>(json['to_account']);
+  final NewsfeedDetailCommentsToAccount? toAccount = jsonConvert.convert<
+      NewsfeedDetailCommentsToAccount>(json['to_account']);
   if (toAccount != null) {
     newsfeedDetailComments.toAccount = toAccount;
   }
   return newsfeedDetailComments;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsToJson(NewsfeedDetailComments entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsToJson(
+    NewsfeedDetailComments entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;
@@ -194,7 +205,8 @@ extension NewsfeedDetailCommentsExtension on NewsfeedDetailComments {
   }
 }
 
-NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(Map<String, dynamic> json) {
+NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedDetailCommentsAccount newsfeedDetailCommentsAccount = NewsfeedDetailCommentsAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -211,7 +223,8 @@ NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(Map<String,
   return newsfeedDetailCommentsAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsAccountToJson(NewsfeedDetailCommentsAccount entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsAccountToJson(
+    NewsfeedDetailCommentsAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -232,7 +245,8 @@ extension NewsfeedDetailCommentsAccountExtension on NewsfeedDetailCommentsAccoun
   }
 }
 
-NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(Map<String, dynamic> json) {
+NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedDetailCommentsToAccount newsfeedDetailCommentsToAccount = NewsfeedDetailCommentsToAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -249,7 +263,8 @@ NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(Map<Str
   return newsfeedDetailCommentsToAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsToAccountToJson(NewsfeedDetailCommentsToAccount entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsToAccountToJson(
+    NewsfeedDetailCommentsToAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/newsfeed_following_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/newsfeed_following_entity.dart';
 
-NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(Map<String, dynamic> json) {
+NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedFollowingEntity newsfeedFollowingEntity = NewsfeedFollowingEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,19 @@ NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(Map<String, dynamic> js
   if (countPage != null) {
     newsfeedFollowingEntity.countPage = countPage;
   }
-  final List<NewsfeedFollowingList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NewsfeedFollowingList>(e) as NewsfeedFollowingList).toList();
+  final List<NewsfeedFollowingList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<NewsfeedFollowingList>(e) as NewsfeedFollowingList)
+      .toList();
   if (list != null) {
     newsfeedFollowingEntity.list = list;
   }
   return newsfeedFollowingEntity;
 }
 
-Map<String, dynamic> $NewsfeedFollowingEntityToJson(NewsfeedFollowingEntity entity) {
+Map<String, dynamic> $NewsfeedFollowingEntityToJson(
+    NewsfeedFollowingEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -54,7 +59,8 @@ extension NewsfeedFollowingEntityExtension on NewsfeedFollowingEntity {
   }
 }
 
-NewsfeedFollowingList $NewsfeedFollowingListFromJson(Map<String, dynamic> json) {
+NewsfeedFollowingList $NewsfeedFollowingListFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedFollowingList newsfeedFollowingList = NewsfeedFollowingList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -85,14 +91,16 @@ NewsfeedFollowingList $NewsfeedFollowingListFromJson(Map<String, dynamic> json)
   if (createdAt != null) {
     newsfeedFollowingList.createdAt = createdAt;
   }
-  final NewsfeedFollowingListAccount? account = jsonConvert.convert<NewsfeedFollowingListAccount>(json['account']);
+  final NewsfeedFollowingListAccount? account = jsonConvert.convert<
+      NewsfeedFollowingListAccount>(json['account']);
   if (account != null) {
     newsfeedFollowingList.account = account;
   }
   return newsfeedFollowingList;
 }
 
-Map<String, dynamic> $NewsfeedFollowingListToJson(NewsfeedFollowingList entity) {
+Map<String, dynamic> $NewsfeedFollowingListToJson(
+    NewsfeedFollowingList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;
@@ -128,7 +136,8 @@ extension NewsfeedFollowingListExtension on NewsfeedFollowingList {
   }
 }
 
-NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(Map<String, dynamic> json) {
+NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedFollowingListAccount newsfeedFollowingListAccount = NewsfeedFollowingListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -149,7 +158,8 @@ NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(Map<String, d
   return newsfeedFollowingListAccount;
 }
 
-Map<String, dynamic> $NewsfeedFollowingListAccountToJson(NewsfeedFollowingListAccount entity) {
+Map<String, dynamic> $NewsfeedFollowingListAccountToJson(
+    NewsfeedFollowingListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/newsfeed_foryou_entity.g.dart

@@ -19,8 +19,11 @@ NewsfeedForyouEntity $NewsfeedForyouEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     newsfeedForyouEntity.countPage = countPage;
   }
-  final List<NewsfeedForyouList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NewsfeedForyouList>(e) as NewsfeedForyouList).toList();
+  final List<NewsfeedForyouList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<NewsfeedForyouList>(e) as NewsfeedForyouList)
+      .toList();
   if (list != null) {
     newsfeedForyouEntity.list = list;
   }
@@ -85,7 +88,8 @@ NewsfeedForyouList $NewsfeedForyouListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     newsfeedForyouList.createdAt = createdAt;
   }
-  final NewsfeedForyouListAccount? account = jsonConvert.convert<NewsfeedForyouListAccount>(json['account']);
+  final NewsfeedForyouListAccount? account = jsonConvert.convert<
+      NewsfeedForyouListAccount>(json['account']);
   if (account != null) {
     newsfeedForyouList.account = account;
   }
@@ -128,7 +132,8 @@ extension NewsfeedForyouListExtension on NewsfeedForyouList {
   }
 }
 
-NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(Map<String, dynamic> json) {
+NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedForyouListAccount newsfeedForyouListAccount = NewsfeedForyouListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -149,7 +154,8 @@ NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(Map<String, dynamic
   return newsfeedForyouListAccount;
 }
 
-Map<String, dynamic> $NewsfeedForyouListAccountToJson(NewsfeedForyouListAccount entity) {
+Map<String, dynamic> $NewsfeedForyouListAccountToJson(
+    NewsfeedForyouListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/newsfeed_news_entity.g.dart

@@ -19,8 +19,10 @@ NewsfeedNewsEntity $NewsfeedNewsEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     newsfeedNewsEntity.countPage = countPage;
   }
-  final List<NewsfeedNewsList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NewsfeedNewsList>(e) as NewsfeedNewsList).toList();
+  final List<NewsfeedNewsList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<NewsfeedNewsList>(e) as NewsfeedNewsList)
+      .toList();
   if (list != null) {
     newsfeedNewsEntity.list = list;
   }
@@ -85,7 +87,8 @@ NewsfeedNewsList $NewsfeedNewsListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     newsfeedNewsList.createdAt = createdAt;
   }
-  final NewsfeedNewsListAccount? account = jsonConvert.convert<NewsfeedNewsListAccount>(json['account']);
+  final NewsfeedNewsListAccount? account = jsonConvert.convert<
+      NewsfeedNewsListAccount>(json['account']);
   if (account != null) {
     newsfeedNewsList.account = account;
   }
@@ -128,7 +131,8 @@ extension NewsfeedNewsListExtension on NewsfeedNewsList {
   }
 }
 
-NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(Map<String, dynamic> json) {
+NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedNewsListAccount newsfeedNewsListAccount = NewsfeedNewsListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -149,7 +153,8 @@ NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(Map<String, dynamic> js
   return newsfeedNewsListAccount;
 }
 
-Map<String, dynamic> $NewsfeedNewsListAccountToJson(NewsfeedNewsListAccount entity) {
+Map<String, dynamic> $NewsfeedNewsListAccountToJson(
+    NewsfeedNewsListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/notice_board_announ_detail_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_announ_detail_entity.dart';
 
-NoticeBoardAnnounDetailEntity $NoticeBoardAnnounDetailEntityFromJson(Map<String, dynamic> json) {
+NoticeBoardAnnounDetailEntity $NoticeBoardAnnounDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardAnnounDetailEntity noticeBoardAnnounDetailEntity = NoticeBoardAnnounDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -27,7 +28,8 @@ NoticeBoardAnnounDetailEntity $NoticeBoardAnnounDetailEntityFromJson(Map<String,
   return noticeBoardAnnounDetailEntity;
 }
 
-Map<String, dynamic> $NoticeBoardAnnounDetailEntityToJson(NoticeBoardAnnounDetailEntity entity) {
+Map<String, dynamic> $NoticeBoardAnnounDetailEntityToJson(
+    NoticeBoardAnnounDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

packages/cs_domain/lib/generated/json/notice_board_announ_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_announ_entity.dart';
 
-NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(Map<String, dynamic> json) {
+NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardAnnounEntity noticeBoardAnnounEntity = NoticeBoardAnnounEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,19 @@ NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(Map<String, dynamic> js
   if (countPage != null) {
     noticeBoardAnnounEntity.countPage = countPage;
   }
-  final List<NoticeBoardAnnounList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NoticeBoardAnnounList>(e) as NoticeBoardAnnounList).toList();
+  final List<NoticeBoardAnnounList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<NoticeBoardAnnounList>(e) as NoticeBoardAnnounList)
+      .toList();
   if (list != null) {
     noticeBoardAnnounEntity.list = list;
   }
   return noticeBoardAnnounEntity;
 }
 
-Map<String, dynamic> $NoticeBoardAnnounEntityToJson(NoticeBoardAnnounEntity entity) {
+Map<String, dynamic> $NoticeBoardAnnounEntityToJson(
+    NoticeBoardAnnounEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -54,7 +59,8 @@ extension NoticeBoardAnnounEntityExtension on NoticeBoardAnnounEntity {
   }
 }
 
-NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(Map<String, dynamic> json) {
+NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardAnnounList noticeBoardAnnounList = NoticeBoardAnnounList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -71,7 +77,8 @@ NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(Map<String, dynamic> json)
   return noticeBoardAnnounList;
 }
 
-Map<String, dynamic> $NoticeBoardAnnounListToJson(NoticeBoardAnnounList entity) {
+Map<String, dynamic> $NoticeBoardAnnounListToJson(
+    NoticeBoardAnnounList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

packages/cs_domain/lib/generated/json/notice_board_documents_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_documents_entity.dart';
 
-NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(Map<String, dynamic> json) {
+NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardDocumentsEntity noticeBoardDocumentsEntity = NoticeBoardDocumentsEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,20 @@ NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(Map<String, dynam
   if (countPage != null) {
     noticeBoardDocumentsEntity.countPage = countPage;
   }
-  final List<NoticeBoardDocumentsList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NoticeBoardDocumentsList>(e) as NoticeBoardDocumentsList).toList();
+  final List<NoticeBoardDocumentsList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<NoticeBoardDocumentsList>(
+          e) as NoticeBoardDocumentsList)
+      .toList();
   if (list != null) {
     noticeBoardDocumentsEntity.list = list;
   }
   return noticeBoardDocumentsEntity;
 }
 
-Map<String, dynamic> $NoticeBoardDocumentsEntityToJson(NoticeBoardDocumentsEntity entity) {
+Map<String, dynamic> $NoticeBoardDocumentsEntityToJson(
+    NoticeBoardDocumentsEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -54,7 +60,8 @@ extension NoticeBoardDocumentsEntityExtension on NoticeBoardDocumentsEntity {
   }
 }
 
-NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(Map<String, dynamic> json) {
+NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardDocumentsList noticeBoardDocumentsList = NoticeBoardDocumentsList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -75,7 +82,8 @@ NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(Map<String, dynamic>
   return noticeBoardDocumentsList;
 }
 
-Map<String, dynamic> $NoticeBoardDocumentsListToJson(NoticeBoardDocumentsList entity) {
+Map<String, dynamic> $NoticeBoardDocumentsListToJson(
+    NoticeBoardDocumentsList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['parent_id'] = entity.parentId;

packages/cs_domain/lib/generated/json/notice_board_event_detail_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_event_detail_entity.dart';
 
-NoticeBoardEventDetailEntity $NoticeBoardEventDetailEntityFromJson(Map<String, dynamic> json) {
+NoticeBoardEventDetailEntity $NoticeBoardEventDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardEventDetailEntity noticeBoardEventDetailEntity = NoticeBoardEventDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -31,7 +32,8 @@ NoticeBoardEventDetailEntity $NoticeBoardEventDetailEntityFromJson(Map<String, d
   return noticeBoardEventDetailEntity;
 }
 
-Map<String, dynamic> $NoticeBoardEventDetailEntityToJson(NoticeBoardEventDetailEntity entity) {
+Map<String, dynamic> $NoticeBoardEventDetailEntityToJson(
+    NoticeBoardEventDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

packages/cs_domain/lib/generated/json/notice_board_event_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_event_entity.dart';
 
-NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(Map<String, dynamic> json) {
+NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardEventEntity noticeBoardEventEntity = NoticeBoardEventEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,19 @@ NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(Map<String, dynamic> json
   if (countPage != null) {
     noticeBoardEventEntity.countPage = countPage;
   }
-  final List<NoticeBoardEventList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NoticeBoardEventList>(e) as NoticeBoardEventList).toList();
+  final List<NoticeBoardEventList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<NoticeBoardEventList>(e) as NoticeBoardEventList)
+      .toList();
   if (list != null) {
     noticeBoardEventEntity.list = list;
   }
   return noticeBoardEventEntity;
 }
 
-Map<String, dynamic> $NoticeBoardEventEntityToJson(NoticeBoardEventEntity entity) {
+Map<String, dynamic> $NoticeBoardEventEntityToJson(
+    NoticeBoardEventEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

packages/cs_domain/lib/generated/json/paid_service_detail_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/paid_service_detail_entity.dart';
 
-PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(Map<String, dynamic> json) {
+PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final PaidServiceDetailEntity paidServiceDetailEntity = PaidServiceDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -16,7 +17,8 @@ PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(Map<String, dynamic> js
   if (name != null) {
     paidServiceDetailEntity.name = name;
   }
-  final int? evaluationsAvgScore = jsonConvert.convert<int>(json['evaluations_avg_score']);
+  final int? evaluationsAvgScore = jsonConvert.convert<int>(
+      json['evaluations_avg_score']);
   if (evaluationsAvgScore != null) {
     paidServiceDetailEntity.evaluationsAvgScore = evaluationsAvgScore;
   }
@@ -36,15 +38,18 @@ PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(Map<String, dynamic> js
   if (nightPrice != null) {
     paidServiceDetailEntity.nightPrice = nightPrice;
   }
-  final String? servicePeriodStart = jsonConvert.convert<String>(json['service_period_start']);
+  final String? servicePeriodStart = jsonConvert.convert<String>(
+      json['service_period_start']);
   if (servicePeriodStart != null) {
     paidServiceDetailEntity.servicePeriodStart = servicePeriodStart;
   }
-  final String? servicePeriodEnd = jsonConvert.convert<String>(json['service_period_end']);
+  final String? servicePeriodEnd = jsonConvert.convert<String>(
+      json['service_period_end']);
   if (servicePeriodEnd != null) {
     paidServiceDetailEntity.servicePeriodEnd = servicePeriodEnd;
   }
-  final int? servicePeriodInterval = jsonConvert.convert<int>(json['service_period_interval']);
+  final int? servicePeriodInterval = jsonConvert.convert<int>(
+      json['service_period_interval']);
   if (servicePeriodInterval != null) {
     paidServiceDetailEntity.servicePeriodInterval = servicePeriodInterval;
   }
@@ -52,28 +57,38 @@ PaidServiceDetailEntity $PaidServiceDetailEntityFromJson(Map<String, dynamic> js
   if (description != null) {
     paidServiceDetailEntity.description = description;
   }
-  final PaidServiceDetailMerchant? merchant = jsonConvert.convert<PaidServiceDetailMerchant>(json['merchant']);
+  final PaidServiceDetailMerchant? merchant = jsonConvert.convert<
+      PaidServiceDetailMerchant>(json['merchant']);
   if (merchant != null) {
     paidServiceDetailEntity.merchant = merchant;
   }
-  final PaidServiceDetailCategory? category = jsonConvert.convert<PaidServiceDetailCategory>(json['category']);
+  final PaidServiceDetailCategory? category = jsonConvert.convert<
+      PaidServiceDetailCategory>(json['category']);
   if (category != null) {
     paidServiceDetailEntity.category = category;
   }
-  final List<PaidServiceDetailProducts>? products = (json['products'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<PaidServiceDetailProducts>(e) as PaidServiceDetailProducts).toList();
+  final List<PaidServiceDetailProducts>? products = (json['products'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<PaidServiceDetailProducts>(
+          e) as PaidServiceDetailProducts).toList();
   if (products != null) {
     paidServiceDetailEntity.products = products;
   }
-  final List<PaidServiceDetailEvaluations>? evaluations = (json['evaluations'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<PaidServiceDetailEvaluations>(e) as PaidServiceDetailEvaluations).toList();
+  final List<
+      PaidServiceDetailEvaluations>? evaluations = (json['evaluations'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<PaidServiceDetailEvaluations>(
+          e) as PaidServiceDetailEvaluations).toList();
   if (evaluations != null) {
     paidServiceDetailEntity.evaluations = evaluations;
   }
   return paidServiceDetailEntity;
 }
 
-Map<String, dynamic> $PaidServiceDetailEntityToJson(PaidServiceDetailEntity entity) {
+Map<String, dynamic> $PaidServiceDetailEntityToJson(
+    PaidServiceDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['resources'] = entity.resources;
@@ -124,7 +139,8 @@ extension PaidServiceDetailEntityExtension on PaidServiceDetailEntity {
       ..nightPrice = nightPrice ?? this.nightPrice
       ..servicePeriodStart = servicePeriodStart ?? this.servicePeriodStart
       ..servicePeriodEnd = servicePeriodEnd ?? this.servicePeriodEnd
-      ..servicePeriodInterval = servicePeriodInterval ?? this.servicePeriodInterval
+      ..servicePeriodInterval = servicePeriodInterval ??
+          this.servicePeriodInterval
       ..description = description ?? this.description
       ..merchant = merchant ?? this.merchant
       ..category = category ?? this.category
@@ -133,7 +149,8 @@ extension PaidServiceDetailEntityExtension on PaidServiceDetailEntity {
   }
 }
 
-PaidServiceDetailMerchant $PaidServiceDetailMerchantFromJson(Map<String, dynamic> json) {
+PaidServiceDetailMerchant $PaidServiceDetailMerchantFromJson(
+    Map<String, dynamic> json) {
   final PaidServiceDetailMerchant paidServiceDetailMerchant = PaidServiceDetailMerchant();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -143,14 +160,16 @@ PaidServiceDetailMerchant $PaidServiceDetailMerchantFromJson(Map<String, dynamic
   if (name != null) {
     paidServiceDetailMerchant.name = name;
   }
-  final String? contactPhone = jsonConvert.convert<String>(json['contact_phone']);
+  final String? contactPhone = jsonConvert.convert<String>(
+      json['contact_phone']);
   if (contactPhone != null) {
     paidServiceDetailMerchant.contactPhone = contactPhone;
   }
   return paidServiceDetailMerchant;
 }
 
-Map<String, dynamic> $PaidServiceDetailMerchantToJson(PaidServiceDetailMerchant entity) {
+Map<String, dynamic> $PaidServiceDetailMerchantToJson(
+    PaidServiceDetailMerchant entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -171,7 +190,8 @@ extension PaidServiceDetailMerchantExtension on PaidServiceDetailMerchant {
   }
 }
 
-PaidServiceDetailCategory $PaidServiceDetailCategoryFromJson(Map<String, dynamic> json) {
+PaidServiceDetailCategory $PaidServiceDetailCategoryFromJson(
+    Map<String, dynamic> json) {
   final PaidServiceDetailCategory paidServiceDetailCategory = PaidServiceDetailCategory();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -188,7 +208,8 @@ PaidServiceDetailCategory $PaidServiceDetailCategoryFromJson(Map<String, dynamic
   return paidServiceDetailCategory;
 }
 
-Map<String, dynamic> $PaidServiceDetailCategoryToJson(PaidServiceDetailCategory entity) {
+Map<String, dynamic> $PaidServiceDetailCategoryToJson(
+    PaidServiceDetailCategory entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -209,7 +230,8 @@ extension PaidServiceDetailCategoryExtension on PaidServiceDetailCategory {
   }
 }
 
-PaidServiceDetailProducts $PaidServiceDetailProductsFromJson(Map<String, dynamic> json) {
+PaidServiceDetailProducts $PaidServiceDetailProductsFromJson(
+    Map<String, dynamic> json) {
   final PaidServiceDetailProducts paidServiceDetailProducts = PaidServiceDetailProducts();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -219,7 +241,8 @@ PaidServiceDetailProducts $PaidServiceDetailProductsFromJson(Map<String, dynamic
   if (name != null) {
     paidServiceDetailProducts.name = name;
   }
-  final String? shortDescription = jsonConvert.convert<String>(json['short_description']);
+  final String? shortDescription = jsonConvert.convert<String>(
+      json['short_description']);
   if (shortDescription != null) {
     paidServiceDetailProducts.shortDescription = shortDescription;
   }
@@ -230,7 +253,8 @@ PaidServiceDetailProducts $PaidServiceDetailProductsFromJson(Map<String, dynamic
   return paidServiceDetailProducts;
 }
 
-Map<String, dynamic> $PaidServiceDetailProductsToJson(PaidServiceDetailProducts entity) {
+Map<String, dynamic> $PaidServiceDetailProductsToJson(
+    PaidServiceDetailProducts entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -254,7 +278,8 @@ extension PaidServiceDetailProductsExtension on PaidServiceDetailProducts {
   }
 }
 
-PaidServiceDetailEvaluations $PaidServiceDetailEvaluationsFromJson(Map<String, dynamic> json) {
+PaidServiceDetailEvaluations $PaidServiceDetailEvaluationsFromJson(
+    Map<String, dynamic> json) {
   final PaidServiceDetailEvaluations paidServiceDetailEvaluations = PaidServiceDetailEvaluations();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -273,7 +298,8 @@ PaidServiceDetailEvaluations $PaidServiceDetailEvaluationsFromJson(Map<String, d
   if (resources != null) {
     paidServiceDetailEvaluations.resources = resources;
   }
-  final PaidServiceDetailEvaluationsAccount? account = jsonConvert.convert<PaidServiceDetailEvaluationsAccount>(json['account']);
+  final PaidServiceDetailEvaluationsAccount? account = jsonConvert.convert<
+      PaidServiceDetailEvaluationsAccount>(json['account']);
   if (account != null) {
     paidServiceDetailEvaluations.account = account;
   }
@@ -284,7 +310,8 @@ PaidServiceDetailEvaluations $PaidServiceDetailEvaluationsFromJson(Map<String, d
   return paidServiceDetailEvaluations;
 }
 
-Map<String, dynamic> $PaidServiceDetailEvaluationsToJson(PaidServiceDetailEvaluations entity) {
+Map<String, dynamic> $PaidServiceDetailEvaluationsToJson(
+    PaidServiceDetailEvaluations entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['score'] = entity.score;
@@ -314,7 +341,8 @@ extension PaidServiceDetailEvaluationsExtension on PaidServiceDetailEvaluations
   }
 }
 
-PaidServiceDetailEvaluationsAccount $PaidServiceDetailEvaluationsAccountFromJson(Map<String, dynamic> json) {
+PaidServiceDetailEvaluationsAccount $PaidServiceDetailEvaluationsAccountFromJson(
+    Map<String, dynamic> json) {
   final PaidServiceDetailEvaluationsAccount paidServiceDetailEvaluationsAccount = PaidServiceDetailEvaluationsAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -331,7 +359,8 @@ PaidServiceDetailEvaluationsAccount $PaidServiceDetailEvaluationsAccountFromJson
   return paidServiceDetailEvaluationsAccount;
 }
 
-Map<String, dynamic> $PaidServiceDetailEvaluationsAccountToJson(PaidServiceDetailEvaluationsAccount entity) {
+Map<String, dynamic> $PaidServiceDetailEvaluationsAccountToJson(
+    PaidServiceDetailEvaluationsAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/paid_service_entity.g.dart

@@ -19,8 +19,10 @@ PaidServiceEntity $PaidServiceEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     paidServiceEntity.countPage = countPage;
   }
-  final List<PaidServiceList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<PaidServiceList>(e) as PaidServiceList).toList();
+  final List<PaidServiceList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<PaidServiceList>(e) as PaidServiceList)
+      .toList();
   if (list != null) {
     paidServiceEntity.list = list;
   }
@@ -81,11 +83,13 @@ PaidServiceList $PaidServiceListFromJson(Map<String, dynamic> json) {
   if (liked != null) {
     paidServiceList.liked = liked;
   }
-  final PaidServiceListMerchant? merchant = jsonConvert.convert<PaidServiceListMerchant>(json['merchant']);
+  final PaidServiceListMerchant? merchant = jsonConvert.convert<
+      PaidServiceListMerchant>(json['merchant']);
   if (merchant != null) {
     paidServiceList.merchant = merchant;
   }
-  final PaidServiceListCategory? category = jsonConvert.convert<PaidServiceListCategory>(json['category']);
+  final PaidServiceListCategory? category = jsonConvert.convert<
+      PaidServiceListCategory>(json['category']);
   if (category != null) {
     paidServiceList.category = category;
   }
@@ -128,7 +132,8 @@ extension PaidServiceListExtension on PaidServiceList {
   }
 }
 
-PaidServiceListMerchant $PaidServiceListMerchantFromJson(Map<String, dynamic> json) {
+PaidServiceListMerchant $PaidServiceListMerchantFromJson(
+    Map<String, dynamic> json) {
   final PaidServiceListMerchant paidServiceListMerchant = PaidServiceListMerchant();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -141,7 +146,8 @@ PaidServiceListMerchant $PaidServiceListMerchantFromJson(Map<String, dynamic> js
   return paidServiceListMerchant;
 }
 
-Map<String, dynamic> $PaidServiceListMerchantToJson(PaidServiceListMerchant entity) {
+Map<String, dynamic> $PaidServiceListMerchantToJson(
+    PaidServiceListMerchant entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -159,7 +165,8 @@ extension PaidServiceListMerchantExtension on PaidServiceListMerchant {
   }
 }
 
-PaidServiceListCategory $PaidServiceListCategoryFromJson(Map<String, dynamic> json) {
+PaidServiceListCategory $PaidServiceListCategoryFromJson(
+    Map<String, dynamic> json) {
   final PaidServiceListCategory paidServiceListCategory = PaidServiceListCategory();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -176,7 +183,8 @@ PaidServiceListCategory $PaidServiceListCategoryFromJson(Map<String, dynamic> js
   return paidServiceListCategory;
 }
 
-Map<String, dynamic> $PaidServiceListCategoryToJson(PaidServiceListCategory entity) {
+Map<String, dynamic> $PaidServiceListCategoryToJson(
+    PaidServiceListCategory entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/paid_service_pay_success_info_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/paid_service_pay_success_info_entity.dart';
 
-PaidServicePaySuccessInfoEntity $PaidServicePaySuccessInfoEntityFromJson(Map<String, dynamic> json) {
+PaidServicePaySuccessInfoEntity $PaidServicePaySuccessInfoEntityFromJson(
+    Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoEntity paidServicePaySuccessInfoEntity = PaidServicePaySuccessInfoEntity();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -23,38 +24,51 @@ PaidServicePaySuccessInfoEntity $PaidServicePaySuccessInfoEntityFromJson(Map<Str
   if (notes != null) {
     paidServicePaySuccessInfoEntity.notes = notes;
   }
-  final PaidServicePaySuccessInfoAccount? account = jsonConvert.convert<PaidServicePaySuccessInfoAccount>(json['account']);
+  final PaidServicePaySuccessInfoAccount? account = jsonConvert.convert<
+      PaidServicePaySuccessInfoAccount>(json['account']);
   if (account != null) {
     paidServicePaySuccessInfoEntity.account = account;
   }
-  final PaidServicePaySuccessInfoOrderService? orderService = jsonConvert.convert<PaidServicePaySuccessInfoOrderService>(json['order_service']);
+  final PaidServicePaySuccessInfoOrderService? orderService = jsonConvert
+      .convert<PaidServicePaySuccessInfoOrderService>(json['order_service']);
   if (orderService != null) {
     paidServicePaySuccessInfoEntity.orderService = orderService;
   }
-  final PaidServicePaySuccessInfoMerchant? merchant = jsonConvert.convert<PaidServicePaySuccessInfoMerchant>(json['merchant']);
+  final PaidServicePaySuccessInfoMerchant? merchant = jsonConvert.convert<
+      PaidServicePaySuccessInfoMerchant>(json['merchant']);
   if (merchant != null) {
     paidServicePaySuccessInfoEntity.merchant = merchant;
   }
-  final PaidServicePaySuccessInfoStaff? staff = jsonConvert.convert<PaidServicePaySuccessInfoStaff>(json['staff']);
+  final PaidServicePaySuccessInfoStaff? staff = jsonConvert.convert<
+      PaidServicePaySuccessInfoStaff>(json['staff']);
   if (staff != null) {
     paidServicePaySuccessInfoEntity.staff = staff;
   }
-  final PaidServicePaySuccessInfoOrderProducts? orderProducts = jsonConvert.convert<PaidServicePaySuccessInfoOrderProducts>(json['order_products']);
+  final PaidServicePaySuccessInfoOrderProducts? orderProducts = jsonConvert
+      .convert<PaidServicePaySuccessInfoOrderProducts>(json['order_products']);
   if (orderProducts != null) {
     paidServicePaySuccessInfoEntity.orderProducts = orderProducts;
   }
-  final PaidServicePaySuccessInfoEstate? estate = jsonConvert.convert<PaidServicePaySuccessInfoEstate>(json['estate']);
+  final PaidServicePaySuccessInfoEstate? estate = jsonConvert.convert<
+      PaidServicePaySuccessInfoEstate>(json['estate']);
   if (estate != null) {
     paidServicePaySuccessInfoEntity.estate = estate;
   }
-  final PaidServicePaySuccessInfoEstateUnit? estateUnit = jsonConvert.convert<PaidServicePaySuccessInfoEstateUnit>(json['estate_unit']);
+  final PaidServicePaySuccessInfoEstateUnit? estateUnit = jsonConvert.convert<
+      PaidServicePaySuccessInfoEstateUnit>(json['estate_unit']);
   if (estateUnit != null) {
     paidServicePaySuccessInfoEntity.estateUnit = estateUnit;
   }
+  final PaidServicePaySuccessInfoOrder? order = jsonConvert.convert<
+      PaidServicePaySuccessInfoOrder>(json['order']);
+  if (order != null) {
+    paidServicePaySuccessInfoEntity.order = order;
+  }
   return paidServicePaySuccessInfoEntity;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoEntityToJson(PaidServicePaySuccessInfoEntity entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoEntityToJson(
+    PaidServicePaySuccessInfoEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['sn'] = entity.sn;
@@ -68,6 +82,7 @@ Map<String, dynamic> $PaidServicePaySuccessInfoEntityToJson(PaidServicePaySucces
   data['order_products'] = entity.orderProducts?.toJson();
   data['estate'] = entity.estate?.toJson();
   data['estate_unit'] = entity.estateUnit?.toJson();
+  data['order'] = entity.order?.toJson();
   return data;
 }
 
@@ -85,6 +100,7 @@ extension PaidServicePaySuccessInfoEntityExtension on PaidServicePaySuccessInfoE
     PaidServicePaySuccessInfoOrderProducts? orderProducts,
     PaidServicePaySuccessInfoEstate? estate,
     PaidServicePaySuccessInfoEstateUnit? estateUnit,
+    PaidServicePaySuccessInfoOrder? order,
   }) {
     return PaidServicePaySuccessInfoEntity()
       ..id = id ?? this.id
@@ -98,11 +114,13 @@ extension PaidServicePaySuccessInfoEntityExtension on PaidServicePaySuccessInfoE
       ..staff = staff ?? this.staff
       ..orderProducts = orderProducts ?? this.orderProducts
       ..estate = estate ?? this.estate
-      ..estateUnit = estateUnit ?? this.estateUnit;
+      ..estateUnit = estateUnit ?? this.estateUnit
+      ..order = order ?? this.order;
   }
 }
 
-PaidServicePaySuccessInfoAccount $PaidServicePaySuccessInfoAccountFromJson(Map<String, dynamic> json) {
+PaidServicePaySuccessInfoAccount $PaidServicePaySuccessInfoAccountFromJson(
+    Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoAccount paidServicePaySuccessInfoAccount = PaidServicePaySuccessInfoAccount();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -123,7 +141,8 @@ PaidServicePaySuccessInfoAccount $PaidServicePaySuccessInfoAccountFromJson(Map<S
   return paidServicePaySuccessInfoAccount;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoAccountToJson(PaidServicePaySuccessInfoAccount entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoAccountToJson(
+    PaidServicePaySuccessInfoAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -147,7 +166,8 @@ extension PaidServicePaySuccessInfoAccountExtension on PaidServicePaySuccessInfo
   }
 }
 
-PaidServicePaySuccessInfoOrderService $PaidServicePaySuccessInfoOrderServiceFromJson(Map<String, dynamic> json) {
+PaidServicePaySuccessInfoOrderService $PaidServicePaySuccessInfoOrderServiceFromJson(
+    Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoOrderService paidServicePaySuccessInfoOrderService = PaidServicePaySuccessInfoOrderService();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -157,14 +177,17 @@ PaidServicePaySuccessInfoOrderService $PaidServicePaySuccessInfoOrderServiceFrom
   if (name != null) {
     paidServicePaySuccessInfoOrderService.name = name;
   }
-  final int? evaluationsAvgScore = jsonConvert.convert<int>(json['evaluations_avg_score']);
+  final int? evaluationsAvgScore = jsonConvert.convert<int>(
+      json['evaluations_avg_score']);
   if (evaluationsAvgScore != null) {
-    paidServicePaySuccessInfoOrderService.evaluationsAvgScore = evaluationsAvgScore;
+    paidServicePaySuccessInfoOrderService.evaluationsAvgScore =
+        evaluationsAvgScore;
   }
   return paidServicePaySuccessInfoOrderService;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoOrderServiceToJson(PaidServicePaySuccessInfoOrderService entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoOrderServiceToJson(
+    PaidServicePaySuccessInfoOrderService entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -185,7 +208,8 @@ extension PaidServicePaySuccessInfoOrderServiceExtension on PaidServicePaySucces
   }
 }
 
-PaidServicePaySuccessInfoMerchant $PaidServicePaySuccessInfoMerchantFromJson(Map<String, dynamic> json) {
+PaidServicePaySuccessInfoMerchant $PaidServicePaySuccessInfoMerchantFromJson(
+    Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoMerchant paidServicePaySuccessInfoMerchant = PaidServicePaySuccessInfoMerchant();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -195,14 +219,16 @@ PaidServicePaySuccessInfoMerchant $PaidServicePaySuccessInfoMerchantFromJson(Map
   if (name != null) {
     paidServicePaySuccessInfoMerchant.name = name;
   }
-  final String? contactPhone = jsonConvert.convert<String>(json['contact_phone']);
+  final String? contactPhone = jsonConvert.convert<String>(
+      json['contact_phone']);
   if (contactPhone != null) {
     paidServicePaySuccessInfoMerchant.contactPhone = contactPhone;
   }
   return paidServicePaySuccessInfoMerchant;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoMerchantToJson(PaidServicePaySuccessInfoMerchant entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoMerchantToJson(
+    PaidServicePaySuccessInfoMerchant entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -223,7 +249,8 @@ extension PaidServicePaySuccessInfoMerchantExtension on PaidServicePaySuccessInf
   }
 }
 
-PaidServicePaySuccessInfoStaff $PaidServicePaySuccessInfoStaffFromJson(Map<String, dynamic> json) {
+PaidServicePaySuccessInfoStaff $PaidServicePaySuccessInfoStaffFromJson(
+    Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoStaff paidServicePaySuccessInfoStaff = PaidServicePaySuccessInfoStaff();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -240,7 +267,8 @@ PaidServicePaySuccessInfoStaff $PaidServicePaySuccessInfoStaffFromJson(Map<Strin
   return paidServicePaySuccessInfoStaff;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoStaffToJson(PaidServicePaySuccessInfoStaff entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoStaffToJson(
+    PaidServicePaySuccessInfoStaff entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -261,7 +289,8 @@ extension PaidServicePaySuccessInfoStaffExtension on PaidServicePaySuccessInfoSt
   }
 }
 
-PaidServicePaySuccessInfoOrderProducts $PaidServicePaySuccessInfoOrderProductsFromJson(Map<String, dynamic> json) {
+PaidServicePaySuccessInfoOrderProducts $PaidServicePaySuccessInfoOrderProductsFromJson(
+    Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoOrderProducts paidServicePaySuccessInfoOrderProducts = PaidServicePaySuccessInfoOrderProducts();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -279,14 +308,16 @@ PaidServicePaySuccessInfoOrderProducts $PaidServicePaySuccessInfoOrderProductsFr
   if (totalAmount != null) {
     paidServicePaySuccessInfoOrderProducts.totalAmount = totalAmount;
   }
-  final String? plannedServiceAt = jsonConvert.convert<String>(json['planned_service_at']);
+  final String? plannedServiceAt = jsonConvert.convert<String>(
+      json['planned_service_at']);
   if (plannedServiceAt != null) {
     paidServicePaySuccessInfoOrderProducts.plannedServiceAt = plannedServiceAt;
   }
   return paidServicePaySuccessInfoOrderProducts;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoOrderProductsToJson(PaidServicePaySuccessInfoOrderProducts entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoOrderProductsToJson(
+    PaidServicePaySuccessInfoOrderProducts entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['product_name'] = entity.productName;
@@ -313,7 +344,8 @@ extension PaidServicePaySuccessInfoOrderProductsExtension on PaidServicePaySucce
   }
 }
 
-PaidServicePaySuccessInfoEstate $PaidServicePaySuccessInfoEstateFromJson(Map<String, dynamic> json) {
+PaidServicePaySuccessInfoEstate $PaidServicePaySuccessInfoEstateFromJson(
+    Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoEstate paidServicePaySuccessInfoEstate = PaidServicePaySuccessInfoEstate();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -326,7 +358,8 @@ PaidServicePaySuccessInfoEstate $PaidServicePaySuccessInfoEstateFromJson(Map<Str
   return paidServicePaySuccessInfoEstate;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoEstateToJson(PaidServicePaySuccessInfoEstate entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoEstateToJson(
+    PaidServicePaySuccessInfoEstate entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -344,7 +377,8 @@ extension PaidServicePaySuccessInfoEstateExtension on PaidServicePaySuccessInfoE
   }
 }
 
-PaidServicePaySuccessInfoEstateUnit $PaidServicePaySuccessInfoEstateUnitFromJson(Map<String, dynamic> json) {
+PaidServicePaySuccessInfoEstateUnit $PaidServicePaySuccessInfoEstateUnitFromJson(
+    Map<String, dynamic> json) {
   final PaidServicePaySuccessInfoEstateUnit paidServicePaySuccessInfoEstateUnit = PaidServicePaySuccessInfoEstateUnit();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -361,7 +395,8 @@ PaidServicePaySuccessInfoEstateUnit $PaidServicePaySuccessInfoEstateUnitFromJson
   return paidServicePaySuccessInfoEstateUnit;
 }
 
-Map<String, dynamic> $PaidServicePaySuccessInfoEstateUnitToJson(PaidServicePaySuccessInfoEstateUnit entity) {
+Map<String, dynamic> $PaidServicePaySuccessInfoEstateUnitToJson(
+    PaidServicePaySuccessInfoEstateUnit entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['unit'] = entity.unit;
@@ -380,4 +415,66 @@ extension PaidServicePaySuccessInfoEstateUnitExtension on PaidServicePaySuccessI
       ..unit = unit ?? this.unit
       ..address = address ?? this.address;
   }
+}
+
+PaidServicePaySuccessInfoOrder $PaidServicePaySuccessInfoOrderFromJson(
+    Map<String, dynamic> json) {
+  final PaidServicePaySuccessInfoOrder paidServicePaySuccessInfoOrder = PaidServicePaySuccessInfoOrder();
+  final int? id = jsonConvert.convert<int>(json['id']);
+  if (id != null) {
+    paidServicePaySuccessInfoOrder.id = id;
+  }
+  final String? totalAmount = jsonConvert.convert<String>(json['total_amount']);
+  if (totalAmount != null) {
+    paidServicePaySuccessInfoOrder.totalAmount = totalAmount;
+  }
+  final String? orderAmount = jsonConvert.convert<String>(json['order_amount']);
+  if (orderAmount != null) {
+    paidServicePaySuccessInfoOrder.orderAmount = orderAmount;
+  }
+  final String? depositAmount = jsonConvert.convert<String>(
+      json['deposit_amount']);
+  if (depositAmount != null) {
+    paidServicePaySuccessInfoOrder.depositAmount = depositAmount;
+  }
+  final int? paymentStatus = jsonConvert.convert<int>(json['payment_status']);
+  if (paymentStatus != null) {
+    paidServicePaySuccessInfoOrder.paymentStatus = paymentStatus;
+  }
+  final int? refundStatus = jsonConvert.convert<int>(json['refund_status']);
+  if (refundStatus != null) {
+    paidServicePaySuccessInfoOrder.refundStatus = refundStatus;
+  }
+  return paidServicePaySuccessInfoOrder;
+}
+
+Map<String, dynamic> $PaidServicePaySuccessInfoOrderToJson(
+    PaidServicePaySuccessInfoOrder entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['total_amount'] = entity.totalAmount;
+  data['order_amount'] = entity.orderAmount;
+  data['deposit_amount'] = entity.depositAmount;
+  data['payment_status'] = entity.paymentStatus;
+  data['refund_status'] = entity.refundStatus;
+  return data;
+}
+
+extension PaidServicePaySuccessInfoOrderExtension on PaidServicePaySuccessInfoOrder {
+  PaidServicePaySuccessInfoOrder copyWith({
+    int? id,
+    String? totalAmount,
+    String? orderAmount,
+    String? depositAmount,
+    int? paymentStatus,
+    int? refundStatus,
+  }) {
+    return PaidServicePaySuccessInfoOrder()
+      ..id = id ?? this.id
+      ..totalAmount = totalAmount ?? this.totalAmount
+      ..orderAmount = orderAmount ?? this.orderAmount
+      ..depositAmount = depositAmount ?? this.depositAmount
+      ..paymentStatus = paymentStatus ?? this.paymentStatus
+      ..refundStatus = refundStatus ?? this.refundStatus;
+  }
 }

packages/cs_domain/lib/generated/json/payment_intent_entity.g.dart

@@ -3,7 +3,8 @@ import 'package:domain/entity/payment_intent_entity.dart';
 
 PaymentIntentEntity $PaymentIntentEntityFromJson(Map<String, dynamic> json) {
   final PaymentIntentEntity paymentIntentEntity = PaymentIntentEntity();
-  final String? clientSecret = jsonConvert.convert<String>(json['client_secret']);
+  final String? clientSecret = jsonConvert.convert<String>(
+      json['client_secret']);
   if (clientSecret != null) {
     paymentIntentEntity.clientSecret = clientSecret;
   }

packages/cs_domain/lib/generated/json/payment_page_entity.g.dart

@@ -19,8 +19,10 @@ PaymentPageEntity $PaymentPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     paymentPageEntity.countPage = countPage;
   }
-  final List<PaymentPageList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<PaymentPageList>(e) as PaymentPageList).toList();
+  final List<PaymentPageList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<PaymentPageList>(e) as PaymentPageList)
+      .toList();
   if (list != null) {
     paymentPageEntity.list = list;
   }

packages/cs_domain/lib/generated/json/property_news_detail_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/property_news_detail_entity.dart';
 
-PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(Map<String, dynamic> json) {
+PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final PropertyNewsDetailEntity propertyNewsDetailEntity = PropertyNewsDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -34,7 +35,8 @@ PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(Map<String, dynamic>
   return propertyNewsDetailEntity;
 }
 
-Map<String, dynamic> $PropertyNewsDetailEntityToJson(PropertyNewsDetailEntity entity) {
+Map<String, dynamic> $PropertyNewsDetailEntityToJson(
+    PropertyNewsDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;