From 6e80a574b5af5b0a1a3690794cb5d2cb96a9eac5 Mon Sep 17 00:00:00 2001 From: w-R <953969641@qq.com> Date: Fri, 27 Aug 2021 18:34:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/home/activity_list_page.dart | 12 ++++++------ lib/mine/mine_page.dart | 2 +- lib/order/write_off_success_page.dart | 7 ++++--- lib/setting/setting_page.dart | 8 ++++---- lib/setting/treaty_page.dart | 15 ++++++++------- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/home/activity_list_page.dart b/lib/home/activity_list_page.dart index dfe9a4ec..37db22d1 100644 --- a/lib/home/activity_list_page.dart +++ b/lib/home/activity_list_page.dart @@ -7,9 +7,9 @@ import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/page.dart'; import 'package:huixiang/retrofit/retrofit_api.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:huixiang/view_widget/my_footer.dart'; import 'package:keframe/frame_separate_widget.dart'; import 'package:keframe/size_cache_widget.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; @@ -164,7 +164,7 @@ class _ActivityListPage extends State<ActivityListPage> maxLines: 1, overflow: TextOverflow.ellipsis, style: TextStyle( - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, fontSize: 14.sp, color: Colors.black, ), @@ -178,7 +178,7 @@ class _ActivityListPage extends State<ActivityListPage> overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 10.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF4C4C4C), ), ), @@ -198,7 +198,7 @@ class _ActivityListPage extends State<ActivityListPage> activity.storeName == null ? "" : activity.storeName, style: TextStyle( color: Color(0xFF060606), - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, fontSize: 12.sp, ), ), @@ -211,7 +211,7 @@ class _ActivityListPage extends State<ActivityListPage> style: TextStyle( color: Color(0xFFB5B5B5), fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, ), ), SizedBox( @@ -222,7 +222,7 @@ class _ActivityListPage extends State<ActivityListPage> style: TextStyle( color: Color(0xFFB5B5B5), fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, ), ), ], diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart index 84eb733b..e97924cb 100644 --- a/lib/mine/mine_page.dart +++ b/lib/mine/mine_page.dart @@ -676,7 +676,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin { style: TextStyle( color: Colors.black, fontSize: 12.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, ), ), Icon( diff --git a/lib/order/write_off_success_page.dart b/lib/order/write_off_success_page.dart index d01ec507..4c08e336 100644 --- a/lib/order/write_off_success_page.dart +++ b/lib/order/write_off_success_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/round_button.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -45,7 +46,7 @@ class _WriteOffSuccessPage extends State<WriteOffSuccessPage> { style: TextStyle( color: Color(0xFF353535), fontSize: 21.sp, - fontWeight: FontWeight.bold), + fontWeight: MyFontWeight.semi_bold), ), SizedBox( height: 12.h, @@ -55,7 +56,7 @@ class _WriteOffSuccessPage extends State<WriteOffSuccessPage> { style: TextStyle( color: Color(0xFF727272), fontSize: 12.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, ), ), SizedBox( @@ -68,7 +69,7 @@ class _WriteOffSuccessPage extends State<WriteOffSuccessPage> { 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/setting/setting_page.dart b/lib/setting/setting_page.dart index 1b81ff8c..4fad9362 100644 --- a/lib/setting/setting_page.dart +++ b/lib/setting/setting_page.dart @@ -164,7 +164,7 @@ class _SettingPage extends State<SettingPage> { backgroup: Color(0xFF32A060), textColor: Colors.white, fontSize: 16.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, ), ), ), @@ -262,7 +262,7 @@ class _SettingPage extends State<SettingPage> { child: Text( left, style: TextStyle( - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, fontSize: 14.sp, color: Color(0xFF353535), ), @@ -273,7 +273,7 @@ class _SettingPage extends State<SettingPage> { right, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF727272)), ), SizedBox( @@ -312,7 +312,7 @@ class _SettingPage extends State<SettingPage> { style: TextStyle( fontSize: 14.sp, color: Color(0xFF353535), - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, ), ), ), diff --git a/lib/setting/treaty_page.dart b/lib/setting/treaty_page.dart index bc026423..019e5b32 100644 --- a/lib/setting/treaty_page.dart +++ b/lib/setting/treaty_page.dart @@ -1,6 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -58,7 +59,7 @@ class _TreatyPage extends State<TreatyPage> { "用戶註冊及使用App隱私協議", style: TextStyle( fontSize: 18.sp, - fontWeight: FontWeight.w600, + fontWeight: MyFontWeight.semi_bold, color: Color(0xff00A359), ), ), @@ -80,7 +81,7 @@ class _TreatyPage extends State<TreatyPage> { "一、賬號註冊", style: TextStyle( fontSize: 18.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, height: 1.2, color: Color(0xff32A060)), ), @@ -97,7 +98,7 @@ class _TreatyPage extends State<TreatyPage> { "二、用戶個人隱私信息保護", style: TextStyle( fontSize: 18.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, height: 1.2, color: Color(0xff32A060)), ), @@ -117,7 +118,7 @@ class _TreatyPage extends State<TreatyPage> { "三、用戶發佈內容規範", style: TextStyle( fontSize: 18.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, height: 1.2, color: Color(0xff32A060)), ), @@ -142,7 +143,7 @@ class _TreatyPage extends State<TreatyPage> { "四、使用規則", style: TextStyle( fontSize: 18.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, height: 1.2, color: Color(0xff32A060)), ), @@ -164,7 +165,7 @@ class _TreatyPage extends State<TreatyPage> { "五、其他", style: TextStyle( fontSize: 18.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, height: 1.2, color: Color(0xff32A060)), ), @@ -191,7 +192,7 @@ class _TreatyPage extends State<TreatyPage> { text, style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, height: 1.7, color: Colors.black), ),