优化及解决相关bug

packages/cpt_services/lib/components/chooseAirConditionContent.dart

@@ -16,10 +16,10 @@ import 'chooseAirConditionContent_vm.dart';
 
 class ChooseAirConditionContent extends HookConsumerWidget {
   final int id;
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
   final List<PaidServiceDetailProducts> products;
 
-  const ChooseAirConditionContent({Key? key,required this.id, required this.cleanServiceTypeStr, required this.products}) : super(key: key);
+  const ChooseAirConditionContent({Key? key,required this.id, this.cleanServiceTypeId, required this.products}) : super(key: key);
   
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -31,7 +31,7 @@ class ChooseAirConditionContent extends HookConsumerWidget {
     useEffect((){
       vm.setInitPageData(context, {
         'id': id,
-        'cleanServiceTypeStr': cleanServiceTypeStr,
+        'cleanServiceTypeId': cleanServiceTypeId,
         'products': products,
       });
       // 组件挂载时执行 - 执行接口请求

packages/cpt_services/lib/components/chooseAirConditionTitle.dart

@@ -17,10 +17,10 @@ import 'chooseAirConditionContent_vm.dart';
 
 class ChooseAirConditionTitle extends HookConsumerWidget {
   final int id;
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
 
   const ChooseAirConditionTitle(
-      {Key? key,required this.id, required this.cleanServiceTypeStr,}) : super(key: key);
+      {Key? key,required this.id, this.cleanServiceTypeId,}) : super(key: key);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

packages/cpt_services/lib/components/chooseHouseCleanContent.dart

@@ -20,11 +20,11 @@ import 'chooseHouseCleanContent_vm.dart';
 
 class ChooseHouseCleanContent extends HookConsumerWidget {
   final int id;
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
   final String? useScence;
   final List<PaidServiceDetailProducts> products;
 
-  const ChooseHouseCleanContent({Key? key,required this.id, required this.cleanServiceTypeStr, required this.products, this.useScence}) : super(key: key);
+  const ChooseHouseCleanContent({Key? key,required this.id, this.cleanServiceTypeId, required this.products, this.useScence}) : super(key: key);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -33,7 +33,7 @@ class ChooseHouseCleanContent extends HookConsumerWidget {
     useEffect((){
       vm.setInitPageData(context, {
         'id': id,
-        'cleanServiceTypeStr': cleanServiceTypeStr,
+        'cleanServiceTypeId': cleanServiceTypeId,
         'products': products,
         'useScence': useScence,
       });

packages/cpt_services/lib/components/chooseHouseCleanTitle.dart

@@ -19,10 +19,10 @@ import 'package:widgets/widget_export.dart';
 
 class ChooseHouseCleanTitle extends HookConsumerWidget {
   final int id;
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
 
   const ChooseHouseCleanTitle(
-      {Key? key,required this.id, required this.cleanServiceTypeStr,}) : super(key: key);
+      {Key? key,required this.id, this.cleanServiceTypeId,}) : super(key: key);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

packages/cpt_services/lib/components/chooseVisitTimeBottomFooter.dart

@@ -19,9 +19,9 @@ import '../modules/services/service_order_confirm/service_order_confirm_vm.dart'
 
 class ChooseVisitTimeBottomFooter extends HookConsumerWidget {
   final int id;
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
 
-  const ChooseVisitTimeBottomFooter({Key? key,required this.id, required this.cleanServiceTypeStr}) : super(key: key);
+  const ChooseVisitTimeBottomFooter({Key? key,required this.id, this.cleanServiceTypeId}) : super(key: key);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -96,7 +96,7 @@ class ChooseVisitTimeBottomFooter extends HookConsumerWidget {
                 ),
               ),
             ).onTap((){
-              vm.handlerClickVisitTimeConfirm(context, id: id , cleanServiceTypeStr: cleanServiceTypeStr);
+              vm.handlerClickVisitTimeConfirm(context, id: id , cleanServiceTypeId: cleanServiceTypeId);
             }),
           ),
         ],

packages/cpt_services/lib/components/chooseVisitTimeBottomFooter_vm.dart

@@ -66,7 +66,7 @@ class ChooseVisitTimeBottomFooterVm extends _$ChooseVisitTimeBottomFooterVm {
   }
 
   // 预约时间点击了confirm
-  handlerClickVisitTimeConfirm(BuildContext context,{required int id, required String cleanServiceTypeStr} ){
+  handlerClickVisitTimeConfirm(BuildContext context,{required int id, int? cleanServiceTypeId} ){
     Log.d("handlerClickVisitTimeConfirm");
     final visitTimeContentVm = ref.read(chooseVisitTimeContentVmProvider.notifier);
     if(visitTimeContentVm.state.allSelectedTimeList !=null && visitTimeContentVm.state.allSelectedTimeList!.isNotEmpty ){

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

@@ -7,7 +7,7 @@ part of 'chooseVisitTimeBottomFooter_vm.dart';
 // **************************************************************************
 
 String _$chooseVisitTimeBottomFooterVmHash() =>
-    r'717bedb19b618d4a8c0e84f05dc27874943b2233';
+    r'610adad4a35244a2c42cb5a0bdfea4c1b611f244';
 
 /// See also [ChooseVisitTimeBottomFooterVm].
 @ProviderFor(ChooseVisitTimeBottomFooterVm)

packages/cpt_services/lib/components/chooseVisitTimeContent.dart

@@ -30,7 +30,7 @@ import 'chooseVisitTimeContent_state.dart';
 
 class ChooseVisitTimeContent extends HookConsumerWidget {
   final int id;
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
   final double contentTopSectionHeight;
   final double contentMaxHeight;
   final double bottomBtnSectionHeight;
@@ -38,7 +38,7 @@ class ChooseVisitTimeContent extends HookConsumerWidget {
   const ChooseVisitTimeContent({
     Key? key,
     required this.id,
-    required this.cleanServiceTypeStr,
+    this.cleanServiceTypeId,
     this.contentTopSectionHeight = 150,
     this.contentMaxHeight = 480,
     this.bottomBtnSectionHeight = 50,
@@ -50,7 +50,7 @@ class ChooseVisitTimeContent extends HookConsumerWidget {
     final state = ref.watch(chooseVisitTimeContentVmProvider);
 
     useEffect((){
-      vm.setInitPageData(context, id, cleanServiceTypeStr);
+      vm.setInitPageData(context, id, cleanServiceTypeId);
       // 组件挂载时执行 - 执行接口请求
       Future.microtask(() => vm.initPageData(context));
       return () {
@@ -155,7 +155,7 @@ class ChooseVisitTimeContent extends HookConsumerWidget {
                   text: '$timeText',
                   padding: const EdgeInsets.only(left: 5, right: 5, top: 0, bottom: 0),
                   textColor: itemIsChecked ?context.appColors.textPrimary: context.appColors.textDarkGray999,
-                  backgroundColor: DarkThemeUtil.multiColors(context, itemIsChecked ?ColorUtils.string2Color("#D7F6FF") : context.appColors.disEnableGray, darkColor: itemIsChecked? AppColorsTheme.colorPrimary.withOpacity(0.6):Colors.black),
+                  backgroundColor: DarkThemeUtil.multiColors(context, itemIsChecked ?ColorUtils.string2Color("#D7F6FF") : Colors.white, darkColor: itemIsChecked? AppColorsTheme.colorPrimary.withOpacity(0.6):Colors.black),
                   enable: enable.value,
                   disabledBackgroundColor: context.appColors.disEnableGray,
                   disabledTextColor: context.appColors.textWhite,

packages/cpt_services/lib/components/chooseVisitTimeContent_vm.dart

@@ -38,7 +38,7 @@ class ChooseVisitTimeContentVm extends _$ChooseVisitTimeContentVm {
 
   late BuildContext _context;
   late int _id;
-  late String _cleanServiceTypeStr;
+  late int _cleanServiceTypeId;
 
   ChooseVisitTimeContentState initState(){
     Log.d("--------------------------initState---------------------");
@@ -79,10 +79,10 @@ class ChooseVisitTimeContentVm extends _$ChooseVisitTimeContentVm {
     Log.d("87338  ${state.visitTimeList}");
   }
 
-  setInitPageData(BuildContext context, int id, String cleanServiceTypeStr){
+  setInitPageData(BuildContext context, int id, int? cleanServiceTypeId){
     _context = context;
     _id = id;
-    _cleanServiceTypeStr = cleanServiceTypeStr;
+    _cleanServiceTypeId = cleanServiceTypeId!;
   }
 
   initPageData(BuildContext context){

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

@@ -7,7 +7,7 @@ part of 'chooseVisitTimeContent_vm.dart';
 // **************************************************************************
 
 String _$chooseVisitTimeContentVmHash() =>
-    r'6d59a67cf0b38046893035e796921b6e1bd6bd0f';
+    r'b5d24eb0444a8ef42a4d9ae515b42e98a234afd2';
 
 /// See also [ChooseVisitTimeContentVm].
 @ProviderFor(ChooseVisitTimeContentVm)

packages/cpt_services/lib/components/chooseVisitTimeTitle.dart

@@ -22,10 +22,10 @@ import 'chooseVisitTimeTitle_vm.dart';
 
 class ChooseVisitTimeTitle extends HookConsumerWidget {
   final int id;
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
 
   const ChooseVisitTimeTitle(
-      {Key? key,required this.id, required this.cleanServiceTypeStr,}) : super(key: key);
+      {Key? key,required this.id, this.cleanServiceTypeId,}) : super(key: key);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

packages/cpt_services/lib/components/status_card_item_vm.dart

@@ -18,7 +18,7 @@ class StatusCardItemVm extends _$StatusCardItemVm {
   late ServicesRespository serviceRespositoryInstance;
 
   late int _serviceId;
-  late String _cleanServiceTypeStr;
+  late int _cleanServiceTypeId;
   late int _serviceStatusCode;
 
 
@@ -44,9 +44,9 @@ class StatusCardItemVm extends _$StatusCardItemVm {
   //   );
   // }
 
-  setInitData(BuildContext context,int serviceId, String cleanServiceTypeStr, int serviceStatusCode){
+  setInitData(BuildContext context,int serviceId, int? cleanServiceTypeId, int serviceStatusCode){
     _serviceId = serviceId;
-    _cleanServiceTypeStr = cleanServiceTypeStr;
+    _cleanServiceTypeId = cleanServiceTypeId!;
     _serviceStatusCode = serviceStatusCode;
   }
 
@@ -68,7 +68,7 @@ class StatusCardItemVm extends _$StatusCardItemVm {
       case '4':
         // 去评价
         // context.router.pushNamed('/detail');
-        ServiceEvaluateCreatePage.startInstance(id: _serviceId, cleanServiceTypeStr: _cleanServiceTypeStr,);
+        ServiceEvaluateCreatePage.startInstance(id: _serviceId, cleanServiceTypeId: _cleanServiceTypeId,);
         break;
       default:
         break;

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

@@ -6,7 +6,7 @@ part of 'status_card_item_vm.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$statusCardItemVmHash() => r'b4fb97b72135c637c44971bb6be4f2adad536023';
+String _$statusCardItemVmHash() => r'c17add47a642b9d1e171c766060ac97f19fc0cd3';
 
 /// See also [StatusCardItemVm].
 @ProviderFor(StatusCardItemVm)

packages/cpt_services/lib/constants_services.dart

@@ -33,12 +33,14 @@ class servicesConstants {
      "houseCleaning": {
        "text": S.current.house_cleaning,
        "type": "paid",
-       'code': "House Cleaning",  // 业务做 标识 字段
+       'code': "House Cleaning",
+       'id': 2, // 房屋清洁类 id   // 业务做 标识 字段
      },
      "airConditioner": {
        "text": S.current.air_conditioning_cleaning,
        "type": "paid",
-       'code': "Air Conditioning Cleaning", // 业务做 标识 字段
+       'code': "Air Conditioning Cleaning",
+       'id': 3, // 空调类清洁类 id   // 业务做 标识 字段
      },
   };
 
@@ -47,7 +49,8 @@ class servicesConstants {
     "repairAirConditioner": {
       "text": S.current.maintenance,
       "type": "inquiry",
-      'code': "Repair air Conditioner",  // 业务做 标识 字段
+      'code': "Repair air Conditioner",
+      'id': 5, // 咨询类的 id   // 业务做 标识 字段
     }
   };
    

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

@@ -37,20 +37,20 @@ import '../../../components/status_card_item.dart';
 @RoutePage()
 class CleanOrderDetailPage extends HookConsumerWidget {
   final int id; // 订单id
-  final String? cleanServiceTypeStr; // 订单类型
+  final int? cleanServiceTypeId; // 订单类型
 
   const CleanOrderDetailPage({
     Key? key,
     @PathParam('id') required this.id,
-    @PathParam('cleanServiceTypeStr') this.cleanServiceTypeStr,
+    @PathParam('cleanServiceTypeId') this.cleanServiceTypeId,
   }) : super(key: key);
 
   //启动当前页面
-  static void startInstance({BuildContext? context, required int id, String cleanServiceTypeStr = '' }) {
+  static void startInstance({BuildContext? context, required int id, int? cleanServiceTypeId }) {
     if (context != null) {
-      context.router.push(CleanOrderDetailPageRoute(id: id, cleanServiceTypeStr: cleanServiceTypeStr,));
+      context.router.push(CleanOrderDetailPageRoute(id: id, cleanServiceTypeId: cleanServiceTypeId,));
     } else {
-      appRouter.push(CleanOrderDetailPageRoute(id: id, cleanServiceTypeStr: cleanServiceTypeStr,));
+      appRouter.push(CleanOrderDetailPageRoute(id: id, cleanServiceTypeId: cleanServiceTypeId,));
     }
   }
 
@@ -66,7 +66,7 @@ class CleanOrderDetailPage extends HookConsumerWidget {
     // Log.d("actionBtnList   $actionBtnList");
 
     useEffect(() {
-      vm.setInitPageData(id: id, cleanServiceTypeStr: cleanServiceTypeStr??'',);
+      vm.setInitPageData(id: id, cleanServiceTypeId: cleanServiceTypeId,);
       // 组件挂载时执行 - 执行接口请求
       Future.microtask(() => vm.fetchOrderDetailData(id));
       return () {
@@ -331,10 +331,10 @@ class CleanOrderDetailPage extends HookConsumerWidget {
           ],
         ),
         
-        // if (cleanServiceTypeStr == servicesConstants.paidServicesType['houseCleaning']!['code'])
+        // if (cleanServiceTypeId == servicesConstants.paidServicesType['houseCleaning']!['id'])
         //   // 室内清理
         //   _buildCleanContent(context, state)
-        // else if (cleanServiceTypeStr == servicesConstants.paidServicesType['airConditioner']!['code'])
+        // else if (cleanServiceTypeId == servicesConstants.paidServicesType['airConditioner']!['id'])
         //   // 空调清理
         //   _buildCleanContent(context, state)
         // else

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

@@ -51,7 +51,7 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
   bool _needShowPlaceholder = false; //是否展示LoadingView
 
   late int _detailId;
-  late String _cleanServiceTypeStr;
+  late int? _cleanServiceTypeId;
   late String _orderId;
 
   // Refresh 控制器
@@ -85,15 +85,15 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
     state = state.copyWith(loadingState: loadState, errorMessage: errorMsg);
   }
 
-  setInitPageData({required int id, required String cleanServiceTypeStr,}) {
+  setInitPageData({required int id, int? cleanServiceTypeId,}) {
     _detailId = id;
-    _cleanServiceTypeStr = cleanServiceTypeStr;
+    _cleanServiceTypeId = cleanServiceTypeId;
   }
 
   // 初始化页面数据
   // initPageData({detailId, detailcleanServiceType, detailServiceStatusCode}) {
   //   _detailId = detailId??_detailId;
-  //   _cleanServiceTypeStr = detailcleanServiceType??_cleanServiceTypeStr;
+  //   _cleanServiceTypeId = detailcleanServiceType??_cleanServiceTypeId;
   //   _detailServiceStatusCode = detailServiceStatusCode??_detailServiceStatusCode;
   //   Log.d("--------------------------initPageData---------------------");
   //   changeLoadingState(LoadState.State_Success, null);
@@ -108,7 +108,7 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
   void _callPhone(String? phone) {
     if(phone == null || phone.isEmpty){
       // appRouter.pushAndPopUntil(
-      //   ServicePaySuccessPageRoute(id: _detailId!, cleanServiceTypeStr: _cleanServiceTypeStr),
+      //   ServicePaySuccessPageRoute(id: _detailId!, cleanServiceTypeId: _cleanServiceTypeId),
       //   predicate: (Route<dynamic> route) {       // 根据具体条件返回 true 或 false
       //     return route.settings.name != 'CleanOrderDetailPageRoute';
       //   });
@@ -141,7 +141,7 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
               // 跳入 支付成功页面
               // ServicePaySuccessPage.startInstance();
               context.appRouter.pushAndPopUntil(
-                  ServicePaySuccessPageRoute(id: orderDetailId_int, cleanServiceTypeStr: _cleanServiceTypeStr),
+                  ServicePaySuccessPageRoute(id: orderDetailId_int,),
                   predicate: (Route<dynamic> route) {       // 根据具体条件返回 true 或 false
                 return route.settings.name != 'CleanOrderDetailPageRoute';
               });
@@ -174,7 +174,7 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
         // Evaluate 去评价
         ServiceEvaluateCreatePage.startInstance(
           id: _detailId,
-          cleanServiceTypeStr: _cleanServiceTypeStr,
+          cleanServiceTypeId: _cleanServiceTypeId,
         );
         break;
       default:

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'cd603d5ac397edf6c20c776ff708a10f79fe675b';
+    r'add409ed3862d88151e799152f23682e577c44ee';
 
 /// See also [CleanOrderDetailVm].
 @ProviderFor(CleanOrderDetailVm)

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

@@ -46,9 +46,6 @@ class HistoryPage extends HookConsumerWidget {
     final state = ref.watch(historyVmProvider);
     // final appConfigState = ref.watch(appConfigServiceProvider)
 
-    String cleanServiceTypeStr = servicesConstants.paidServicesType['houseCleaning']?['code'];
-    int serviceStatusCode = servicesConstants.servicesStatus['2']?['code'];
-
     useEffect(() {
       // 组件挂载时执行 - 执行接口请求
       Future.microtask(() => vm.initPageData());
@@ -96,12 +93,11 @@ class HistoryPage extends HookConsumerWidget {
                         ref,
                         state.list[index],
                         vm,
-                        cleanServiceTypeStr,
                       ).onTap(() {
                         vm.gotoCleanOrderDetailPage(
                           context,
                           state.list[index].id != null ? int.tryParse(state.list[index].id!) ?? 0 : 0,
-                          cleanServiceTypeStr,
+                          null,
                         );
                       });
                     },
@@ -114,7 +110,7 @@ class HistoryPage extends HookConsumerWidget {
     );
   }
 
-  Widget _buildHistoryItem(BuildContext context, WidgetRef ref, GarageSaleHistoryList item, vm, String cleanServiceTypeStr) {
+  Widget _buildHistoryItem(BuildContext context, WidgetRef ref, GarageSaleHistoryList item, vm,) {
     return Container(
       margin: const EdgeInsets.only(top: 10),
       width: double.infinity,

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

@@ -197,7 +197,7 @@ class HistoryVm extends _$HistoryVm with DioCancelableMixin {
   }
 
   //  去详情页面
-  gotoCleanOrderDetailPage(BuildContext context, int id, String cleanServiceTypeStr,) {
-    CleanOrderDetailPage.startInstance(id: id, cleanServiceTypeStr: cleanServiceTypeStr,);
+  gotoCleanOrderDetailPage(BuildContext context, int id, int? cleanServiceTypeId,) {
+    CleanOrderDetailPage.startInstance(id: id, cleanServiceTypeId: cleanServiceTypeId,);
   }
 }

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

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

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

@@ -150,9 +150,9 @@ class HomeServicePage extends HookConsumerWidget {
                 child: HomeServiceCard(
                     key: UniqueKey(),
                     itemEntity: item,
-                    cleanServiceTypeStr: item.category!.type,
+                    cleanServiceTypeId: item.category!.id,
                     onClickColleciotn: (dynamic collectionValue) async {
-                      Log.d("点击了喜欢按钮  --id:${item.id}- $collectionValue");
+                      Log.d("点击了喜欢按钮  item:$item --id:${item.id}- $collectionValue");
                       int id = item.id!;
                       return await vm.handlerClickCollection(id, collectionValue);
                     }

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

@@ -565,15 +565,14 @@ class HomeServiceVm extends _$HomeServiceVm {
     liked,
     likesCount,
   }){
-    final cleanServiceId = paidServiceCategory.id!;
-    final cleanServiceTypeStr = paidServiceCategory.name!;
-    Log.d("去详情页面：  paidServiceCategory：$paidServiceCategory $id  $cleanServiceTypeStr");
-    if(cleanServiceTypeStr == servicesConstants.paidServicesType['houseCleaning']!['code'] || cleanServiceTypeStr == servicesConstants.paidServicesType['airConditioner']!['code']){
+    int cleanServiceTypeId = paidServiceCategory.id!;
+    Log.d("去详情页面：  paidServiceCategory：$paidServiceCategory $id  $cleanServiceTypeId");
+    if(cleanServiceTypeId == servicesConstants.paidServicesType['houseCleaning']!['id'] || cleanServiceTypeId == servicesConstants.paidServicesType['airConditioner']!['id']){
       // clean service  跳转到 clean 详情页
-      appRouter.push(ServiceCleanDetailPageRoute(id: id, cleanServiceTypeStr: cleanServiceTypeStr,liked: liked,likesCount: likesCount));
+      appRouter.push(ServiceCleanDetailPageRoute(id: id, cleanServiceTypeId: cleanServiceTypeId,liked: liked,likesCount: likesCount));
     }else {
       // other service  跳转到 other 详情页
-      ToastEngine.show("${cleanServiceTypeStr} 类型的详情暂未开放");
+      ToastEngine.show("${cleanServiceTypeId} 类型的详情暂未开放");
     }
   }
 

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'3354661f7b1d9c59da1d3b8aa2f7e1b10653af17';
+String _$homeServiceVmHash() => r'261671be0c5fd58f062350dd2f7cfabff2066fb6';
 
 /// See also [HomeServiceVm].
 @ProviderFor(HomeServiceVm)

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

@@ -13,7 +13,7 @@ import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
 
 class HomeServiceCard extends StatelessWidget {
-  String? cleanServiceTypeStr;
+  int? cleanServiceTypeId;
   PaidServiceList itemEntity;
   double? cardHeight;
   final Function()? onTap;
@@ -21,7 +21,7 @@ class HomeServiceCard extends StatelessWidget {
 
   HomeServiceCard({
     Key? key,
-    this.cleanServiceTypeStr,
+    this.cleanServiceTypeId,
     required this.itemEntity,
     this.onTap,
     this.onClickColleciotn,

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

@@ -46,7 +46,7 @@ class InProgressPage extends HookConsumerWidget {
     final state = ref.watch(inProgressVmProvider);
     // final appConfigState = ref.watch(appConfigServiceProvider)
 
-    String cleanServiceTypeStr = servicesConstants.paidServicesType['houseCleaning']?['code'];
+    int? cleanServiceTypeId = servicesConstants.paidServicesType['houseCleaning']?['id'];
 
 
 
@@ -92,14 +92,14 @@ class InProgressPage extends HookConsumerWidget {
                 SliverList(
                   delegate: SliverChildBuilderDelegate(
                     (context, index) {
-                      return _buildInProgressItem(context, ref, state.list[index], vm,  cleanServiceTypeStr).onTap(() {
+                      return _buildInProgressItem(context, ref, state.list[index], vm,  cleanServiceTypeId).onTap(() {
                         List<GarageSaleHistoryList> serviceStatusTypeList = state.list as List<GarageSaleHistoryList> ?? [];
                         String serviceStatusCode = serviceStatusTypeList[index].orderStatus??'';
 
                         vm.gotoCleanOrderDetailPage(
                           context,
                           state.list[index].id != null ? int.tryParse(state.list[index].id!) ?? 0 : 0,
-                          cleanServiceTypeStr,
+                          cleanServiceTypeId,
                         );
                       });
                     },
@@ -112,7 +112,7 @@ class InProgressPage extends HookConsumerWidget {
     );
   }
 
-  Widget _buildInProgressItem(BuildContext context, WidgetRef ref, GarageSaleHistoryList item, vm, String cleanServiceTypeStr) {
+  Widget _buildInProgressItem(BuildContext context, WidgetRef ref, GarageSaleHistoryList item, vm, int? cleanServiceTypeId) {
     return Container(
       margin: const EdgeInsets.only(top: 10),
       width: double.infinity,

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

@@ -198,7 +198,7 @@ class InProgressVm extends _$InProgressVm with DioCancelableMixin {
   }
 
   //  去详情页面
-  gotoCleanOrderDetailPage(BuildContext context, int id, String cleanServiceTypeStr) {
-    CleanOrderDetailPage.startInstance(id: id, cleanServiceTypeStr: cleanServiceTypeStr);
+  gotoCleanOrderDetailPage(BuildContext context, int id, int? cleanServiceTypeId) {
+    CleanOrderDetailPage.startInstance(id: id, cleanServiceTypeId: cleanServiceTypeId);
   }
 }

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'b6d243602097ecb400181806d636acb1d6bff151';
+String _$inProgressVmHash() => r'c71f43ae2f28c2f22438e3460c0cd9ba7644b29f';
 
 /// See also [InProgressVm].
 @ProviderFor(InProgressVm)

packages/cpt_services/lib/modules/services/repair/repair_vm.g.dart

@@ -6,7 +6,7 @@ part of 'repair_vm.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$repairVmHash() => r'4ceeef6ea9c2038cda76d13d80eb9adcb1dc55f9';
+String _$repairVmHash() => r'5589c8e2c67975ec064391b830e55158bc8578dd';
 
 /// See also [RepairVm].
 @ProviderFor(RepairVm)

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

@@ -46,8 +46,7 @@ class RepairHistoryPage extends HookConsumerWidget {
     final state = ref.watch(repairHistoryVmProvider);
     // final appConfigState = ref.watch(appConfigServiceProvider)
 
-    String cleanServiceTypeStr = servicesConstants.inquiryServicesType['repairAirConditioner']?['code'];
-    int serviceStatusCode = servicesConstants.servicesInquiryStatus['1']?['code'];
+    int? cleanServiceTypeId = servicesConstants.inquiryServicesType['repairAirConditioner']?['id'];
 
 
     useEffect(() {
@@ -97,8 +96,7 @@ class RepairHistoryPage extends HookConsumerWidget {
                         ref,
                         state.list[index],
                         vm,
-                        cleanServiceTypeStr,
-                        serviceStatusCode,
+                          cleanServiceTypeId
                       ).onTap(() {
                       });
                     },
@@ -111,7 +109,7 @@ class RepairHistoryPage extends HookConsumerWidget {
     );
   }
 
-  Widget _buildRepairHistoryItem(BuildContext context, WidgetRef ref, ServiceInProgressList item, vm, String cleanServiceTypeStr, int serviceStatusCode){
+  Widget _buildRepairHistoryItem(BuildContext context, WidgetRef ref, ServiceInProgressList item, vm, int? cleanServiceTypeId){
     return Container(
       margin: const EdgeInsets.only(top: 10),
       width: double.infinity,

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'4f446658790ff8fe7f495d16f66c7fec0853163b';
+String _$repairHistoryVmHash() => r'4b414192eb139f17619e59488538cc8d57b5dd09';
 
 /// See also [RepairHistoryVm].
 @ProviderFor(RepairHistoryVm)

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

@@ -152,7 +152,7 @@ class RepairHomeServicePage extends HookConsumerWidget {
                 child: RepairHomeServiceCard(
                     key: UniqueKey(),
                     itemEntity: item,
-                    cleanServiceTypeStr: item.category!.type,
+                    cleanServiceTypeId: item.category!.id,
                     onClickColleciotn: (dynamic collectionValue) async {
                       Log.d("点击了喜欢按钮  --id:${item.id}- $collectionValue");
                       int id = item.id!;

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

@@ -34,7 +34,7 @@ class RepairHomeServiceVm extends _$RepairHomeServiceVm {
   int _limit = 10; // 每页数量
   int _count = 0; // 总条数
 
-  // CleanServiceTyp _cleanServiceTypeStr;
+  // CleanServiceTyp _cleanServiceTypeId;
 
   bool _isSingleSelect = true;
   List<Map<String, dynamic>> _currentSelectedCategory = [];
@@ -526,21 +526,21 @@ class RepairHomeServiceVm extends _$RepairHomeServiceVm {
     );
   }
 
-  // 设置当前的 cleanServiceTypeStr
-  // setCurrentCleanServiceType(CleanServiceType cleanServiceTypeStr){
-  //   _cleanServiceTypeStr = cleanServiceTypeStr;
+  // 设置当前的 cleanServiceTypeId
+  // setCurrentCleanServiceType(CleanServiceType cleanServiceTypeId){
+  //   _cleanServiceTypeId = cleanServiceTypeId;
   // }
   // 去详情页面
   void handlerGotoDetail({BuildContext? context, required int id, required RepairServiceListCategory repairServiceListCategory }){
 
-    final cleanServiceTypeStr = repairServiceListCategory.name!;
-    Log.d("去详情页面：  id:$id  repairServiceListCategory:$repairServiceListCategory  cleanServiceTypeStr: $cleanServiceTypeStr");
-    if(cleanServiceTypeStr == servicesConstants.inquiryServicesType['repairAirConditioner']!['code']){
+    final cleanServiceTypeId = repairServiceListCategory.id!;
+    Log.d("去详情页面：  id:$id  repairServiceListCategory:$repairServiceListCategory  cleanServiceTypeId: $cleanServiceTypeId");
+    if(cleanServiceTypeId == servicesConstants.inquiryServicesType['repairAirConditioner']!['id']){
       // clean service  跳转到 clean 详情页
-      appRouter.push(ServiceRepairDetailPageRoute(id: id, cleanServiceTypeStr: cleanServiceTypeStr));
+      appRouter.push(ServiceRepairDetailPageRoute(id: id, cleanServiceTypeId: cleanServiceTypeId));
     }else {
       // other service  跳转到 other 详情页
-      ToastEngine.show("${cleanServiceTypeStr} 类型的详情暂未开放");
+      ToastEngine.show("${cleanServiceTypeId} 类型的详情暂未开放");
     }
 
   }

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'fee96cce9ac5690002bac74f4c7a586123072148';
+    r'be4f6bf0c3fdaacc3fa2d92f8aec358febe78d29';
 
 /// See also [RepairHomeServiceVm].
 @ProviderFor(RepairHomeServiceVm)

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

@@ -12,7 +12,7 @@ import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
 
 class RepairHomeServiceCard extends StatelessWidget {
-  String? cleanServiceTypeStr;
+  int? cleanServiceTypeId;
   RepairServiceList itemEntity;
   double? cardHeight;
   final Function()? onTap;
@@ -20,7 +20,7 @@ class RepairHomeServiceCard extends StatelessWidget {
 
   RepairHomeServiceCard({
     Key? key,
-    this.cleanServiceTypeStr,
+    this.cleanServiceTypeId,
     required this.itemEntity,
     this.onTap,
     this.onClickColleciotn,

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

@@ -49,7 +49,7 @@ class RepairInProgressPage extends HookConsumerWidget {
     final state = ref.watch(repairInProgressVmProvider);
     // final appConfigState = ref.watch(appConfigServiceProvider)
 
-    String cleanServiceTypeStr = servicesConstants.inquiryServicesType['repairAirConditioner']?['code'];
+    int? cleanServiceTypeId = servicesConstants.inquiryServicesType['repairAirConditioner']?['id'];
     int serviceStatusCode = servicesConstants.servicesInquiryStatus['0']?['code'];
 
     useEffect(() {
@@ -99,7 +99,7 @@ class RepairInProgressPage extends HookConsumerWidget {
                               ref,
                               state.list[index],
                               vm,
-                              cleanServiceTypeStr,
+                              cleanServiceTypeId,
                               serviceStatusCode)
                           .onTap(() {
                       });
@@ -115,7 +115,7 @@ class RepairInProgressPage extends HookConsumerWidget {
 
   Widget _buildRepairInProgressItem(BuildContext context, WidgetRef ref, ServiceInProgressList item,
       vm,
-      String cleanServiceTypeStr,
+      int? cleanServiceTypeId,
       int serviceStatusCode) {
     return Container(
       margin: const EdgeInsets.only(top: 10),

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'39270b72bf2746b82c53984616c6f17cee672b75';
+    r'8a71565078489e14431692c3ba3ef4364feeacb8';
 
 /// See also [RepairInProgressVm].
 @ProviderFor(RepairInProgressVm)

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

@@ -35,17 +35,17 @@ import '../../../router/page/services_page_router.dart';
 @RoutePage()
 class ServiceCleanDetailPage extends HookConsumerWidget {
   final int id;
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
   bool liked = false;
   int likesCount = 0;
 
-  ServiceCleanDetailPage({Key? key,@PathParam('id') required this.id, @PathParam('cleanServiceTypeStr') required this.cleanServiceTypeStr, required this.liked, required this.likesCount}) : super(key: key);
+  ServiceCleanDetailPage({Key? key,@PathParam('id') required this.id, @PathParam('cleanServiceTypeId') this.cleanServiceTypeId, required this.liked, required this.likesCount}) : super(key: key);
   // 启动当前页面
-  static void startInstance({BuildContext? context, int? id, String? cleanServiceTypeStr, bool? liked, int? likesCount}) {
+  static void startInstance({BuildContext? context, int? id, int? cleanServiceTypeId, bool? liked, int? likesCount}) {
     if (context != null) {
-      context.router.push(ServiceCleanDetailPageRoute(id: id!, cleanServiceTypeStr: cleanServiceTypeStr!, liked: liked!, likesCount: likesCount = 0));
+      context.router.push(ServiceCleanDetailPageRoute(id: id!, cleanServiceTypeId: cleanServiceTypeId!, liked: liked!, likesCount: likesCount = 0));
     } else {
-      appRouter.push(ServiceCleanDetailPageRoute(id: id!, cleanServiceTypeStr: cleanServiceTypeStr!, liked: liked!, likesCount: likesCount = 0));
+      appRouter.push(ServiceCleanDetailPageRoute(id: id!, cleanServiceTypeId: cleanServiceTypeId!, liked: liked!, likesCount: likesCount = 0));
     }
   }
 
@@ -60,7 +60,7 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
 
 
     useEffect((){
-      vm.setInitPageData(id: id, cleanServiceTypeStr: cleanServiceTypeStr, liked: liked, likesCount: likesCount);
+      vm.setInitPageData(id: id, cleanServiceTypeId: cleanServiceTypeId, liked: liked, likesCount: likesCount);
 
       // 组件挂载时执行 - 执行接口请求
       Future.microtask(() => vm.initPageData());
@@ -341,7 +341,7 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
                   ),
                 ],
               ).onTap((){
-                vm.gotoUserReviewsPage(context, id, cleanServiceTypeStr);
+                vm.gotoUserReviewsPage(context, id, cleanServiceTypeId);
               }),
             ),
             // evaluate list
@@ -422,7 +422,7 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
   }
 
   Widget _buildSelectHouseCleanOrAirConditioner(BuildContext context, WidgetRef ref, PaidServiceDetailEntity detailInfo) {
-    if(cleanServiceTypeStr == servicesConstants.paidServicesType['houseCleaning']!['code']){
+    if(cleanServiceTypeId == servicesConstants.paidServicesType['houseCleaning']!['id']){
       List<PaidServiceDetailProducts>? houseCleanList = detailInfo?.products??[];
       // 室内清洁
       return houseCleanList.isNotEmpty? Column(
@@ -451,12 +451,12 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
               ],
             ),
           ),
-          ChooseHouseCleanContent(id: id, cleanServiceTypeStr: cleanServiceTypeStr, products: houseCleanList),
+          ChooseHouseCleanContent(id: id, cleanServiceTypeId: cleanServiceTypeId, products: houseCleanList),
         ],
       ): SizedBox.shrink();
-    }else if(cleanServiceTypeStr == servicesConstants.paidServicesType['airConditioner']!['code']){
+    }else if(cleanServiceTypeId == servicesConstants.paidServicesType['airConditioner']!['id']){
       // 空调清洁  页面中没有直接展示 选择数量的  直接在弹窗中选择了
-      // return ChooseAirConditionContent(id: id, cleanServiceTypeStr: cleanServiceTypeStr);
+      // return ChooseAirConditionContent(id: id, cleanServiceTypeId: cleanServiceTypeId);
     }
     return SizedBox.shrink();
   }
@@ -574,7 +574,7 @@ class ServiceCleanDetailPage extends HookConsumerWidget {
                 ),
               ),
             ).onTap((){
-              vm.handlerClickBookNow(context, id: id , cleanServiceTypeStr: cleanServiceTypeStr,);
+              vm.handlerClickBookNow(context, id: id , cleanServiceTypeId: cleanServiceTypeId,);
             }),
           ),
         ],

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

@@ -54,7 +54,7 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
   int _count = 0; // 总条数
 
   int? _detailId;
-  String? _cleanServiceTypeStr;
+  int? _cleanServiceTypeId;
   bool? _liked;
   num? _likesCount;
 
@@ -90,10 +90,10 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
     );
   }
 
-  setInitPageData({required int id, required String cleanServiceTypeStr, bool? liked, num? likesCount}){
-    Log.d("service_clean_detail 设置 initpagedata ---  id:$id cleanServiceTypeStr:$cleanServiceTypeStr");
+  setInitPageData({required int id, int? cleanServiceTypeId, bool? liked, num? likesCount}){
+    Log.d("service_clean_detail 设置 initpagedata ---  id:$id cleanServiceTypeId:$cleanServiceTypeId");
     _detailId = id;
-    _cleanServiceTypeStr = cleanServiceTypeStr!;
+    _cleanServiceTypeId = cleanServiceTypeId!;
     _liked = liked;
     _likesCount = likesCount;
   }
@@ -261,10 +261,10 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
   }
 
   // 点击了 Book Now 按钮
-  handlerClickBookNow(BuildContext context, {int? id, String? cleanServiceTypeStr} ){
+  handlerClickBookNow(BuildContext context, {int? id, int? cleanServiceTypeId} ){
     final detailId = id ?? _detailId;
-    final cleanType = cleanServiceTypeStr ?? _cleanServiceTypeStr;   // 0 房屋清洁  1 空调清洁  2 维修
-    if(cleanType == servicesConstants.paidServicesType['houseCleaning']!['code']){
+    final cleanTypeId = cleanServiceTypeId ?? _cleanServiceTypeId;   // 2 房屋清洁  3 空调清洁  5 咨询
+    if(cleanTypeId == servicesConstants.paidServicesType['houseCleaning']!['id']){
       // 房屋清洁
       final chooseHouseCleanContentVm= ref.read(chooseHouseCleanContentVmProvider.notifier);
       if(!chooseHouseCleanContentVm.state.hasCheckdService){
@@ -276,12 +276,12 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
         // 跳转到 订单确认页面
         gotoServiceOrderConfirmPage();
       }
-    }else if(cleanType == servicesConstants.paidServicesType['airConditioner']!['code']){
+    }else if(cleanTypeId == servicesConstants.paidServicesType['airConditioner']!['id']){
       // 空调清洁
       // 弹出选择 空调型号和数量的弹框
       handlerShowChooseAirConditionerDialog(context);
-    }else if(cleanType == servicesConstants.paidServicesType['repaire']!['code']){
-      // 维修
+    }else if(cleanTypeId == servicesConstants.inquiryServicesType['repairAirConditioner']!['id']){
+      // 咨询
     }
   }
 
@@ -401,8 +401,8 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
 
   // 去订单确认页面
   gotoServiceOrderConfirmPage(){
-    // appRouter.push(ServiceOrderConfirmPageRoute(id: _detailId, cleanServiceTypeStr: _cleanServiceTypeStr));
-    ServiceOrderConfirmPage.startInstance(id: _detailId!, cleanServiceTypeStr: _cleanServiceTypeStr!);
+    // appRouter.push(ServiceOrderConfirmPageRoute(id: _detailId, cleanServiceTypeId: _cleanServiceTypeId));
+    ServiceOrderConfirmPage.startInstance(id: _detailId!, cleanServiceTypeId: _cleanServiceTypeId!);
   }
 
   chooseHouseCleanCancelFn(){
@@ -416,8 +416,8 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
     final chooseAirCleanContentVm= ref.watch(chooseAirConditionContentVmProvider.notifier);
     if(chooseAirCleanContentVm?.state.hasCheckdService??false){
       // 跳转到 订单确认页面
-      // appRouter.push(ServiceOrderConfirmPageRoute(id: _detailId, cleanServiceTypeStr: _cleanServiceTypeStr));
-      ServiceOrderConfirmPage.startInstance(id: _detailId!, cleanServiceTypeStr: _cleanServiceTypeStr!);
+      // appRouter.push(ServiceOrderConfirmPageRoute(id: _detailId, cleanServiceTypeId: _cleanServiceTypeId));
+      ServiceOrderConfirmPage.startInstance(id: _detailId!, cleanServiceTypeId: _cleanServiceTypeId!);
       DialogEngine.dismiss(tag: "chooseAirConditionClean");
     }else {
       // 一个数量也没选 则英文提示
@@ -431,24 +431,24 @@ class ServiceCleanDetailVm extends _$ServiceCleanDetailVm {
 
   
   Widget buildChooseHouseCleanTitle(BuildContext context){
-    return ChooseHouseCleanTitle(id: _detailId!, cleanServiceTypeStr: _cleanServiceTypeStr!);
+    return ChooseHouseCleanTitle(id: _detailId!, cleanServiceTypeId: _cleanServiceTypeId!);
   }
 
   Widget buildChooseHouseCleanContent(BuildContext context){
     Log.d("打开弹框 products: ${state.datas!.products!}");
-    return ChooseHouseCleanContent(id: _detailId!, cleanServiceTypeStr: _cleanServiceTypeStr!, products: state.datas!.products!,);
+    return ChooseHouseCleanContent(id: _detailId!, cleanServiceTypeId: _cleanServiceTypeId!, products: state.datas!.products!,);
   }
 
   Widget buildChooseAirConditionTitle(BuildContext context){
-    return ChooseAirConditionTitle(id: _detailId!, cleanServiceTypeStr: _cleanServiceTypeStr!);
+    return ChooseAirConditionTitle(id: _detailId!, cleanServiceTypeId: _cleanServiceTypeId!);
   }
   
   Widget buildChooseAirConditionContent(BuildContext context){
-    return ChooseAirConditionContent(id: _detailId!, cleanServiceTypeStr: _cleanServiceTypeStr!,products: state.datas!.products!);
+    return ChooseAirConditionContent(id: _detailId!, cleanServiceTypeId: _cleanServiceTypeId!,products: state.datas!.products!);
   }
 
   // 去 评价列表页面
-  gotoUserReviewsPage(BuildContext context, int id, String cleanServiceTypeStr){
-    ServiceEvaluateListPage.startInstance(id:id, cleanServiceTypeStr: cleanServiceTypeStr);
+  gotoUserReviewsPage(BuildContext context, int id, int? cleanServiceTypeId){
+    ServiceEvaluateListPage.startInstance(id:id, cleanServiceTypeId: cleanServiceTypeId);
   }
 }

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'4be2e42e6620aeca1428f68309bb928c63cc9911';
+    r'c3365042ca6050a2a72ec6b01e775314abb13377';
 
 /// See also [ServiceCleanDetailVm].
 @ProviderFor(ServiceCleanDetailVm)

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

@@ -32,19 +32,19 @@ import 'service_evaluate_create_vm.dart';
 @RoutePage()
 class ServiceEvaluateCreatePage extends HookConsumerWidget {
   final int id;
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
   const ServiceEvaluateCreatePage({
     Key? key,
     required this.id,
-    required this.cleanServiceTypeStr,
+    this.cleanServiceTypeId,
   }) : super(key: key);
 
   //启动当前页面
-  static void startInstance({BuildContext? context, required int id, required String cleanServiceTypeStr}) {
+  static void startInstance({BuildContext? context, required int id, int? cleanServiceTypeId}) {
     if (context != null) {
-      context.router.push(ServiceEvaluateCreatePageRoute(id: id, cleanServiceTypeStr: cleanServiceTypeStr));
+      context.router.push(ServiceEvaluateCreatePageRoute(id: id, cleanServiceTypeId: cleanServiceTypeId));
     } else {
-      appRouter.push(ServiceEvaluateCreatePageRoute(id:id, cleanServiceTypeStr: cleanServiceTypeStr));
+      appRouter.push(ServiceEvaluateCreatePageRoute(id:id, cleanServiceTypeId: cleanServiceTypeId));
     }
   }
 

packages/cpt_services/lib/modules/services/service_evaluate_create/service_evaluate_create_vm.g.dart

@@ -7,7 +7,7 @@ part of 'service_evaluate_create_vm.dart';
 // **************************************************************************
 
 String _$serviceEvaluateCreateVmHash() =>
-    r'4076871c4476ccd72aa607ef8e83e3925d25a789';
+    r'5495153f05d20dd628410ca9f0e830c784575fd2';
 
 /// See also [ServiceEvaluateCreateVm].
 @ProviderFor(ServiceEvaluateCreateVm)

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

@@ -30,19 +30,19 @@ import '../../../components/status_card_item.dart';
 @RoutePage()
 class ServiceEvaluateListPage extends HookConsumerWidget {
   final int id;
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
   const ServiceEvaluateListPage({
     Key? key,
     required this.id,
-    required this.cleanServiceTypeStr,
+    this.cleanServiceTypeId,
   }) : super(key: key);
 
   //启动当前页面
-  static void startInstance({BuildContext? context, required int id, required String cleanServiceTypeStr}) {
+  static void startInstance({BuildContext? context, required int id, int? cleanServiceTypeId}) {
     if (context != null) {
-      context.router.push( ServiceEvaluateListPageRoute(id:id, cleanServiceTypeStr:cleanServiceTypeStr));
+      context.router.push( ServiceEvaluateListPageRoute(id:id, cleanServiceTypeId:cleanServiceTypeId));
     } else {
-      appRouter.push(ServiceEvaluateListPageRoute(id:id, cleanServiceTypeStr:cleanServiceTypeStr));
+      appRouter.push(ServiceEvaluateListPageRoute(id:id, cleanServiceTypeId:cleanServiceTypeId));
     }
   }
 

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

@@ -43,19 +43,19 @@ import '../../../components/status_card_item.dart';
 @RoutePage()
 class ServiceOrderConfirmPage extends HookConsumerWidget {
   final int id;
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
   const ServiceOrderConfirmPage({
     Key? key,
     required this.id,
-    required this.cleanServiceTypeStr,
+    this.cleanServiceTypeId,
   }) : super(key: key);
 
   //启动当前页面
-  static void startInstance({BuildContext? context, required int id, required String cleanServiceTypeStr}) {
+  static void startInstance({BuildContext? context, required int id, int? cleanServiceTypeId}) {
     if (context != null) {
-      context.router.push(ServiceOrderConfirmPageRoute(id: id, cleanServiceTypeStr: cleanServiceTypeStr));
+      context.router.push(ServiceOrderConfirmPageRoute(id: id, cleanServiceTypeId: cleanServiceTypeId!));
     } else {
-      appRouter.push(ServiceOrderConfirmPageRoute(id:id, cleanServiceTypeStr: cleanServiceTypeStr));
+      appRouter.push(ServiceOrderConfirmPageRoute(id:id, cleanServiceTypeId: cleanServiceTypeId!));
     }
   }
 
@@ -67,7 +67,7 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
     // final appConfigState = ref.watch(appConfigServiceProvider)
 
     useEffect(() {
-      vm.setInitPageData(id: id, cleanServiceTypeStr: cleanServiceTypeStr);
+      vm.setInitPageData(id: id, cleanServiceTypeId: cleanServiceTypeId);
       // 组件挂载时执行 - 执行接口请求
       Future.microtask(() => vm.initPageData(context));
       return () {
@@ -104,7 +104,7 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
                     // 底部联系信息
                     Visibility(
                       visible: state.loadingState == LoadState.State_Success,
-                      child: state.datas !=null ? _buildBottomSection(state, vm,ref, context, id, cleanServiceTypeStr): Container(),
+                      child: state.datas !=null ? _buildBottomSection(state, vm,ref, context, id, cleanServiceTypeId): Container(),
                     )
 
                   ],
@@ -332,10 +332,10 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
             ),
           ],
         ),
-        if (cleanServiceTypeStr == servicesConstants.paidServicesType['houseCleaning']!['code'])
+        if (cleanServiceTypeId == servicesConstants.paidServicesType['houseCleaning']!['id'])
         // 室内清理
           _buildHouseCleanContent(state, vm, context, ref, houseCleanCheckedServiceList)
-        else if (cleanServiceTypeStr == servicesConstants.paidServicesType['airConditioner']!['code'])
+        else if (cleanServiceTypeId == servicesConstants.paidServicesType['airConditioner']!['id'])
         // 空调清理
           _buildAirCleanCleanContent(state, vm, context, ref, airCleancheckedServiceList)
         else
@@ -731,7 +731,7 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
   }
 
   // 底部操作区域
-  Widget _buildBottomSection(ServiceOrderConfirmState state, ServiceOrderConfirmVm vm,WidgetRef ref, BuildContext context, int id, String cleanServiceTypeStr) {
+  Widget _buildBottomSection(ServiceOrderConfirmState state, ServiceOrderConfirmVm vm,WidgetRef ref, BuildContext context, int id, int? cleanServiceTypeId) {
 
     double totalPrice = ref.watch(serviceOrderConfirmVmProvider.select((state) => ((state.cleanServiceToTalCost??0.0) + (state.extraCost??0.0)??0.0)));
 
@@ -786,7 +786,7 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
                 ),
               ),
             ).onTap((){
-              vm.handlerClickPayNow(context, id: id , cleanServiceTypeStr: cleanServiceTypeStr);
+              vm.handlerClickPayNow(context, id: id , cleanServiceTypeId: cleanServiceTypeId);
             }),
           ),
         ],

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

@@ -52,7 +52,7 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
   int _count = 0; // 总条数
 
   int? _id;
-  String? _cleanServiceTypeStr;
+  int? _cleanServiceTypeId;
 
   // Refresh 控制器
   final EasyRefreshController refreshController = EasyRefreshController(
@@ -90,9 +90,9 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
   }
 
 
-  setInitPageData({required int id, required String cleanServiceTypeStr}){
+  setInitPageData({required int id, int? cleanServiceTypeId}){
     _id = id;
-    _cleanServiceTypeStr = cleanServiceTypeStr;
+    _cleanServiceTypeId = cleanServiceTypeId;
   }
   // 初始化页面数据
   initPageData(BuildContext context) {
@@ -262,7 +262,7 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
   chooseVisitTimeConfirmFn(){
     Log.d("预约时间 点击了确定");
     // 跳转到 订单确认页面
-    // appRouter.push(ServiceOrderConfirmPageRoute(id: _id, cleanServiceTypeStr: _cleanServiceTypeStr));
+    // appRouter.push(ServiceOrderConfirmPageRoute(id: _id, cleanServiceTypeId: _cleanServiceTypeId));
   }
 
   chooseVisitTimeCancelFn(){
@@ -274,15 +274,15 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
   }
 
   Widget buildChooseVisitTimeTitle(BuildContext context){
-    return ChooseVisitTimeTitle(id: 0, cleanServiceTypeStr: _cleanServiceTypeStr!);
+    return ChooseVisitTimeTitle(id: 0, cleanServiceTypeId: _cleanServiceTypeId!);
   }
 
   Widget buildChooseVisitTimeContent(BuildContext context){
-    return ChooseVisitTimeContent(id: _id!, cleanServiceTypeStr: _cleanServiceTypeStr!,);
+    return ChooseVisitTimeContent(id: _id!, cleanServiceTypeId: _cleanServiceTypeId!,);
   }
 
   Widget buildChooseVisitTimeBottomFooter(BuildContext context){
-    return ChooseVisitTimeBottomFooter(id: _id!, cleanServiceTypeStr: _cleanServiceTypeStr!,);
+    return ChooseVisitTimeBottomFooter(id: _id!, cleanServiceTypeId: _cleanServiceTypeId!,);
   }
 
   // 更新visitTime
@@ -303,9 +303,9 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
     final chooseAirCleanServiceDetailVm = ref.watch(chooseAirConditionContentVmProvider.notifier);
     List<AirConditionContentItem> airCleancheckedServiceList = [];
 
-    if (_cleanServiceTypeStr == servicesConstants.paidServicesType['houseCleaning']!['code']) {
+    if (_cleanServiceTypeId == servicesConstants.paidServicesType['houseCleaning']!['id']) {
       houseCleanCheckedServiceList = chooseHouseCleanServiceDetailVm.state.checkedServiceList ?? [];
-    } else if (_cleanServiceTypeStr == servicesConstants.paidServicesType['airConditioner']!['code']) {
+    } else if (_cleanServiceTypeId == servicesConstants.paidServicesType['airConditioner']!['id']) {
       airCleancheckedServiceList = chooseAirCleanServiceDetailVm.state.checkedServiceList ?? [];
     }
 
@@ -335,7 +335,7 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
 
     Log.d("houseCleanCheckedServiceList  $houseCleanCheckedServiceList");
     Log.d("airCleancheckedServiceList  $airCleancheckedServiceList");
-    if(_cleanServiceTypeStr == servicesConstants.paidServicesType['houseCleaning']!['code']){
+    if(_cleanServiceTypeId == servicesConstants.paidServicesType['houseCleaning']!['id']){
       if(houseCleanCheckedServiceList != null && houseCleanCheckedServiceList.length > 0){
         resultParams['products'] = []; // 初始化 products 为一个 List
         houseCleanCheckedServiceList.asMap().forEach((idx, element) {
@@ -345,7 +345,7 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
           });
         });
       }
-    }else if(_cleanServiceTypeStr == servicesConstants.paidServicesType['airConditioner']!['code']){
+    }else if(_cleanServiceTypeId == servicesConstants.paidServicesType['airConditioner']!['id']){
       if(airCleancheckedServiceList != null && airCleancheckedServiceList.length > 0){
         resultParams['products'] = []; // 初始化 products 为一个 List
         airCleancheckedServiceList.asMap().forEach((idx, element) {
@@ -378,10 +378,10 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
     final chooseAirCleanContentVm = ref.read(chooseAirConditionContentVmProvider.notifier);
     double airCleanTotalPrice = 0.0;
 
-    if (_cleanServiceTypeStr == servicesConstants.paidServicesType['houseCleaning']!['code']) {
+    if (_cleanServiceTypeId == servicesConstants.paidServicesType['houseCleaning']!['id']) {
       houseCleanTotalPrice = (chooseHouseCleanCotentVm?.state.totalPrice ?? 0.0).toDouble();
       cleanServiceToTalPrice = houseCleanTotalPrice;
-    } else if (_cleanServiceTypeStr == servicesConstants.paidServicesType['airConditioner']!['code']) {
+    } else if (_cleanServiceTypeId == servicesConstants.paidServicesType['airConditioner']!['id']) {
       airCleanTotalPrice = (chooseAirCleanContentVm?.state.totalPrice ?? 0.0).toDouble();
       cleanServiceToTalPrice = airCleanTotalPrice;
     }
@@ -399,7 +399,7 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
   }
 
   // 点击去支付按钮
-  handlerClickPayNow(BuildContext context, {int? id, String? cleanServiceTypeStr}) async{
+  handlerClickPayNow(BuildContext context, {int? id, int? cleanServiceTypeId}) async{
     // ToastEngine.show("Pay Now");
     if(state.visitTime == null || state.visitTime!.isEmpty){
       // 预约时间没有
@@ -451,7 +451,7 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
           // 成功后 去支付成功页面
           // ServicePaySuccessPage.startInstance();
           context.appRouter.pushAndPopUntil(
-              ServicePaySuccessPageRoute(id: orderId_int, cleanServiceTypeStr: _cleanServiceTypeStr!),
+              ServicePaySuccessPageRoute(id: orderId_int),
               predicate: (Route<dynamic> route) {       // 根据具体条件返回 true 或 false
             return route.settings.name != 'ServiceOrderConfirmPageRoute';
           });
@@ -459,7 +459,7 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
         fcallback: (String? orderId, String? orderDetailId){
           // ToastEngine.show("Pay Failed");
           int? orderDetailId_int;
-          String cleanServiceTypeStr = _cleanServiceTypeStr!;
+          int? cleanServiceTypeId = _cleanServiceTypeId!;
           // 待支付状态
           if(orderDetailId != null){
             orderDetailId_int = int.parse(orderDetailId!);
@@ -473,7 +473,7 @@ class ServiceOrderConfirmVm extends _$ServiceOrderConfirmVm {
           context.appRouter.pushAndPopUntil(
               CleanOrderDetailPageRoute(
                 id: orderDetailId_int,
-                cleanServiceTypeStr: cleanServiceTypeStr!,
+                cleanServiceTypeId: cleanServiceTypeId!,
               ),
               predicate: (Route<dynamic> route) {       // 根据具体条件返回 true 或 false
                 // Log.d("888 ${route.settings}");

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'4a9e3507833437d4a27db3db0cae2f2ee71c6e3f';
+    r'122884b981ca5038520b3c6356021d075dd23909';
 
 /// See also [ServiceOrderConfirmVm].
 @ProviderFor(ServiceOrderConfirmVm)

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

@@ -30,20 +30,18 @@ import '../../../components/status_card_item.dart';
 @RoutePage()
 class ServicePaySuccessPage extends HookConsumerWidget {
   final int id; // 订单id
-  final String cleanServiceTypeStr; // 订单类型
   const ServicePaySuccessPage({
     Key? key,
     @PathParam('id') required this.id,
-    @PathParam('cleanServiceTypeStr') required this.cleanServiceTypeStr,
   }) : super(key: key);
 
 
   //启动当前页面
-  static void startInstance({BuildContext? context, required int id, required String cleanServiceTypeStr }) {
+  static void startInstance({BuildContext? context, required int id,  }) {
     if (context != null) {
-      context.router.push(ServicePaySuccessPageRoute(id: id, cleanServiceTypeStr: cleanServiceTypeStr,));
+      context.router.push(ServicePaySuccessPageRoute(id: id, ));
     } else {
-      appRouter.push(ServicePaySuccessPageRoute(id: id, cleanServiceTypeStr: cleanServiceTypeStr,));
+      appRouter.push(ServicePaySuccessPageRoute(id: id,));
     }
   }
 
@@ -56,7 +54,7 @@ class ServicePaySuccessPage extends HookConsumerWidget {
 
 
     useEffect(() {
-      vm.setInitPageData(id: id, cleanServiceTypeStr: cleanServiceTypeStr);
+      vm.setInitPageData(id: id,);
       // 组件挂载时执行 - 执行接口请求
       Future.microtask(() => vm.fetchOrderDetailData(id));
       return () {
@@ -331,7 +329,7 @@ class ServicePaySuccessPage extends HookConsumerWidget {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         MyTextView(
-                          '$cleanServiceTypeStr',
+                          _getServiceName(state),
                           fontSize: 14,
                           textColor: context.appColors.textBlack,
                           isFontRegular: true,
@@ -494,4 +492,8 @@ class ServicePaySuccessPage extends HookConsumerWidget {
       ),
     );
   }
+
+  String _getServiceName(ServicePaySuccessState state){
+    return state.datas?.orderService?.name??'-';
+  }
 }

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

@@ -28,7 +28,6 @@ class ServicePaySuccessVm extends _$ServicePaySuccessVm {
 
 
   int? _id;
-  String? _cleanServiceTypeStr;
 
   // Refresh 控制器
   final EasyRefreshController refreshController = EasyRefreshController(
@@ -62,9 +61,8 @@ class ServicePaySuccessVm extends _$ServicePaySuccessVm {
     );
   }
 
-  setInitPageData({required int id, required String cleanServiceTypeStr}){
+  setInitPageData({required int id,}){
     _id = id;
-    _cleanServiceTypeStr = cleanServiceTypeStr;
   }
 
   // 初始化页面数据

packages/cpt_services/lib/modules/services/service_pay_success/service_pay_success_vm.g.dart

@@ -7,7 +7,7 @@ part of 'service_pay_success_vm.dart';
 // **************************************************************************
 
 String _$servicePaySuccessVmHash() =>
-    r'b8bb7c85c2289e22c0962e029ac566c6db7573d7';
+    r'1353c6f41c31120f25b092389ff9d6870ecaeb70';
 
 /// See also [ServicePaySuccessVm].
 @ProviderFor(ServicePaySuccessVm)

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

@@ -35,22 +35,22 @@ import '../../../router/page/services_page_router.dart';
 @RoutePage()
 class ServiceRepairDetailPage extends HookConsumerWidget {
   final int id;
-  final String? cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
 
   const ServiceRepairDetailPage(
       {Key? key,
       @PathParam('id') required this.id,
-      @PathParam('cleanServiceTypeStr') required this.cleanServiceTypeStr})
+      @PathParam('cleanServiceTypeId') this.cleanServiceTypeId})
       : super(key: key);
   // 启动当前页面
   static void startInstance(
-      {BuildContext? context, int? id, String? cleanServiceTypeStr}) {
+      {BuildContext? context, int? id, int? cleanServiceTypeId}) {
     if (context != null) {
       context.router.push(ServiceRepairDetailPageRoute(
-          id: id!, cleanServiceTypeStr: cleanServiceTypeStr!));
+          id: id!, cleanServiceTypeId: cleanServiceTypeId!));
     } else {
       appRouter.push(ServiceRepairDetailPageRoute(
-          id: id!, cleanServiceTypeStr: cleanServiceTypeStr!));
+          id: id!, cleanServiceTypeId: cleanServiceTypeId!));
     }
   }
 
@@ -70,7 +70,7 @@ class ServiceRepairDetailPage extends HookConsumerWidget {
     useEffect(() {
       vm.setInitPageData(
         id: id,
-        cleanServiceTypeStr: cleanServiceTypeStr,
+        cleanServiceTypeId: cleanServiceTypeId,
       );
       // 组件挂载时执行 - 执行接口请求
       Future.microtask(() => vm.initPageData());

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

@@ -35,7 +35,7 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
   late ServicesRespository serviceRespositoryInstance;
 
   late int _detailId;
-  late String _cleanServiceTypeStr;
+  late int _cleanServiceTypeId;
 
   bool _needShowPlaceholder = false; //是否展示LoadingView
   int _page = 1; // 当前页
@@ -113,9 +113,9 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
     getDetailData();
   }
 
-  setInitPageData({required int id, required String? cleanServiceTypeStr}) {
+  setInitPageData({required int id, int? cleanServiceTypeId}) {
     _detailId = id;
-    _cleanServiceTypeStr = cleanServiceTypeStr?? '';
+    _cleanServiceTypeId = cleanServiceTypeId!;
   }
 
   Future getDetailData<T>() async {
@@ -177,9 +177,9 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
   Future<bool?> handlerClickCollection(
       BuildContext? context, int id, bool isCollection) async {
     // var vm;
-    // if(_cleanServiceTypeStr == "forSale"){
+    // if(_cleanServiceTypeId == "forSale"){
     //   // vm = ref.read(forsaleVmProvider.notifier);
-    // }else if(_cleanServiceTypeStr == "forRent"){
+    // }else if(_cleanServiceTypeId == "forRent"){
     //   vm = ref.read(forrentVmProvider.notifier);
     // }
     // try {

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'51c272e362f9726c6262e3948acae7d0e0773b95';
+    r'f9a72ff74d6c8a64737491e6a04828b2593d6587';
 
 /// See also [ServiceRepairDetailVm].
 @ProviderFor(ServiceRepairDetailVm)

packages/cpt_services/lib/modules/services/services_main_vm.g.dart

@@ -6,7 +6,7 @@ part of 'services_main_vm.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$serviceMainVmHash() => r'c23e9cdb4f2f2b504eb42420d8863f94ce105105';
+String _$serviceMainVmHash() => r'4f85d2227419da98a3873ec4d15683ce70fd460b';
 
 /// See also [ServiceMainVm].
 @ProviderFor(ServiceMainVm)

packages/cpt_services/lib/modules/services/services_vm.g.dart

@@ -6,7 +6,7 @@ part of 'services_vm.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$servicesVmHash() => r'960eacf01f767979f64ce3c1e026549f5cfda0f4';
+String _$servicesVmHash() => r'815eb1e436e2b0bdfd0410125d12d3726968e4b4';
 
 /// See also [ServicesVm].
 @ProviderFor(ServicesVm)

packages/cpt_services/lib/router/page/services_page_router.gr.dart

@@ -26,14 +26,14 @@ abstract class _$ServicesPageRouter extends RootStackRouter {
       final args = routeData.argsAs<CleanOrderDetailPageRouteArgs>(
           orElse: () => CleanOrderDetailPageRouteArgs(
                 id: pathParams.getInt('id'),
-                cleanServiceTypeStr: pathParams.getString('cleanServiceTypeStr'),
+                cleanServiceTypeId: pathParams.optInt('cleanServiceTypeId'),
               ));
       return AutoRoutePage<dynamic>(
         routeData: routeData,
         child: CleanOrderDetailPage(
           key: args.key,
           id: args.id,
-          cleanServiceTypeStr: args.cleanServiceTypeStr,
+          cleanServiceTypeId: args.cleanServiceTypeId,
         ),
       );
     },
@@ -96,7 +96,7 @@ abstract class _$ServicesPageRouter extends RootStackRouter {
         child: ServiceCleanDetailPage(
           key: args.key,
           id: args.id,
-          cleanServiceTypeStr: args.cleanServiceTypeStr,
+          cleanServiceTypeId: args.cleanServiceTypeId,
           liked: args.liked,
           likesCount: args.likesCount,
         ),
@@ -109,7 +109,7 @@ abstract class _$ServicesPageRouter extends RootStackRouter {
         child: ServiceEvaluateCreatePage(
           key: args.key,
           id: args.id,
-          cleanServiceTypeStr: args.cleanServiceTypeStr,
+          cleanServiceTypeId: args.cleanServiceTypeId,
         ),
       );
     },
@@ -120,7 +120,7 @@ abstract class _$ServicesPageRouter extends RootStackRouter {
         child: ServiceEvaluateListPage(
           key: args.key,
           id: args.id,
-          cleanServiceTypeStr: args.cleanServiceTypeStr,
+          cleanServiceTypeId: args.cleanServiceTypeId,
         ),
       );
     },
@@ -131,23 +131,20 @@ abstract class _$ServicesPageRouter extends RootStackRouter {
         child: ServiceOrderConfirmPage(
           key: args.key,
           id: args.id,
-          cleanServiceTypeStr: args.cleanServiceTypeStr,
+          cleanServiceTypeId: args.cleanServiceTypeId,
         ),
       );
     },
     ServicePaySuccessPageRoute.name: (routeData) {
       final pathParams = routeData.inheritedPathParams;
       final args = routeData.argsAs<ServicePaySuccessPageRouteArgs>(
-          orElse: () => ServicePaySuccessPageRouteArgs(
-                id: pathParams.getInt('id'),
-                cleanServiceTypeStr: pathParams.getString('cleanServiceTypeStr'),
-              ));
+          orElse: () =>
+              ServicePaySuccessPageRouteArgs(id: pathParams.getInt('id')));
       return AutoRoutePage<dynamic>(
         routeData: routeData,
         child: ServicePaySuccessPage(
           key: args.key,
           id: args.id,
-          cleanServiceTypeStr: args.cleanServiceTypeStr,
         ),
       );
     },
@@ -156,14 +153,14 @@ abstract class _$ServicesPageRouter extends RootStackRouter {
       final args = routeData.argsAs<ServiceRepairDetailPageRouteArgs>(
           orElse: () => ServiceRepairDetailPageRouteArgs(
                 id: pathParams.getInt('id'),
-                cleanServiceTypeStr: pathParams.optString('cleanServiceTypeStr'),
+                cleanServiceTypeId: pathParams.optInt('cleanServiceTypeId'),
               ));
       return AutoRoutePage<dynamic>(
         routeData: routeData,
         child: ServiceRepairDetailPage(
           key: args.key,
           id: args.id,
-          cleanServiceTypeStr: args.cleanServiceTypeStr,
+          cleanServiceTypeId: args.cleanServiceTypeId,
         ),
       );
     },
@@ -209,18 +206,18 @@ class CleanOrderDetailPageRoute
   CleanOrderDetailPageRoute({
     Key? key,
     required int id,
-    required String cleanServiceTypeStr,
+    int? cleanServiceTypeId,
     List<PageRouteInfo>? children,
   }) : super(
           CleanOrderDetailPageRoute.name,
           args: CleanOrderDetailPageRouteArgs(
             key: key,
             id: id,
-            cleanServiceTypeStr: cleanServiceTypeStr,
+            cleanServiceTypeId: cleanServiceTypeId,
           ),
           rawPathParams: {
             'id': id,
-            'cleanServiceTypeStr': cleanServiceTypeStr,
+            'cleanServiceTypeId': cleanServiceTypeId,
           },
           initialChildren: children,
         );
@@ -235,18 +232,18 @@ class CleanOrderDetailPageRouteArgs {
   const CleanOrderDetailPageRouteArgs({
     this.key,
     required this.id,
-    required this.cleanServiceTypeStr,
+    this.cleanServiceTypeId,
   });
 
   final Key? key;
 
   final int id;
 
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
 
   @override
   String toString() {
-    return 'CleanOrderDetailPageRouteArgs{key: $key, id: $id, cleanServiceTypeStr: $cleanServiceTypeStr}';
+    return 'CleanOrderDetailPageRouteArgs{key: $key, id: $id, cleanServiceTypeId: $cleanServiceTypeId}';
   }
 }
 
@@ -393,7 +390,7 @@ class ServiceCleanDetailPageRoute
   ServiceCleanDetailPageRoute({
     Key? key,
     required int id,
-    required String cleanServiceTypeStr,
+    int? cleanServiceTypeId,
     required bool liked,
     required int likesCount,
     List<PageRouteInfo>? children,
@@ -402,13 +399,13 @@ class ServiceCleanDetailPageRoute
           args: ServiceCleanDetailPageRouteArgs(
             key: key,
             id: id,
-            cleanServiceTypeStr: cleanServiceTypeStr,
+            cleanServiceTypeId: cleanServiceTypeId,
             liked: liked,
             likesCount: likesCount,
           ),
           rawPathParams: {
             'id': id,
-            'cleanServiceTypeStr': cleanServiceTypeStr,
+            'cleanServiceTypeId': cleanServiceTypeId,
           },
           initialChildren: children,
         );
@@ -423,7 +420,7 @@ class ServiceCleanDetailPageRouteArgs {
   const ServiceCleanDetailPageRouteArgs({
     this.key,
     required this.id,
-    required this.cleanServiceTypeStr,
+    this.cleanServiceTypeId,
     required this.liked,
     required this.likesCount,
   });
@@ -432,7 +429,7 @@ class ServiceCleanDetailPageRouteArgs {
 
   final int id;
 
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
 
   final bool liked;
 
@@ -440,7 +437,7 @@ class ServiceCleanDetailPageRouteArgs {
 
   @override
   String toString() {
-    return 'ServiceCleanDetailPageRouteArgs{key: $key, id: $id, cleanServiceTypeStr: $cleanServiceTypeStr, liked: $liked, likesCount: $likesCount}';
+    return 'ServiceCleanDetailPageRouteArgs{key: $key, id: $id, cleanServiceTypeId: $cleanServiceTypeId, liked: $liked, likesCount: $likesCount}';
   }
 }
 
@@ -451,14 +448,14 @@ class ServiceEvaluateCreatePageRoute
   ServiceEvaluateCreatePageRoute({
     Key? key,
     required int id,
-    required String cleanServiceTypeStr,
+    int? cleanServiceTypeId,
     List<PageRouteInfo>? children,
   }) : super(
           ServiceEvaluateCreatePageRoute.name,
           args: ServiceEvaluateCreatePageRouteArgs(
             key: key,
             id: id,
-            cleanServiceTypeStr: cleanServiceTypeStr,
+            cleanServiceTypeId: cleanServiceTypeId,
           ),
           initialChildren: children,
         );
@@ -473,18 +470,18 @@ class ServiceEvaluateCreatePageRouteArgs {
   const ServiceEvaluateCreatePageRouteArgs({
     this.key,
     required this.id,
-    required this.cleanServiceTypeStr,
+    this.cleanServiceTypeId,
   });
 
   final Key? key;
 
   final int id;
 
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
 
   @override
   String toString() {
-    return 'ServiceEvaluateCreatePageRouteArgs{key: $key, id: $id, cleanServiceTypeStr: $cleanServiceTypeStr}';
+    return 'ServiceEvaluateCreatePageRouteArgs{key: $key, id: $id, cleanServiceTypeId: $cleanServiceTypeId}';
   }
 }
 
@@ -495,14 +492,14 @@ class ServiceEvaluateListPageRoute
   ServiceEvaluateListPageRoute({
     Key? key,
     required int id,
-    required String cleanServiceTypeStr,
+    int? cleanServiceTypeId,
     List<PageRouteInfo>? children,
   }) : super(
           ServiceEvaluateListPageRoute.name,
           args: ServiceEvaluateListPageRouteArgs(
             key: key,
             id: id,
-            cleanServiceTypeStr: cleanServiceTypeStr,
+            cleanServiceTypeId: cleanServiceTypeId,
           ),
           initialChildren: children,
         );
@@ -517,18 +514,18 @@ class ServiceEvaluateListPageRouteArgs {
   const ServiceEvaluateListPageRouteArgs({
     this.key,
     required this.id,
-    required this.cleanServiceTypeStr,
+    this.cleanServiceTypeId,
   });
 
   final Key? key;
 
   final int id;
 
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
 
   @override
   String toString() {
-    return 'ServiceEvaluateListPageRouteArgs{key: $key, id: $id, cleanServiceTypeStr: $cleanServiceTypeStr}';
+    return 'ServiceEvaluateListPageRouteArgs{key: $key, id: $id, cleanServiceTypeId: $cleanServiceTypeId}';
   }
 }
 
@@ -539,14 +536,14 @@ class ServiceOrderConfirmPageRoute
   ServiceOrderConfirmPageRoute({
     Key? key,
     required int id,
-    required String cleanServiceTypeStr,
+    int? cleanServiceTypeId,
     List<PageRouteInfo>? children,
   }) : super(
           ServiceOrderConfirmPageRoute.name,
           args: ServiceOrderConfirmPageRouteArgs(
             key: key,
             id: id,
-            cleanServiceTypeStr: cleanServiceTypeStr,
+            cleanServiceTypeId: cleanServiceTypeId,
           ),
           initialChildren: children,
         );
@@ -561,18 +558,18 @@ class ServiceOrderConfirmPageRouteArgs {
   const ServiceOrderConfirmPageRouteArgs({
     this.key,
     required this.id,
-    required this.cleanServiceTypeStr,
+    this.cleanServiceTypeId,
   });
 
   final Key? key;
 
   final int id;
 
-  final String cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
 
   @override
   String toString() {
-    return 'ServiceOrderConfirmPageRouteArgs{key: $key, id: $id, cleanServiceTypeStr: $cleanServiceTypeStr}';
+    return 'ServiceOrderConfirmPageRouteArgs{key: $key, id: $id, cleanServiceTypeId: $cleanServiceTypeId}';
   }
 }
 
@@ -583,19 +580,14 @@ class ServicePaySuccessPageRoute
   ServicePaySuccessPageRoute({
     Key? key,
     required int id,
-    required String cleanServiceTypeStr,
     List<PageRouteInfo>? children,
   }) : super(
           ServicePaySuccessPageRoute.name,
           args: ServicePaySuccessPageRouteArgs(
             key: key,
             id: id,
-            cleanServiceTypeStr: cleanServiceTypeStr,
           ),
-          rawPathParams: {
-            'id': id,
-            'cleanServiceTypeStr': cleanServiceTypeStr,
-          },
+          rawPathParams: {'id': id},
           initialChildren: children,
         );
 
@@ -609,18 +601,15 @@ class ServicePaySuccessPageRouteArgs {
   const ServicePaySuccessPageRouteArgs({
     this.key,
     required this.id,
-    required this.cleanServiceTypeStr,
   });
 
   final Key? key;
 
   final int id;
 
-  final String cleanServiceTypeStr;
-
   @override
   String toString() {
-    return 'ServicePaySuccessPageRouteArgs{key: $key, id: $id, cleanServiceTypeStr: $cleanServiceTypeStr}';
+    return 'ServicePaySuccessPageRouteArgs{key: $key, id: $id}';
   }
 }
 
@@ -631,18 +620,18 @@ class ServiceRepairDetailPageRoute
   ServiceRepairDetailPageRoute({
     Key? key,
     required int id,
-    required String? cleanServiceTypeStr,
+    int? cleanServiceTypeId,
     List<PageRouteInfo>? children,
   }) : super(
           ServiceRepairDetailPageRoute.name,
           args: ServiceRepairDetailPageRouteArgs(
             key: key,
             id: id,
-            cleanServiceTypeStr: cleanServiceTypeStr,
+            cleanServiceTypeId: cleanServiceTypeId,
           ),
           rawPathParams: {
             'id': id,
-            'cleanServiceTypeStr': cleanServiceTypeStr,
+            'cleanServiceTypeId': cleanServiceTypeId,
           },
           initialChildren: children,
         );
@@ -657,18 +646,18 @@ class ServiceRepairDetailPageRouteArgs {
   const ServiceRepairDetailPageRouteArgs({
     this.key,
     required this.id,
-    required this.cleanServiceTypeStr,
+    this.cleanServiceTypeId,
   });
 
   final Key? key;
 
   final int id;
 
-  final String? cleanServiceTypeStr;
+  final int? cleanServiceTypeId;
 
   @override
   String toString() {
-    return 'ServiceRepairDetailPageRouteArgs{key: $key, id: $id, cleanServiceTypeStr: $cleanServiceTypeStr}';
+    return 'ServiceRepairDetailPageRouteArgs{key: $key, id: $id, cleanServiceTypeId: $cleanServiceTypeId}';
   }
 }