diff --git a/lib/integral_store/integral_store_details_page.dart b/lib/integral_store/integral_store_details_page.dart index 349101ae..f0230751 100644 --- a/lib/integral_store/integral_store_details_page.dart +++ b/lib/integral_store/integral_store_details_page.dart @@ -86,7 +86,7 @@ class _IntegralStoreDetailsPage extends State { child: Text( S.of(context).duihuanguize, style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 16.sp, color: Color(0xFFFF7A1A), ), @@ -152,7 +152,7 @@ class _IntegralStoreDetailsPage extends State { style: TextStyle( fontSize: 16.sp, color: Color(0xFFFFFFFF), - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, ), ), ), @@ -213,7 +213,7 @@ class _IntegralStoreDetailsPage extends State { goods == null ? "" : goods.name, overflow: TextOverflow.ellipsis, style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 18.sp, color: Color(0xFF353535), ), @@ -253,7 +253,7 @@ class _IntegralStoreDetailsPage extends State { Text( goods == null ? "" : S.of(context).jifen_(goods.price), style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 16.sp, color: Color(0xFF32A060), ), diff --git a/lib/mine/vip_detail_page.dart b/lib/mine/vip_detail_page.dart index db2c544b..9efd6443 100644 --- a/lib/mine/vip_detail_page.dart +++ b/lib/mine/vip_detail_page.dart @@ -128,7 +128,7 @@ class _VipDetailPage extends State { overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Colors.black, ), ), @@ -234,7 +234,7 @@ class _VipDetailPage extends State { overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Colors.black, ), ), @@ -309,7 +309,7 @@ class _VipDetailPage extends State { text: S.of(context).yue, style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Colors.black, ), ), @@ -352,7 +352,7 @@ class _VipDetailPage extends State { text: S.of(context).jifen, style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Colors.black, ), ), @@ -425,7 +425,7 @@ class _VipDetailPage extends State { (store != null) ? store.storeName : "", style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Colors.black, ), ), diff --git a/lib/order/exchange_order_success_page.dart b/lib/order/exchange_order_success_page.dart index 7c9f1b17..9bbb7f0e 100644 --- a/lib/order/exchange_order_success_page.dart +++ b/lib/order/exchange_order_success_page.dart @@ -6,6 +6,7 @@ import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/border_text.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/round_button.dart'; @@ -76,7 +77,7 @@ class _ExchangeOrderSuccessPage extends State { style: TextStyle( color: Color(0xFF353535), fontSize: 21.sp, - fontWeight: FontWeight.bold), + fontWeight: MyFontWeight.semi_bold), ), SizedBox( height: 70.h, @@ -91,7 +92,7 @@ class _ExchangeOrderSuccessPage extends State { style: TextStyle( color: Colors.black, fontSize: 21.sp, - fontWeight: FontWeight.bold), + fontWeight: MyFontWeight.semi_bold), ), SizedBox( height: 14.h, @@ -121,7 +122,7 @@ class _ExchangeOrderSuccessPage extends State { style: TextStyle( color: Colors.black, fontSize: 21.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, ), ), SizedBox( @@ -160,7 +161,7 @@ class _ExchangeOrderSuccessPage extends State { text: S.of(context).jixuduihuan, textColor: Color(0xFF32A060), fontSize: 16.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, borderColor: Color(0xFF32A060), borderWidth: 1, padding: EdgeInsets.only(top: 12.h, bottom: 12.h), @@ -181,7 +182,7 @@ class _ExchangeOrderSuccessPage extends State { textColor: Colors.white, backgroup: Color(0xFF32A060), radius: 4, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 16.sp, padding: EdgeInsets.only(top: 12.h, bottom: 12.h), ), diff --git a/lib/view_widget/mine_vip_view.dart b/lib/view_widget/mine_vip_view.dart index 06ff8692..622cd2b6 100644 --- a/lib/view_widget/mine_vip_view.dart +++ b/lib/view_widget/mine_vip_view.dart @@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:huixiang/retrofit/data/rank.dart'; import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/utils/flutter_utils.dart'; +import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/login_tips_dialog.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -162,7 +163,7 @@ class MineVipView extends StatelessWidget { topLeft, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Colors.white, ), ), @@ -173,7 +174,7 @@ class MineVipView extends StatelessWidget { levelText, style: TextStyle( color: textColor, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 23.sp, ), ), @@ -215,7 +216,7 @@ class MineVipView extends StatelessWidget { overflow: TextOverflow.ellipsis, style: TextStyle( color: textColor, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, fontSize: 14.sp, ), ), @@ -228,7 +229,7 @@ class MineVipView extends StatelessWidget { text: "$rank", style: TextStyle( fontSize: 26.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: textColor, ), ), @@ -237,7 +238,7 @@ class MineVipView extends StatelessWidget { text: rankMax > 0 ? "/$rankMax" : "/0", style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: textColor, ), ), @@ -268,7 +269,7 @@ class MineVipView extends StatelessWidget { : "$createTime"), style: TextStyle( color: textColor, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, fontSize: 12.sp, ), ),