diff --git a/lib/order/exchange_history_page.dart b/lib/order/exchange_history_page.dart index 0ab8cdbc..ac57e16c 100644 --- a/lib/order/exchange_history_page.dart +++ b/lib/order/exchange_history_page.dart @@ -6,6 +6,7 @@ import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/exchange_order.dart'; import 'package:huixiang/retrofit/data/page.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/classic_header.dart'; import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/icon_text.dart'; @@ -90,7 +91,7 @@ class _ExchangeHistoryPage extends State labelStyle: TextStyle( color: Colors.black, fontSize: 16.sp, - fontWeight: FontWeight.bold), + fontWeight: MyFontWeight.semi_bold), labelColor: Colors.black, tabs: tabs, ), @@ -245,7 +246,7 @@ class _ExchangeHistoryList extends State { S.of(context).chuangjianshijian(exchangeOrder.createTime), style: TextStyle( color: Colors.black, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 14.sp, ), ), @@ -253,7 +254,7 @@ class _ExchangeHistoryList extends State { orderStatus(exchangeOrder.state), style: TextStyle( color: Color(0xFFFE951E), - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 14.sp, ), ) @@ -270,7 +271,7 @@ class _ExchangeHistoryList extends State { S.of(context).zitidizhi + " :", style: TextStyle( color: Color(0xFF353535), - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, fontSize: 12.sp, ), ), @@ -282,7 +283,7 @@ class _ExchangeHistoryList extends State { exchangeOrder.address ?? "", style: TextStyle( color: Colors.black, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, fontSize: 12.sp, ), ), @@ -298,7 +299,7 @@ class _ExchangeHistoryList extends State { S.of(context).zitishijian + " :", style: TextStyle( color: Color(0xFF353535), - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, fontSize: 12.sp, ), ), @@ -310,7 +311,7 @@ class _ExchangeHistoryList extends State { S.of(context).duihuanhouwugegongzuori, style: TextStyle( color: Colors.black, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, fontSize: 12.sp, ), ), @@ -350,7 +351,7 @@ class _ExchangeHistoryList extends State { overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xFF353535)), ), SizedBox( @@ -364,7 +365,7 @@ class _ExchangeHistoryList extends State { maxLines: 2, style: TextStyle( fontSize: 10.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF727272), ), ), @@ -377,7 +378,7 @@ class _ExchangeHistoryList extends State { "x1", style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF353535), ), ) @@ -401,7 +402,7 @@ class _ExchangeHistoryList extends State { S.of(context).shifujifen(exchangeOrder.amount), style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Colors.black, ), ), @@ -420,7 +421,7 @@ class _ExchangeHistoryList extends State { iconSize: 16, textStyle: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF353535), ), ), diff --git a/lib/union/union_details_page.dart b/lib/union/union_details_page.dart index 5c06cdfb..0ff3dd90 100644 --- a/lib/union/union_details_page.dart +++ b/lib/union/union_details_page.dart @@ -16,6 +16,7 @@ import 'package:huixiang/retrofit/data/user_entity.dart'; import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/flutter_utils.dart'; +import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/min.dart'; import 'package:huixiang/view_widget/classic_header.dart'; import 'package:huixiang/view_widget/custom_image.dart'; @@ -154,7 +155,7 @@ class _UnionDetailsPage extends State { style: TextStyle( fontSize: 16.sp, color: Colors.black, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, ), ), Expanded( @@ -170,7 +171,7 @@ class _UnionDetailsPage extends State { ), style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF353535), ), ), @@ -186,7 +187,7 @@ class _UnionDetailsPage extends State { textAlign: TextAlign.justify, style: TextStyle( color: Color(0xFF353535), - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, fontSize: 12.sp, ), ), @@ -218,7 +219,7 @@ class _UnionDetailsPage extends State { "- ${storeInfo.openEndTime.substring(0, storeInfo.openEndTime.lastIndexOf(":"))}"), style: TextStyle( color: Color(0xFF353535), - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, fontSize: 12.sp, ), ), @@ -294,7 +295,7 @@ class _UnionDetailsPage extends State { S.of(context).zanwuyouhuiquankelingqu, style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xFFA0A0A0), ), ), @@ -323,7 +324,7 @@ class _UnionDetailsPage extends State { S.of(context).muqianzanwuxingdianhuodong, style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xFFA0A0A0), ), ), @@ -352,7 +353,7 @@ class _UnionDetailsPage extends State { style: TextStyle( fontSize: 16.sp, color: isEnable() ? Colors.white : Color(0xFFA0A0A0), - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, ), ), ), @@ -410,7 +411,7 @@ class _UnionDetailsPage extends State { S.of(context).huiyuanyue, style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Colors.white, ), ), @@ -421,7 +422,7 @@ class _UnionDetailsPage extends State { "¥${(storeInfo != null && storeInfo.memberSource != null) ? storeInfo.memberSource.balance : ""}", style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Colors.white, ), ), @@ -441,7 +442,7 @@ class _UnionDetailsPage extends State { S.of(context).huiyuanjifen, style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Colors.white, ), ), @@ -454,7 +455,7 @@ class _UnionDetailsPage extends State { : "", style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Colors.white, ), ), @@ -469,7 +470,7 @@ class _UnionDetailsPage extends State { S.of(context).gongxinichengweibendianhuiyuan, style: TextStyle( fontSize: 10.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Color(0xFFEDC98E), ), ) @@ -495,7 +496,7 @@ class _UnionDetailsPage extends State { style: TextStyle( fontSize: 10.sp, color: Color(0xCFFFFFFF), - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, ), ), ], @@ -572,7 +573,7 @@ class _UnionDetailsPage extends State { style: TextStyle( fontSize: 22.sp, color: Color(0xFFFF7A1A), - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, ), ), TextSpan( @@ -592,7 +593,7 @@ class _UnionDetailsPage extends State { style: TextStyle( fontSize: 36.sp, color: Color(0xFFFF7A1A), - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, ), ), ])), @@ -631,7 +632,7 @@ class _UnionDetailsPage extends State { overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 10.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xFF727272), ), ), @@ -657,7 +658,7 @@ class _UnionDetailsPage extends State { overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xFFFF7A1A), ), ), @@ -826,7 +827,7 @@ class _UnionDetailsPage extends State { : "", style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xFF000000), ), ), @@ -840,7 +841,7 @@ class _UnionDetailsPage extends State { : "", style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xFF727272), ), ), @@ -870,7 +871,7 @@ class _UnionDetailsPage extends State { ? activitys[position].startTime.split(" ")[0] : "", style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 12.sp, color: Color(0xD9FFFFFF), ),