rewards的相关UI改动

packages/cpt_rewards/lib/modules/rewards_address/rewards_address_page.dart

@@ -47,10 +47,11 @@ class RewardsAddressPage extends HookConsumerWidget {
               crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                const MyAssetImage(
+                 MyAssetImage(
                   Assets.rewardsRewardsIconAddes,
                   width: 15,
                   height: 19,
+                  color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                 ).marginOnly(right: 10),
                 Expanded(
                   child: Text(

packages/cpt_rewards/lib/modules/rewards_confirm/rewards_confirm_page.dart

@@ -102,10 +102,11 @@ class RewardsConfirmPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                  MyAssetImage(
                     Assets.rewardsRewardsDetailDeal,
                     width: 25,
                     height: 25,
+                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 5),
                   Text(
                     S.current.redeem_deal_at,
@@ -144,7 +145,7 @@ class RewardsConfirmPage extends HookConsumerWidget {
         Container(
           decoration: BoxDecoration(
             color: context.appColors.whiteBG,
-            borderRadius: BorderRadius.all(Radius.circular(6.0)),
+            borderRadius: const BorderRadius.all(Radius.circular(6.0)),
             boxShadow: [BoxShadow(color: context.appColors.itemBGShadow)],
           ),
           width: MediaQuery.of(context).size.width - 30,
@@ -156,10 +157,11 @@ class RewardsConfirmPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.rewardsRewardsIconDatd,
                     width: 15,
                     height: 15,
+                     color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 10),
                   Text(
                     S.current.redeem_from,
@@ -214,25 +216,25 @@ class RewardsConfirmPage extends HookConsumerWidget {
                   ),
                   Row(
                     children: [
-                      DarkThemeUtil.multiImageColorFit(
-                        context,
+                      MyAssetImage(
                         Assets.rewardsRewardsJian,
-                        darkColor: Colors.white,
                         width: 21,
                         height: 21,
+                        color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                       ).onTap(() {
                         _vm.numberDec();
                       }),
+
                       Text(
                         '$number',
                         style: TextStyle(fontSize: 19.0, color: context.appColors.tabTextUnSelectedPrimary, fontWeight: FontWeight.w500),
                       ).marginOnly(left: 15, right: 15),
-                      DarkThemeUtil.multiImageColorFit(
-                        context,
+
+                      MyAssetImage(
                         Assets.rewardsRewardsJia,
-                        darkColor: Colors.white,
                         width: 21,
                         height: 21,
+                        color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                       ).onTap(() {
                         _vm.numberAdd();
                       }),

packages/cpt_rewards/lib/modules/rewards_detail/rewards_detail_page.dart

@@ -133,10 +133,11 @@ class RewardsDetailPage extends HookConsumerWidget {
                           mainAxisAlignment: MainAxisAlignment.start,
                           crossAxisAlignment: CrossAxisAlignment.center,
                           children: [
-                            const MyAssetImage(
+                             MyAssetImage(
                               Assets.rewardsRewardsDetailDay,
                               width: 25,
                               height: 25,
+                               color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                             ).marginOnly(right: 5),
                             Text(
                               maxLines: 1, // 设置最大行数为2
@@ -160,10 +161,11 @@ class RewardsDetailPage extends HookConsumerWidget {
                               mainAxisAlignment: MainAxisAlignment.start,
                               crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
-                                const MyAssetImage(
+                                 MyAssetImage(
                                   Assets.rewardsRewardsDetailRequired,
                                   width: 25,
                                   height: 25,
+                                   color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                                 ).marginOnly(right: 5),
                                 Text(
                                   maxLines: 1, // 设置最大行数为2
@@ -203,10 +205,11 @@ class RewardsDetailPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.rewardsRewardsDetailDeal,
                     width: 25,
                     height: 25,
+                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 10),
                   Text(
                     S.current.redeem_deal_at,
@@ -225,10 +228,11 @@ class RewardsDetailPage extends HookConsumerWidget {
                         mainAxisAlignment: MainAxisAlignment.start,
                         crossAxisAlignment: CrossAxisAlignment.center,
                         children: [
-                          const MyAssetImage(
+                           MyAssetImage(
                             Assets.rewardsRewardsIndex1,
                             width: 60,
                             height: 60,
+                            color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                           ).marginOnly(right: 15),
                           Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
@@ -260,10 +264,11 @@ class RewardsDetailPage extends HookConsumerWidget {
                     'Also redeemable in 1 more location',
                     style: TextStyle(fontSize: 15.0, color:DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#54638C'),darkColor: Colors.white), fontWeight: FontWeight.w400),
                   ),
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.rewardsRewardsRight,
                     width: 12,
                     height: 16,
+                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ),
                 ],
               ),
@@ -293,10 +298,11 @@ class RewardsDetailPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.rewardsRewardsDetailPackage,
                     width: 25,
                     height: 25,
+                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 10),
                   Text(
                     'What’s In The Package',
@@ -339,10 +345,11 @@ class RewardsDetailPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.rewardsRewardsDetailNotice,
                     width: 25,
                     height: 25,
+                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 10),
                   Text(
                     S.current.redemption_notice,
@@ -384,10 +391,11 @@ class RewardsDetailPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.rewardsRewardsDetailInstructions,
                     width: 25,
                     height: 25,
+                     color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 10),
                   Text(
                     S.current.redemption_instructions,
@@ -430,10 +438,11 @@ class RewardsDetailPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.rewardsRewardsDetailNotice,
                     width: 25,
                     height: 25,
+                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 10),
                   Text(
                     S.current.redeemable_on,

packages/cpt_rewards/lib/modules/rewards_list/rewards_list_page.dart

@@ -291,10 +291,11 @@ class RewardsListPage extends HookConsumerWidget {
                         ],
                       ),
                       itemsList[index]['id'] == state.category_id
-                          ? const MyAssetImage(
+                          ? MyAssetImage(
                               Assets.rewardsRewardListChoose,
                               width: 17,
                               height: 17,
+                              color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                             )
                           : Container()
                     ],
@@ -376,10 +377,11 @@ class RewardsListPage extends HookConsumerWidget {
                                 ],
                               ),
                               sortBy == "created_at"
-                                  ? const MyAssetImage(
+                                  ? MyAssetImage(
                                       Assets.rewardsRewardListChoose,
                                       width: 17,
                                       height: 17,
+                                      color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                                     )
                                   : Container()
                             ],
@@ -418,10 +420,11 @@ class RewardsListPage extends HookConsumerWidget {
                                 ],
                               ),
                               sortBy == "clicks_count"
-                                  ? const MyAssetImage(
+                                  ? MyAssetImage(
                                       Assets.rewardsRewardListChoose,
                                       width: 17,
                                       height: 17,
+                                      color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                                     )
                                   : Container()
                             ],
@@ -445,10 +448,11 @@ class RewardsListPage extends HookConsumerWidget {
                             children: [
                               Row(
                                 children: [
-                                  const MyAssetImage(
+                                  MyAssetImage(
                                     Assets.rewardsRewardListLow,
                                     width: 14,
                                     height: 17,
+                                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                                   ).marginOnly(right: 15),
                                   Text(
                                     'Low to High Points',
@@ -460,10 +464,11 @@ class RewardsListPage extends HookConsumerWidget {
                                 ],
                               ),
                               sort == "asc"
-                                  ? const MyAssetImage(
+                                  ? MyAssetImage(
                                       Assets.rewardsRewardListChoose,
                                       width: 17,
                                       height: 17,
+                                      color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                                     )
                                   : Container()
                             ],
@@ -487,10 +492,11 @@ class RewardsListPage extends HookConsumerWidget {
                             children: [
                               Row(
                                 children: [
-                                  const MyAssetImage(
+                                  MyAssetImage(
                                     Assets.rewardsRewardListHigh,
                                     width: 13,
                                     height: 16,
+                                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                                   ).marginOnly(right: 15),
                                   Text(
                                     'High to Low Points',
@@ -502,10 +508,11 @@ class RewardsListPage extends HookConsumerWidget {
                                 ],
                               ),
                               sort == "desc"
-                                  ? const MyAssetImage(
+                                  ? MyAssetImage(
                                       Assets.rewardsRewardListChoose,
                                       width: 17,
                                       height: 17,
+                                      color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                                     )
                                   : Container()
                             ],

packages/cpt_rewards/lib/modules/rewards_my/rewards_my_active/rewards_my_active_page.dart

@@ -12,6 +12,7 @@ import 'package:shared/utils/color_utils.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/my_load_image.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 import 'package:cs_resources/generated/assets.dart';
 
@@ -79,10 +80,11 @@ class RewardsMyActivePage extends HookConsumerWidget {
               children: [
                 Row(
                   children: [
-                    const MyAssetImage(
+                     MyAssetImage(
                       Assets.rewardsRewardsIconDatd,
                       width: 15,
                       height: 15,
+                      color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                     ),
                     Text(
                       '${S.current.redeem_from}:',

packages/cpt_rewards/lib/modules/rewards_my/rewards_my_expired/rewards_my_expired_page.dart

@@ -11,6 +11,7 @@ import 'package:shared/utils/color_utils.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/my_load_image.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 import 'package:cs_resources/generated/assets.dart';
 
@@ -50,6 +51,7 @@ class RewardsMyExpiredPage extends HookConsumerWidget {
               title,
               style: TextStyle(fontSize: 16.0, color: context.appColors.textBlack, fontWeight: FontWeight.w500),
             ),
+
             Row(
               children: [
                 Text(
@@ -71,16 +73,18 @@ class RewardsMyExpiredPage extends HookConsumerWidget {
                   style: TextStyle(fontSize: 13.0, color: context.appColors.textBlack, fontWeight: FontWeight.w400),
                 ),
               ],
-            ),
+            ).marginOnly(top: 5),
+
             Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Row(
                   children: [
-                    const MyAssetImage(
+                     MyAssetImage(
                       Assets.rewardsRewardsIconDatd,
                       width: 15,
                       height: 15,
+                      color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                     ),
                     Text(
                       '${S.current.redeem_from}:',
@@ -95,7 +99,8 @@ class RewardsMyExpiredPage extends HookConsumerWidget {
               ],
             ),
           ],
-        ),
+        ).marginOnly(top: 6),
+
         MyLoadImage(
           img,
           width: MediaQuery.of(context).size.width,

packages/cpt_rewards/lib/modules/rewards_my/rewards_my_used/rewards_my_used_page.dart

@@ -11,6 +11,7 @@ import 'package:shared/utils/color_utils.dart';
 import 'package:widgets/ext/ex_widget.dart';
 import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/my_load_image.dart';
+import 'package:widgets/utils/dark_theme_util.dart';
 import 'package:widgets/widget_export.dart';
 import 'package:cs_resources/generated/assets.dart';
 
@@ -51,6 +52,7 @@ class RewardsMyUsedPage extends HookConsumerWidget {
               title,
               style: TextStyle(fontSize: 16.0, color: context.appColors.textBlack, fontWeight: FontWeight.w500),
             ),
+
             Row(
               children: [
                 Text(
@@ -72,16 +74,18 @@ class RewardsMyUsedPage extends HookConsumerWidget {
                   style: TextStyle(fontSize: 13.0, color: context.appColors.textBlack, fontWeight: FontWeight.w400),
                 ),
               ],
-            ),
+            ).marginOnly(top: 2),
+
             Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Row(
                   children: [
-                    const MyAssetImage(
+                     MyAssetImage(
                       Assets.rewardsRewardsIconDatd,
                       width: 15,
                       height: 15,
+                      color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                     ),
                     Text(
                       '${S.current.redeem_from}:',
@@ -94,20 +98,23 @@ class RewardsMyUsedPage extends HookConsumerWidget {
                   style: TextStyle(fontSize: 13.0, color: context.appColors.textBlack, fontWeight: FontWeight.w400),
                 )
               ],
-            ),
+            ).marginOnly(top: 6),
+
             Row(
               children: [
-                const MyAssetImage(
+                 MyAssetImage(
                   Assets.rewardsRewardsIconDraw,
                   width: 15,
                   height: 15,
+                  color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                 ),
                 Text(
                   '${S.current.redeem_deal_at}: $usedAt',
                   style: TextStyle(fontSize: 13.0, color: context.appColors.textBlack, fontWeight: FontWeight.w400),
                 ).marginOnly(left: 6)
               ],
-            ).paddingOnly(left: 6),
+            ).marginOnly(top: 6),
+
             Container(
                 height: 43,
                 decoration: BoxDecoration(
@@ -121,7 +128,7 @@ class RewardsMyUsedPage extends HookConsumerWidget {
                           S.current.view,
                           style: const TextStyle(fontSize: 15.0, color: Colors.white, fontWeight: FontWeight.w500),
                         )))).marginOnly(top: 10, bottom: 5).onTap(() {
-              RewardsTransactionPage.startInstance();
+              RewardsTransactionPage.startInstance(id: id);
             }),
           ],
         ),

packages/cpt_rewards/lib/modules/rewards_redeem/rewards_redeem_page.dart

@@ -144,10 +144,11 @@ class RewardsRedeemPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.rewardsRewardsIconDatd,
                     width: 25,
                     height: 25,
+                     color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 10),
                   Text(
                     S.current.redeem_date,
@@ -201,10 +202,11 @@ class RewardsRedeemPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.rewardsRewardsIconDate,
                     width: 25,
                     height: 25,
+                     color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 10),
                   Text(
                     S.current.redeem_from,
@@ -255,10 +257,11 @@ class RewardsRedeemPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.rewardsRewardsSuccess,
                     width: 17,
                     height: 17,
+                     color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 12),
                   Expanded(
                     child: Text(
@@ -287,10 +290,11 @@ class RewardsRedeemPage extends HookConsumerWidget {
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            const MyAssetImage(
+             MyAssetImage(
               Assets.rewardsRewardsSuccess,
               width: 54,
               height: 54,
+               color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
             ),
             Text(
               '${S.current.congratulations}!',

packages/cpt_rewards/lib/modules/rewards_search/rewards_search_page.dart

@@ -204,10 +204,11 @@ class RewardsSearchPage extends HookConsumerWidget {
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          const MyAssetImage(
+           MyAssetImage(
             Assets.rewardsRewardsHost,
             width: 12,
             height: 14,
+             color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
           ).marginOnly(right: 5),
           Text(
             trending,

packages/cpt_rewards/lib/modules/rewards_successful/rewards_successful_page.dart

@@ -30,6 +30,7 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
   final String? resources;
   final String? redeemedDate;
   final String? createdAt;
+
   const RewardsSuccessfulPage(
       {Key? key,
       @PathParam('amount') required this.amount,
@@ -49,19 +50,9 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
     String? createdAt = '',
   }) {
     if (context != null) {
-      context.router.push(RewardsSuccessfulPageRoute(
-          amount: amount,
-          title: title,
-          resources: resources,
-          redeemedDate: redeemedDate,
-          createdAt: createdAt));
+      context.router.push(RewardsSuccessfulPageRoute(amount: amount, title: title, resources: resources, redeemedDate: redeemedDate, createdAt: createdAt));
     } else {
-      appRouter.push(RewardsSuccessfulPageRoute(
-          amount: amount,
-          title: title,
-          resources: resources,
-          redeemedDate: redeemedDate,
-          createdAt: createdAt));
+      appRouter.push(RewardsSuccessfulPageRoute(amount: amount, title: title, resources: resources, redeemedDate: redeemedDate, createdAt: createdAt));
     }
   }
 
@@ -72,13 +63,10 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
     return Column(
       children: [
         Container(
-            decoration:  BoxDecoration(
+            decoration: BoxDecoration(
               color: context.appColors.whiteBG,
               borderRadius: const BorderRadius.all(Radius.circular(6.0)),
-              boxShadow: [
-                BoxShadow(
-                    color: context.appColors.itemBGShadow)
-              ],
+              boxShadow: [BoxShadow(color: context.appColors.itemBGShadow)],
             ),
             width: MediaQuery.of(context).size.width - 30,
             // height: 420,
@@ -100,10 +88,7 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
                       maxLines: 1, // 设置最大行数为2
                       overflow: TextOverflow.ellipsis, // 超出部分用省略号表示
                       titles,
-                      style:  TextStyle(
-                          fontSize: 17.0,
-                          color: context.appColors.textBlack,
-                          fontWeight: FontWeight.w500),
+                      style: TextStyle(fontSize: 17.0, color: context.appColors.textBlack, fontWeight: FontWeight.w500),
                     ),
                   ],
                 ).paddingOnly(left: 15, right: 15, top: 10, bottom: 30),
@@ -117,13 +102,10 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
     return Column(
       children: [
         Container(
-          decoration:  BoxDecoration(
-            color:context.appColors.whiteBG,
+          decoration: BoxDecoration(
+            color: context.appColors.whiteBG,
             borderRadius: const BorderRadius.all(Radius.circular(6.0)),
-            boxShadow: [
-              BoxShadow(
-                  color: context.appColors.itemBGShadow)
-            ],
+            boxShadow: [BoxShadow(color: context.appColors.itemBGShadow)],
           ),
           width: MediaQuery.of(context).size.width - 30,
           child: Column(
@@ -134,17 +116,15 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                  MyAssetImage(
                     Assets.rewardsRewardsDetailDeal,
                     width: 25,
                     height: 25,
+                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 5),
                   Text(
                     S.current.redeem_deal_at,
-                    style: TextStyle(
-                        fontSize: 15.0,
-                        color: context.appColors.textBlack,
-                        fontWeight: FontWeight.w500),
+                    style: TextStyle(fontSize: 15.0, color: context.appColors.textBlack, fontWeight: FontWeight.w500),
                   )
                 ],
               ),
@@ -158,7 +138,7 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
                     overflow: TextOverflow.ellipsis, // 超出部分用省略号表示
                     style: TextStyle(
                         fontSize: 15.0,
-                        color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#54638C'),darkColor: Colors.white),
+                        color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#54638C'), darkColor: Colors.white),
                         fontWeight: FontWeight.w400),
                   ),
                 ],
@@ -175,13 +155,10 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
     return Column(
       children: [
         Container(
-          decoration:  BoxDecoration(
-            color: context.appColors.whiteBG  ,
+          decoration: BoxDecoration(
+            color: context.appColors.whiteBG,
             borderRadius: const BorderRadius.all(Radius.circular(6.0)),
-            boxShadow: [
-              BoxShadow(
-                  color: context.appColors.itemBGShadow  )
-            ],
+            boxShadow: [BoxShadow(color: context.appColors.itemBGShadow)],
           ),
           width: MediaQuery.of(context).size.width - 30,
           child: Column(
@@ -192,17 +169,15 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                  MyAssetImage(
                     Assets.rewardsRewardsIconDatd,
                     width: 15,
                     height: 15,
+                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 10),
                   Text(
                     S.current.redeem_from,
-                    style: TextStyle(
-                        fontSize: 15.0,
-                        color: context.appColors.textBlack  ,
-                        fontWeight: FontWeight.w500),
+                    style: TextStyle(fontSize: 15.0, color: context.appColors.textBlack, fontWeight: FontWeight.w500),
                   )
                 ],
               ).marginOnly(bottom: 10),
@@ -213,7 +188,7 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
                     redeemedDates,
                     style: TextStyle(
                         fontSize: 15.0,
-                        color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#54638C'),darkColor: Colors.white),
+                        color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#54638C'), darkColor: Colors.white),
                         fontWeight: FontWeight.w400),
                   ),
                 ],
@@ -230,13 +205,10 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
     return Column(
       children: [
         Container(
-          decoration:  BoxDecoration(
-            color: context.appColors.whiteBG   ,
+          decoration: BoxDecoration(
+            color: context.appColors.whiteBG,
             borderRadius: const BorderRadius.all(Radius.circular(6.0)),
-            boxShadow: [
-              BoxShadow(
-                  color: context.appColors.itemBGShadow   )
-            ],
+            boxShadow: [BoxShadow(color: context.appColors.itemBGShadow)],
           ),
           width: MediaQuery.of(context).size.width - 30,
           child: Column(
@@ -248,10 +220,7 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
                 children: [
                   Text(
                     '${S.current.date_time}:',
-                    style: TextStyle(
-                        fontSize: 15.0,
-                        color: context.appColors.tabTextUnSelectedPrimary,
-                        fontWeight: FontWeight.w400),
+                    style: TextStyle(fontSize: 15.0, color: context.appColors.tabTextUnSelectedPrimary, fontWeight: FontWeight.w400),
                   ),
                   Row(
                     children: [
@@ -259,7 +228,7 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
                         createdAts,
                         style: TextStyle(
                             fontSize: 15.0,
-                            color:  DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#54638C'),darkColor: Colors.white),
+                            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#54638C'), darkColor: Colors.white),
                             fontWeight: FontWeight.w400),
                       ),
                     ],
@@ -300,30 +269,26 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
   Widget _buildTop(BuildContext context, WidgetRef ref, _vm) {
     return Container(
         width: MediaQuery.of(context).size.width,
-        color: context.appColors.whiteBG  ,
+        color: context.appColors.whiteBG,
         padding: const EdgeInsets.only(top: 15, bottom: 30),
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            const MyAssetImage(
+            MyAssetImage(
               Assets.rewardsRewardsSuccess,
               width: 54,
               height: 54,
+              color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
             ),
             Text(
               S.current.you_have_paid_points,
               style: TextStyle(
-                  fontSize: 18.0,
-                  color:  DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary,darkColor: Colors.white),
-                  fontWeight: FontWeight.w500),
+                  fontSize: 18.0, color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white), fontWeight: FontWeight.w500),
             ).marginOnly(top: 12, bottom: 15),
             Text(
               '$amount',
-              style: TextStyle(
-                  fontSize: 30.0,
-                  color: context.appColors.textBlack  ,
-                  fontWeight: FontWeight.w500),
+              style: TextStyle(fontSize: 30.0, color: context.appColors.textBlack, fontWeight: FontWeight.w500),
             ),
           ],
         ));
@@ -365,14 +330,14 @@ class RewardsSuccessfulPage extends HookConsumerWidget {
                   ))),
           Container(
             height: 50,
-            color:context.appColors.btnBgDefault,
+            color: context.appColors.btnBgDefault,
             child: Flex(
               direction: Axis.horizontal,
               children: [
                 Expanded(
                   flex: 1,
                   child: Container(
-                    color: context.appColors.btnBgDefault  ,
+                    color: context.appColors.btnBgDefault,
                     height: 100,
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.center,

packages/cpt_rewards/lib/modules/rewards_transaction/rewards_transaction_page.dart

@@ -129,10 +129,11 @@ class RewardsTransactionPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.rewardsRewardsIconDatd,
                     width: 25,
                     height: 25,
+                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 15),
                   Text(
                     redeemedEnd,
@@ -147,10 +148,11 @@ class RewardsTransactionPage extends HookConsumerWidget {
                 children: [
                   Row(
                     children: [
-                      const MyAssetImage(
+                       MyAssetImage(
                         Assets.rewardsRewardsIcon123,
                         width: 25,
                         height: 25,
+                        color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                       ).marginOnly(right: 15),
                       Text(
                         S.current.verification_code,
@@ -204,13 +206,13 @@ class RewardsTransactionPage extends HookConsumerWidget {
     ).marginOnly(left: 15, bottom: 25, right: 15);
   }
 
-  Widget _buildNotice(BuildContext context, WidgetRef ref, _vm, types, detailInfo) {
-    int phone = detailInfo.account.fullPhone ?? 0;
-    String createdAt = detailInfo.createdAt ?? "";
-    String usedAt = detailInfo.usedAt ?? "";
-    int point = detailInfo.reward.point ?? 0;
-    int originalPoint = detailInfo.reward.originalPoint ?? 0;
-    int quantity = detailInfo.quantity ?? 0;
+  Widget _buildNotice(BuildContext context, WidgetRef ref, _vm, String? types, RewardsMyDetailEntity? detailInfo) {
+    int phone = detailInfo?.account.phone ?? 0;
+    String createdAt = detailInfo?.createdAt ?? "";
+    String usedAt = detailInfo?.usedAt ?? "";
+    int point = detailInfo?.reward.point ?? 0;
+    int originalPoint = detailInfo?.reward.originalPoint ?? 0;
+    int quantity = detailInfo?.quantity ?? 0;
     return Column(
       children: [
         Container(
@@ -228,10 +230,11 @@ class RewardsTransactionPage extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.start,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  const MyAssetImage(
+                   MyAssetImage(
                     Assets.rewardsRewardsIconFile,
                     width: 25,
                     height: 25,
+                    color: DarkThemeUtil.multiColors(context, AppColorsTheme.colorPrimary, darkColor: Colors.white),
                   ).marginOnly(right: 10),
                   Text(
                     S.current.transaction_details,
@@ -327,10 +330,10 @@ class RewardsTransactionPage extends HookConsumerWidget {
                         '$originalPoint',
                         style: TextStyle(
                             decoration: TextDecoration.lineThrough,
-                            decorationColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#54638C'),darkColor: Colors.white),
+                            decorationColor: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#54638C'), darkColor: Colors.white),
                             decorationStyle: TextDecorationStyle.solid,
                             fontSize: 14.0,
-                            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#54638C'),darkColor: Colors.white),
+                            color: DarkThemeUtil.multiColors(context, ColorUtils.string2Color('#54638C'), darkColor: Colors.white),
                             fontWeight: FontWeight.w400),
                       ),
                       Text(