Merge branch 'dev' of http://git.wmzhubo.com/guadoutech/YYHome into dev

packages/cpt_form/lib/modules/detail/detail_processing_fragment.dart

@@ -10,6 +10,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';
 
 import '../apply/form_terms_page.dart';
 import '../form/form_types.dart';
@@ -91,10 +92,11 @@ class DetailProcessingFragment extends HookConsumerWidget {
                   //图片
                   Visibility(
                       visible: state.forDetail?.order?.refundStatus == 0 && state.forDetail?.order?.paymentStatus == 1,
-                      child: const MyAssetImage(
+                      child: MyAssetImage(
                         Assets.formDetailProcessingImg,
                         width: 40,
                         height: 51.5,
+                        color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                       )),
 
                   //提示文本

packages/cpt_main/lib/modules/feedback/detail/feedback_detail_page.dart

@@ -11,6 +11,7 @@ import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/my_appbar.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/main_page_router.dart';
 import 'feedback_detail_view_model.dart';
@@ -204,7 +205,12 @@ class FeedbackDetailPage extends HookConsumerWidget {
       child: Column(
         children: [
           const SizedBox(height: 40),
-          const MyAssetImage(Assets.mainFeedbackWaitingIcon, width: 38, height: 38),
+          MyAssetImage(
+            Assets.mainFeedbackWaitingIcon,
+            width: 38,
+            height: 38,
+            color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
+          ),
           MyTextView(
             S.current.waiting_for_the_administrator,
             fontSize: 15,

packages/cpt_main/lib/modules/home/home_page.dart

@@ -45,6 +45,8 @@ class HomePage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final viewModel = ref.read(homeViewModelProvider.notifier);
     final state = ref.watch(homeViewModelProvider);
+    String? notificationCount = UserConfigService.getState(ref: ref).user?.unreadNotificationsCount;
+
     final bannerIndex = useState(0);
 
     useEffect(() {
@@ -121,11 +123,10 @@ class HomePage extends HookConsumerWidget {
                           left: 0,
                           top: 0,
                           child: Visibility(
-                            visible: UserConfigService.getState(ref: ref).user?.unreadNotificationsCount != null,
+                            visible: notificationCount != null && notificationCount != "0",
                             child: Transform.translate(
                               offset: const Offset(-10, -5),
-                              child: MyTextView(
-                                UserConfigService.getState(ref: ref).user?.unreadNotificationsCount ?? "0",
+                              child: MyTextView(notificationCount ?? "0",
                                 boxWidth: 20.0,
                                 textColor: Colors.white,
                                 fontSize: 10,