gaolong_dev update

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

@@ -74,10 +74,10 @@ class CommunityVm extends _$CommunityVm {
     // Log.d("s   $newsFeedTabsList");
     COMMUNITY_TABS_LIST.asMap().forEach((index, value) {
       _queryParams[index] = {
-        'keyword': null,
-        'is_liked': null,
-        'category_id': null,
-        'category_name': null,
+        'keyword': "",
+        'is_liked': "",
+        'category_id': "",
+        'category_name': "",
         'page_view_idx': index,
         'page_view_name': value,
       };
@@ -305,6 +305,10 @@ class CommunityVm extends _$CommunityVm {
             if(_isSingleSelect){
               if(_currentSelectedGarageCategory.length > 0){
                 categoryId = _currentSelectedGarageCategory[0]['id'];
+                _queryParams?[state.currentPageViewIdx]?['categoryId'] = categoryId??"";
+              }else {
+                // 没有选
+                _queryParams?[state.currentPageViewIdx]?['categoryId'] = "";
               }
             }
 

packages/cpt_services/lib/constants_services.dart

@@ -66,11 +66,11 @@ class servicesConstants {
        actionBtn['3'],
      ],
      '2': [
-       actionBtn['4'],
+       actionBtn['1'],
        actionBtn['5'],
      ],
      '3': [
-       actionBtn['4'],
+       // actionBtn['4'],
      ]
    };
 

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

@@ -61,7 +61,7 @@ class CleanOrderCancelSuccessPage extends HookConsumerWidget {
                   isFontRegular: true,
                   boxWidth: 270,
                   textAlign: TextAlign.center,
-                  textColor: ColorUtils.string2Color('#333333'),
+                  textColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#333333'), darkColor: Colors.white),
                   marginTop: 17,
                   marginBottom: 50,
                 ),
@@ -74,7 +74,7 @@ class CleanOrderCancelSuccessPage extends HookConsumerWidget {
                   fontSize: 15,
                   fontWeight: FontWeight.w500,
                   textColor: context.appColors.textWhite,
-                  backgroundColor: context.appColors.textPrimary,
+                  backgroundColor: DarkThemeUtil.multiColors(context, context.appColors.textPrimary, darkColor: AppColorsTheme.color666666),
                   minHeight: 45,
                   minWidth: 310,
                 )

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

@@ -17,6 +17,7 @@ import 'package:widgets/ext/ex_widget.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';
 
 class CancelOrderDialogContent extends HookConsumerWidget {
 
@@ -71,7 +72,7 @@ class CancelOrderDialogContent extends HookConsumerWidget {
     final noteCount = useState(0);
     return Stack(children: [
       Container(
-        color: ColorUtils.string2Color("#F2F3F6"),
+        color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"), darkColor: Colors.white12),
         margin: const EdgeInsets.only(top: 15, bottom: 28.5),
         padding: const EdgeInsets.only(left: 10, right: 10, top: 10, bottom: 10),
         child: TextField(

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

@@ -127,7 +127,7 @@ class CleanOrderDetailPage extends HookConsumerWidget {
             color: context.appColors.whiteBG,
             width: double.infinity,
             margin: const EdgeInsets.only(left: 0, right: 0, top: 5, bottom: 0),
-            padding: const EdgeInsets.only(left: 10, right: 10, top: 18.5, bottom: 0),
+            padding: const EdgeInsets.only(left: 10, right: 10, top: 18.5, bottom: 18.5),
             child: _buildOrderScore(state, vm, context),
           ),
           // profile信息
@@ -135,7 +135,7 @@ class CleanOrderDetailPage extends HookConsumerWidget {
             color: context.appColors.whiteBG,
             width: double.infinity,
             margin: const EdgeInsets.only(left: 0, right: 0, top: 5, bottom: 0),
-            padding: const EdgeInsets.only(left: 10, right: 10, top: 18.5, bottom: 0),
+            padding: const EdgeInsets.only(left: 10, right: 10, top: 18.5, bottom: 18.5),
             child: _buildOrderProfile(state, vm, context),
           ),
           // 订单 服务项目
@@ -258,7 +258,7 @@ class CleanOrderDetailPage extends HookConsumerWidget {
       children: [
         Row(
           mainAxisAlignment: MainAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             const MyAssetImage(
               Assets.serviceLocationIcon,
@@ -269,6 +269,7 @@ class CleanOrderDetailPage extends HookConsumerWidget {
               width: 10,
             ),
             Column(
+              mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 MyTextView(
@@ -309,7 +310,7 @@ class CleanOrderDetailPage extends HookConsumerWidget {
       children: [
         Row(
           mainAxisAlignment: MainAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             const MyAssetImage(
               Assets.serviceServiceAvatorIcon,
@@ -362,12 +363,13 @@ class CleanOrderDetailPage 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: Colors.grey.withOpacity(0.1)),
       child: Column(
         children: [
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             mainAxisSize: MainAxisSize.max,
+            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               Expanded(
                 child: Column(
@@ -425,7 +427,7 @@ class CleanOrderDetailPage extends HookConsumerWidget {
 
   Widget _buildOrderTotalAmount(CleanOrderDetailState state, CleanOrderDetailVm vm, BuildContext context) {
     return Column(children: [
-      Row(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
+      Row(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, children: [
         const MyAssetImage(
           Assets.serviceMoneyIcon,
           width: 15,
@@ -564,7 +566,7 @@ class CleanOrderDetailPage extends HookConsumerWidget {
       children: [
         Row(
           mainAxisAlignment: MainAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             // const MyAssetImage(
             //   Assets.assetsYyHomeLogo,
@@ -588,7 +590,7 @@ class CleanOrderDetailPage extends HookConsumerWidget {
           width: double.infinity,
           padding: const EdgeInsets.all(15),
           decoration: BoxDecoration(
-            color: ColorUtils.string2Color("#F8F8F8"),
+            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F8F8F8"), darkColor: Colors.grey.withOpacity(0.1)),
             borderRadius: BorderRadius.circular(5),
             // boxShadow: [
             //   BoxShadow(

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

@@ -28,6 +28,7 @@ import 'package:widgets/dialog/app_default_dialog.dart';
 import 'package:widgets/dialog/dialog_content_wrap.dart';
 import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/my_button.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 
 import '../../../components/chooseHouseCleanContent.dart';
@@ -177,6 +178,7 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
     }
   }
 
+  // 删除订单
   handlerDeleteOrder(BuildContext context) {
     DialogEngine.show(
         widget: AppCustomDialog(
@@ -223,7 +225,7 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
                 minHeight: 45,
                 fontSize: 16,
                 fontWeight: FontWeight.w500,
-                backgroundColor: context.appColors.textPrimary,
+                backgroundColor: DarkThemeUtil.multiColors(context, context.appColors.textPrimary,darkColor: Colors.black.withOpacity(0.5)),
                 textColor: context.appColors.textWhite,
               ),
             );
@@ -254,16 +256,16 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
   // 取消订单
   submitCancelOrder(BuildContext context) async {
     Log.d("cancelReason: ${state.cancelReason}");
-
+    String? cancelReason = state.cancelReason;
     if (Utils.isNotEmpty(state.cancelReason)) {
       //调用接口取消订单
-      DialogEngine.dismiss(tag: 'cancelOrder');
 
-      final result = await servicesRespositoryInstance.fetchCancelPaidServiceOrder(id: _detailId.toString(), reason: state.cancelReason);
+      final result = await servicesRespositoryInstance.fetchCancelPaidServiceOrder(id: _detailId.toString(), cancel_reason: cancelReason);
 
       if (result.isSuccess) {
         bus.emit(AppConstant.eventServiceOrderRefresh, _detailId.toString());
         clearReasonInput();
+        DialogEngine.dismiss(tag: 'cancelOrder');
         //去成功页面
         CleanOrderCancelSuccessPage.startInstance();
       } else {
@@ -307,9 +309,10 @@ class CleanOrderDetailVm extends _$CleanOrderDetailVm with DioCancelableMixin {
     switch (cancelStatus) {
       case '0':
         // 未取消
-        if(orderStatus != null){
-          serviceStatus = orderStatus!.toString();
-        }
+        // if(orderStatus != null){
+        //   serviceStatus = orderStatus!.toString();
+        // }
+        serviceStatus = '2';
         break;
       case '1':
       // 自己主动取消

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

@@ -623,7 +623,7 @@ class ServiceOrderConfirmPage extends HookConsumerWidget {
           height: 200,
           padding: const EdgeInsets.all(15),
           decoration: BoxDecoration(
-              color: ColorUtils.string2Color("#F2F3F6"),
+              color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color("#F2F3F6"),darkColor: AppColorsTheme.color666666),
               borderRadius: BorderRadius.circular(5),
               boxShadow: [
                 BoxShadow(

packages/cpt_services/lib/respository/services_respository.dart

@@ -459,12 +459,12 @@ class ServicesRespository {
   // 付费服务 取消订单
   Future<HttpResult> fetchCancelPaidServiceOrder({
     required String? id,
-    required String? reason,
+    required String? cancel_reason,
     CancelToken? cancelToken,
   }) async {
     Map<String, String> params = {};
     params['id'] = id ?? "";
-    params['cancel_reason'] = reason ?? "";
+    params['cancel_reason'] = cancel_reason  ?? "";
 
     final result = await dioEngine.requestNetResult(
       '/api/v1/user/service/paid-service-order/cancel',