diff --git a/lib/home/huixiang_brand_page.dart b/lib/home/huixiang_brand_page.dart index 81e6d053..f93693f6 100644 --- a/lib/home/huixiang_brand_page.dart +++ b/lib/home/huixiang_brand_page.dart @@ -1,12 +1,10 @@ import 'package:dio/dio.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_html/image_render.dart'; -import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/main.dart'; import 'package:huixiang/retrofit/data/banner.dart'; @@ -15,11 +13,8 @@ import 'package:huixiang/retrofit/data/brand.dart'; import 'package:huixiang/retrofit/data/brand_data.dart'; import 'package:huixiang/retrofit/data/page.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; -import 'package:huixiang/utils/MyPainter.dart'; import 'package:huixiang/utils/event_type.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:flutter_screenutil/flutter_screenutil.dart'; import 'package:huixiang/view_widget/store_title_tab.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; diff --git a/lib/home/huixiang_view/huixiang_banner.dart b/lib/home/huixiang_view/huixiang_banner.dart index df2ca872..13c03321 100644 --- a/lib/home/huixiang_view/huixiang_banner.dart +++ b/lib/home/huixiang_view/huixiang_banner.dart @@ -3,7 +3,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:huixiang/retrofit/data/banner.dart'; import 'package:huixiang/view_widget/custom_image.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class HuiXiangBanner extends StatefulWidget { diff --git a/lib/home/huixiang_view/origin_info.dart b/lib/home/huixiang_view/origin_info.dart index e31a0e5b..ad3dcb18 100644 --- a/lib/home/huixiang_view/origin_info.dart +++ b/lib/home/huixiang_view/origin_info.dart @@ -225,7 +225,7 @@ class _OriginInfo extends State { alignment: Alignment.center, children: [ Container( - width: 63.h, + width: 63.w, height: 63.h, child: Stack( alignment: Alignment.center, @@ -239,7 +239,7 @@ class _OriginInfo extends State { Text( text, style: TextStyle( - fontSize: 18, + fontSize: 18.sp, fontWeight: MyFontWeight.light, color: Colors.white, ), @@ -248,7 +248,7 @@ class _OriginInfo extends State { ), ), Container( - width: 73, + width: 73.w, height: 73.h, child: CustomPaint( painter: MyPainter( diff --git a/lib/mine/manage_address_page.dart b/lib/mine/manage_address_page.dart index a74868c1..4ec9d1a7 100644 --- a/lib/mine/manage_address_page.dart +++ b/lib/mine/manage_address_page.dart @@ -5,6 +5,7 @@ import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/address.dart'; import 'package:huixiang/retrofit/data/base_data.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/icon_text.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; @@ -101,7 +102,7 @@ class _ManageAddressPage extends State { child: Text( "新增地址", style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 16.sp, color: Colors.white, ), @@ -152,7 +153,7 @@ class _ManageAddressPage extends State { address.username, style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Colors.black, ), ), @@ -191,7 +192,7 @@ class _ManageAddressPage extends State { textAxisAlignment: CrossAxisAlignment.start, textStyle: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF353535), ), leftIcon: Icons.location_on, @@ -228,7 +229,7 @@ class _ManageAddressPage extends State { "", style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: address.isDefault ? Color(0xFF39B54A) : Color(0xFFA29E9E), @@ -244,7 +245,7 @@ class _ManageAddressPage extends State { "删除", style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Colors.black, ), ), diff --git a/lib/mine/mine_vip_level_page.dart b/lib/mine/mine_vip_level_page.dart index 83ef7a84..1822f2b4 100644 --- a/lib/mine/mine_vip_level_page.dart +++ b/lib/mine/mine_vip_level_page.dart @@ -7,6 +7,7 @@ import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/rank.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/view_widget/mine_vip_view.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; @@ -107,7 +108,7 @@ class _MineVipLevelPage extends State { Text( S.of(context).huiyuandengjishuoming, style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 16.sp, color: Colors.black, ), @@ -134,7 +135,7 @@ class _MineVipLevelPage extends State { style: TextStyle( textBaseline: TextBaseline.alphabetic, fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF353535), ), ), @@ -154,7 +155,7 @@ class _MineVipLevelPage extends State { S.of(context).huiyuandengji, textAlign: TextAlign.center, style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 14.sp, color: Color(0xFF353535), ), @@ -166,7 +167,7 @@ class _MineVipLevelPage extends State { S.of(context).jifen, textAlign: TextAlign.center, style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 14.sp, color: Color(0xFF353535), ), @@ -198,7 +199,7 @@ class _MineVipLevelPage extends State { Text( S.of(context).jifendejisuanshuoming, style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, fontSize: 16.sp, color: Colors.black, ), @@ -224,7 +225,7 @@ class _MineVipLevelPage extends State { style: TextStyle( textBaseline: TextBaseline.alphabetic, fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.semi_bold, color: Color(0xFF353535), ), ), @@ -252,7 +253,7 @@ class _MineVipLevelPage extends State { S.of(context).youhuiquanwufajileijifen, style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.semi_bold, color: Color(0xFF353535), ), ), @@ -282,7 +283,7 @@ class _MineVipLevelPage extends State { textAlign: TextAlign.center, style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF353535), ), ), @@ -294,7 +295,7 @@ class _MineVipLevelPage extends State { textAlign: TextAlign.center, style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF353535), ), ), diff --git a/lib/order/store_selector_page.dart b/lib/order/store_selector_page.dart index 9b037b6a..3adafc4f 100644 --- a/lib/order/store_selector_page.dart +++ b/lib/order/store_selector_page.dart @@ -13,6 +13,7 @@ import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/store.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/icon_text.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/request_permission.dart'; @@ -282,7 +283,7 @@ class _StoreSelectorPage extends State { style: TextStyle( fontSize: 16.sp, color: Color(0xFFFFFFFF), - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, ), ), ), @@ -320,7 +321,7 @@ class _StoreSelectorPage extends State { store.storeName, style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xFF353535), ), ), diff --git a/lib/view_widget/cupertino_date_picker.dart b/lib/view_widget/cupertino_date_picker.dart index 96d66cc2..ae9f77cd 100644 --- a/lib/view_widget/cupertino_date_picker.dart +++ b/lib/view_widget/cupertino_date_picker.dart @@ -1,6 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:huixiang/utils/font_weight.dart'; class CupertinoDatePickerWidget extends StatelessWidget { @@ -34,7 +35,7 @@ class CupertinoDatePickerWidget extends StatelessWidget { "取消", style: TextStyle( fontSize: 16, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Colors.black), ), margin: EdgeInsets.only(left: 6), @@ -50,7 +51,7 @@ class CupertinoDatePickerWidget extends StatelessWidget { "确认", style: TextStyle( fontSize: 16, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xFF32A060)), ), margin: EdgeInsets.only(left: 6), diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index ba2b18d7..d754645b 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/coupon.dart'; +import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/separator.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -76,7 +77,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).shangjiaquan, style: TextStyle( fontSize: 10.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Color(0xFFFF7A1A), ), ), @@ -90,7 +91,7 @@ class NewCouponWidget extends StatelessWidget { overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xff353535), ), ), @@ -222,7 +223,7 @@ class NewCouponWidget extends StatelessWidget { "¥", style: TextStyle( fontSize: 22.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Color(0xff32A060), ), ), @@ -237,7 +238,7 @@ class NewCouponWidget extends StatelessWidget { : "", style: TextStyle( fontSize: 40.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xff32A060), ), ), @@ -252,7 +253,7 @@ class NewCouponWidget extends StatelessWidget { : ""), style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xff32A060), ), ), @@ -271,7 +272,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).duihuanquan, style: TextStyle( fontSize: 25.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xff32A060), ), ), @@ -282,7 +283,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).xianxiashiyong, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xff32A060), ), ), @@ -306,7 +307,7 @@ class NewCouponWidget extends StatelessWidget { : "", style: TextStyle( fontSize: 40.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xff32A060), ), ), @@ -317,7 +318,7 @@ class NewCouponWidget extends StatelessWidget { "折", style: TextStyle( fontSize: 20.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xff32A060), ), ), @@ -328,7 +329,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).quanchangtongyong, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xff32A060), ), ), @@ -356,7 +357,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).lingqu, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Colors.white, ), ), @@ -376,7 +377,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).yilingqu, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Colors.white, ), ), @@ -403,7 +404,7 @@ class NewCouponWidget extends StatelessWidget { : S.of(context).qushiyong, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Colors.white, ), ), @@ -425,7 +426,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).yishiyong, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Colors.white, ), ), @@ -446,7 +447,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).yishixiao, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Colors.white, ), ),