Merge remote-tracking branch 'origin/dev' into dev

packages/cpt_community/lib/components/garage_card.dart

@@ -14,7 +14,7 @@ import 'package:widgets/my_text_view.dart';
 import '../modules/garage/for_sale/for_sale_vm.dart';
 
 // 'id':1,
-// 'goods_img':  'https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg',
+// 'goods_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
 // 'title': 'Electronic keyboard',
 // 'price': '\$66',
 // 'isCollection': true,

packages/cpt_community/lib/components/newfeed_card_header.dart

@@ -10,7 +10,7 @@ import 'package:widgets/my_text_view.dart';
 // 'title': 'William Jefferson',
 // 'isFollow': false,
 // 'content': 'She said YES and our lives changed.Thank you all for coming to my propose today.We hope everyone can ……[More]',
-// 'imageUrls': ['https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg'],
+// 'imageUrls': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
 // 'time': 'June 17,2016 at 7:23 p.m.',
 // 'likeno': 12
 

packages/cpt_community/lib/components/newsfeed_card_content.dart

@@ -8,7 +8,7 @@ import 'package:widgets/my_text_view.dart';
 // 'title': 'William Jefferson',
 // 'isFollow': false,
 // 'content': 'She said YES and our lives changed.Thank you all for coming to my propose today.We hope everyone can ……[More]',
-// 'imageUrls': ['https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg'],
+// 'imageUrls': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
 // 'time': 'June 17,2016 at 7:23 p.m.',
 // 'likeno': 12
 

packages/cpt_community/lib/components/newsfeed_card_footer.dart

@@ -13,7 +13,7 @@ import 'package:widgets/my_text_view.dart';
 // 'title': 'William Jefferson',
 // 'isFollow': false,
 // 'content': 'She said YES and our lives changed.Thank you all for coming to my propose today.We hope everyone can ……[More]',
-// 'imageUrls': ['https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg'],
+// 'imageUrls': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
 // 'time': 'June 17,2016 at 7:23 p.m.',
 // 'likeno': 12
 

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

@@ -20,7 +20,7 @@ class FollowingVm extends _$FollowingVm {
             'title': 'William Jefferson',
             'isFollow': false,
             'content': 'She said YES and our lives changed.Thank you all for coming to my propose today.We hope everyone can ……[More]',
-            'imageUrls': ['https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg'],
+            'imageUrls': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
             'time': 'June 17,2016 at 7:23 p.m.',
               'isLike': true,
             'likeno': 12

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

@@ -25,7 +25,7 @@ class ForyouVm extends _$ForyouVm {
             'title': 'William Jefferson',
             'isFollow': false,
             'content': 'She said YES and our lives changed.Thank you all for coming to my propose today.We hope everyone can ……[More]',
-            'imageUrls': ['https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg'],
+            'imageUrls': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
             'time': 'June 17,2016 at 7:23 p.m.',
             'isLike': true,
             'likeno': 12

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

@@ -25,7 +25,7 @@ class NewsVm extends _$NewsVm {
             'title': 'William Jefferson',
             'isFollow': false,
             'content': 'She said YES and our lives changed.Thank you all for coming to my propose today.We hope everyone can ……[More]',
-            'imageUrls': ['https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg'],
+            'imageUrls': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
             'time': 'June 17,2016 at 7:23 p.m.',
               'isLike': true,
             'likeno': 12

packages/cpt_community/lib/modules/community/newsfeed_detail/newsfeed_detail_state.dart

@@ -7,7 +7,7 @@ class NewsfeedDetailState {
 
   int? curPage;
   int? pageSize = 10;
-  int? filterCount = 0;
+  int? filterCount = 1;
   Map<String, dynamic> detailInfo;
   List<Map<String, dynamic>> list; // 评论列表
 
@@ -16,7 +16,7 @@ class NewsfeedDetailState {
     String? errorMessage,
     this.curPage = 1,
     this.pageSize = 10,
-    this.filterCount = 0,
+    this.filterCount = 1,
     required this.detailInfo,
     required this.list,
   });

packages/cpt_community/lib/modules/community/newsfeed_detail/newsfeed_detail_vm.dart

@@ -29,7 +29,7 @@ class NewsfeedDetailVm extends _$NewsfeedDetailVm {
         'avator': Assets.communityCamera,
         'title': 'William Jefferson',
         'content': 'She said YES and our lives changed.Thank you all for coming to my propose today.We hope everyone can ……[More]',
-        'imageUrls': ['https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg'],
+        'imageUrls': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
         'time': 'June 17,2016 at 7:23 p.m.',
         'isLike': true,
         'isFollow': false,

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

@@ -20,7 +20,7 @@ class ForrentVm extends _$ForrentVm {
         list: [
           {
             'id':1,
-            'goods_img':  'https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg',
+            'goods_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
             'title': 'Electronic keyboard',
             'price': '\$66',
             'isCollection': true,
@@ -31,7 +31,7 @@ class ForrentVm extends _$ForrentVm {
           },
           {
             'id':2,
-            'goods_img':  'https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg',
+            'goods_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
             'title': 'Electronic keyboard',
             'price': '\$88',
             'isCollection': false,
@@ -42,7 +42,7 @@ class ForrentVm extends _$ForrentVm {
           },
           {
             'id':3,
-            'goods_img':  'https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg',
+            'goods_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
             'title': 'Electronic keyboard',
             'price': '\$66',
             'isCollection': true,

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

@@ -126,7 +126,7 @@ class ForsaleVm extends _$ForsaleVm {
     final List<Map<String, dynamic>> listData = [
       {
         'id':1,
-        'goods_img':  'https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg',
+        'goods_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
         'title': 'Electronic keyboard',
         'price': '\$66',
         'isCollection': true,
@@ -137,7 +137,7 @@ class ForsaleVm extends _$ForsaleVm {
       },
       {
         'id':2,
-        'goods_img':  'https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg',
+        'goods_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
         'title': 'Electronic keyboard',
         'price': '\$88',
         'isCollection': false,
@@ -148,7 +148,7 @@ class ForsaleVm extends _$ForsaleVm {
       },
       {
         'id':3,
-        'goods_img':  'https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg',
+        'goods_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
         'title': 'Electronic keyboard',
         'price': '\$66',
         'isCollection': true,
@@ -159,7 +159,7 @@ class ForsaleVm extends _$ForsaleVm {
       },
       {
         'id':4,
-        'goods_img':  'https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg',
+        'goods_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
         'title': 'Electronic keyboard',
         'price': '\$88',
         'isCollection': false,
@@ -170,7 +170,7 @@ class ForsaleVm extends _$ForsaleVm {
       },
       {
         'id':5,
-        'goods_img':  'https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg',
+        'goods_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
         'title': 'Electronic keyboard',
         'price': '\$66',
         'isCollection': true,
@@ -181,7 +181,7 @@ class ForsaleVm extends _$ForsaleVm {
       },
       {
         'id':6,
-        'goods_img':  'https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg',
+        'goods_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
         'title': 'Electronic keyboard',
         'price': '\$88',
         'isCollection': false,
@@ -202,9 +202,9 @@ class ForsaleVm extends _$ForsaleVm {
       //加载更多
       final allList = state.list;
       allList.addAll(listData);
-      refreshController.finishLoad();
       state = state.copyWith(list: allList);
     }
+    refreshController.finishLoad();
 
     // 最后赋值
     _needShowPlaceholder = false;

packages/cpt_community/lib/modules/garage/garage_vm.dart

@@ -107,7 +107,7 @@ class GarageVm extends _$GarageVm {
             'title': '分等级付给的积分多少',
             'isFollow': true,
             'content': 'She said YES and our lives changed.Thank you all for coming to my propose today.We hope everyone can ……[More]',
-            'imageUrls': ['https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg','https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg'],
+            'imageUrls': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
             'time': 'June 17,2016 at 7:23 p.m.',
             'isLike': true,
             'likeno': 12

packages/cpt_community/lib/modules/garage/garagesale_detail/garagesale_detail_page.dart

@@ -9,6 +9,7 @@ import 'package:router/ext/auto_router_extensions.dart';
 import 'package:shared/utils/color_utils.dart';
 import 'package:widgets/load_state_layout.dart';
 import 'package:widgets/my_appbar.dart';
+import 'package:widgets/my_load_image.dart';
 import 'package:widgets/my_text_view.dart';
 
 @RoutePage()
@@ -31,6 +32,7 @@ class GaragesaleDetailPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final state = ref.watch(garagesaleDetailVmProvider);
     final vm = ref.read(garagesaleDetailVmProvider.notifier);
+    final String pageTitle = (type == 'forsale') ? 'For Sale' :'For Rent';
 
     useEffect((){
       // 组件挂载时执行 - 执行接口请求
@@ -43,7 +45,7 @@ class GaragesaleDetailPage extends HookConsumerWidget {
     return Scaffold(
       appBar: MyAppBar.appBar(
         context,
-        "Garage Sale Detail",
+        pageTitle,
         backgroundColor: context.appColors.whiteBG,
       ),
       backgroundColor: context.appColors.backgroundDefault,
@@ -77,44 +79,75 @@ class GaragesaleDetailPage extends HookConsumerWidget {
 
   Widget _buildContentBox(BuildContext context, WidgetRef ref) {
     final vm = ref.read(garagesaleDetailVmProvider.notifier);
+    final state = ref.watch(garagesaleDetailVmProvider);
+    String title = state.datas!['title'] ?? '';
+    String price = state.datas!['price'] ?? '';
+    String description = state.datas!['description'] ?? '';
     return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Container(
-          color: context.appColors.whiteBG,
-          child: Column(
-            children: [
-              Container(
-                color: context.appColors.whiteBG,
-                child: Column(
-                  children: [
-                    Container(
-                      color: context.appColors.whiteBG,
-                      child: Column(
-                        children: [
-                          Container(
-                            color: context.appColors.whiteBG,
-                          )
-                        ]
-                      )
-                    )
-                  ]
-                )
-              )
-            ]
-          )
-        )
+        // 图片
+        SizedBox(
+          width: double.infinity,
+          height: 173.5,
+          child: MyLoadImage(
+            state.datas!['goods_img'],
+          ),
+        ),
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            // 标题
+            Padding(
+              padding: const EdgeInsets.only(left: 16, right: 16, top: 16,),
+              child: title.isNotEmpty? MyTextView( title, fontSize: 18, isFontMedium: true, textColor: context.appColors.textBlack,):const SizedBox.shrink(),
+            ),
+            // 价格
+            Padding(
+              padding: const EdgeInsets.only(left: 16, right: 16, top: 10),
+              child: price.isNotEmpty? MyTextView( price, fontSize: 24, isFontMedium: true, textColor: context.appColors.textBlack,):const SizedBox.shrink(),
+            ),
+           //  内容
+            Padding(
+              padding: const EdgeInsets.only(left: 16, right: 16, top: 16),
+              child: description.isNotEmpty? MyTextView( description, fontSize: 17, isFontRegular: true, textColor: context.appColors.textBlack,):const SizedBox.shrink(),
+            ),
+          ],
+        ),
+
       ]
     );
   }
 
   Widget _buildBottomConcatInfo(BuildContext context, WidgetRef ref) {
+    final state = ref.watch(garagesaleDetailVmProvider);
+    String publisher = state.datas!['publisher'] ?? '';
+    String publisherAvatar = state.datas!['publisher_avatar'] ?? '';
+    String publisherTime = state.datas!['publisher_time'] ?? '';
+    int collectionNum = state.datas!['collection_num'] ?? 0;
     return Container(
       height: 50,
       color: ColorUtils.string2Color('#4161D0'),
       child: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
         children: [
-          // MyLoadImage(Assets.propertyIoanItemBg,width: 60,height: 50,),
+          Row(
+            children: [
+              MyLoadImage(
+                publisherAvatar,
+                width: 29,
+                height: 29,
+                isCircle: true,
+              ),
+              Column(
+                children: [
+                  MyTextView(publisher, fontSize:12, textColor: context.appColors.textWhite,)
+                ],
+              ),
+            ],
+          ),
+          Row(),
+
           const SizedBox(width: 10,),
           MyTextView(
             "Request a Quote",

packages/cpt_community/lib/modules/garage/garagesale_detail/garagesale_detail_vm.dart

@@ -78,18 +78,23 @@ class GaragesaleDetailVm extends _$GaragesaleDetailVm {
 
     final Map<String, dynamic> detailData = {
       'id':1,
-      'goods_img':  'https://img.alicdn.com/tfs/TB1h.o9O4MPMeJjy1XaXXcSsFXa-640-360.jpg',
+      'goods_img': 'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
       'title': 'Electronic keyboard',
       'price': '\$66',
+      'description':'Electronic keyboards for sale. I will attend together with the booth.\$10 per day usage Negotiable',
       'isCollection': true,
       'collection_num': 12,
       'publisher': 'William Jefferson',
+      'publisher_avatar': 'https://img1.baidu.com/it/u=3890726495,1572750319&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=500',
+      'publisher_time': 'June 17,2024 at 7:23 PM'
     };
 
-    state.copyWith(datas: detailData);
+    state = state.copyWith(datas: detailData);
 
     changeLoadingState(LoadState.State_Success, null);
 
+    refreshController.finishRefresh();
+
     // 最后赋值
     _needShowPlaceholder = false;
   }

packages/cpt_property/lib/modules/news/vm/property_news_vm.dart

@@ -154,9 +154,8 @@ class PropertyNewsVm extends _$PropertyNewsVm {
         allList.addAll(listData);
         state = state.copyWith(list: allList);
       }
-      refreshController.finishLoad();
     }
-
+    refreshController.finishLoad();
     // 最后赋值
     _needShowPlaceholder = false;
   }

packages/cs_resources/lib/generated/assets.dart

@@ -43,13 +43,17 @@ class Assets {
   static const String baseServiceTriangleDropDown = 'assets/base_service/triangle_drop_down.webp';
   static const String baseServiceTriangleDropDownIcon = 'assets/base_service/triangle_drop_down_icon.webp';
   static const String communityCamera = 'assets/community/camera.webp';
+  static const String communityCollection = 'assets/community/collection.png';
   static const String communityComments = 'assets/community/comments.webp';
+  static const String communityEdit = 'assets/community/edit.png';
   static const String communityFollowAdd = 'assets/community/follow_add.webp';
   static const String communityGarageSale = 'assets/community/garage_sale.webp';
   static const String communityLike = 'assets/community/like.webp';
   static const String communityLikeActive = 'assets/community/like_active.webp';
   static const String communityNesFeed = 'assets/community/nes_feed.webp';
+  static const String communityPhone = 'assets/community/phone.png';
   static const String communityShare = 'assets/community/share.webp';
+  static const String communityWhatsAPP = 'assets/community/WhatsAPP.png';
   static const String facilityActiveIcon = 'assets/facility/active_icon.webp';
   static const String facilityAddCardAmerican = 'assets/facility/add_card_american.webp';
   static const String facilityAddCardMaster = 'assets/facility/add_card_master.webp';

packages/cs_resources/lib/theme/app_colors_theme.dart

@@ -52,6 +52,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
   final Color authFiledBG; //输入框默认的背景颜色
   final Color textPrimary; //主题色文本
   final Color textBlack; //黑色文本
+  final Color textWhite; // 白色文本
   final Color textDarkGray; //深灰色 666 文本
   final Color orangeBG; //按钮的橙色背景
   final Color tabBgSelectedPrimary; //Tab的选中主题色背景
@@ -87,6 +88,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
     required this.authFiledBG,
     required this.textPrimary,
     required this.textBlack,
+    required this.textWhite,
     required this.textDarkGray,
     required this.orangeBG,
     required this.tabBgSelectedPrimary,
@@ -124,6 +126,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
       authFiledBG: _colorF2F2F2,
       textPrimary: _colorPrimary,
       textBlack: Colors.black,
+      textWhite: Colors.white,
       textDarkGray: color666666,
       orangeBG: _colorFE6C00,
       tabBgSelectedPrimary: _colorPrimary,
@@ -162,6 +165,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
       authFiledBG: _darkBlackItem,
       textPrimary: Colors.white,
       textBlack: Colors.white,
+      textWhite: Colors.black,
       textDarkGray: Colors.white,
       orangeBG: _darkBlackItem,
       tabBgSelectedPrimary: Colors.white,
@@ -209,6 +213,7 @@ class AppColorsTheme extends ThemeExtension<AppColorsTheme> {
       authFiledBG: Color.lerp(authFiledBG, other.authFiledBG, t)!,
       textPrimary: Color.lerp(textPrimary, other.textPrimary, t)!,
       textBlack: Color.lerp(textBlack, other.textBlack, t)!,
+      textWhite: Color.lerp(textWhite, other.textWhite, t)!,
       textDarkGray: Color.lerp(textDarkGray, other.textDarkGray, t)!,
       orangeBG: Color.lerp(orangeBG, other.orangeBG, t)!,
       tabBgSelectedPrimary: Color.lerp(tabBgSelectedPrimary, other.tabBgSelectedPrimary, t)!,