From 62bd05d682fbe6b603338bce3c2b07bf88f65942 Mon Sep 17 00:00:00 2001 From: w-R <953969641@qq.com> Date: Wed, 25 Aug 2021 18:40:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/home/points_mall_page.dart | 2 +- lib/mine/vip_card_page.dart | 9 +++++---- lib/mine/vip_detail_page.dart | 18 ++++++++++-------- lib/order/order_detail_page.dart | 17 ++++++++++------- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/lib/home/points_mall_page.dart b/lib/home/points_mall_page.dart index 332854dd..d905d067 100644 --- a/lib/home/points_mall_page.dart +++ b/lib/home/points_mall_page.dart @@ -415,7 +415,7 @@ class _PointsMallPage extends State style: TextStyle( color: Color(0xFF32A060), fontSize: 14.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, ), ), ], diff --git a/lib/mine/vip_card_page.dart b/lib/mine/vip_card_page.dart index 9cb78631..d66e9ddf 100644 --- a/lib/mine/vip_card_page.dart +++ b/lib/mine/vip_card_page.dart @@ -5,6 +5,7 @@ import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/vip_card.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/my_footer.dart'; @@ -189,7 +190,7 @@ class _VipCardPage extends State { text:S.of(context).huiyuanka, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Colors.black, ), ), @@ -241,7 +242,7 @@ class _VipCardPage extends State { text: "No.${vipCard.id}", style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Colors.black, ), ), @@ -254,7 +255,7 @@ class _VipCardPage extends State { text: S.of(context).youxiaoqixian, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0Xff353535), ), ), @@ -266,7 +267,7 @@ class _VipCardPage extends State { text: S.of(context).changqiyouxiao, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0Xff353535), ), ), diff --git a/lib/mine/vip_detail_page.dart b/lib/mine/vip_detail_page.dart index fa74cca3..d1d76aea 100644 --- a/lib/mine/vip_detail_page.dart +++ b/lib/mine/vip_detail_page.dart @@ -6,6 +6,7 @@ import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/order_info.dart'; import 'package:huixiang/retrofit/data/vip_card.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/location.dart'; import 'package:huixiang/utils/painter_bg.dart'; import 'package:huixiang/view_widget/custom_image.dart'; @@ -238,7 +239,7 @@ class _VipDetailPage extends State { text: S.of(context).huiyuanka, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Colors.black, ), ), @@ -273,7 +274,7 @@ class _VipDetailPage extends State { "¥ ${vipCard != null ? vipCard.balance : ""}", style: TextStyle( fontSize: 24.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Colors.black, ), ), @@ -321,7 +322,7 @@ class _VipDetailPage extends State { text: "0", style: TextStyle( fontSize: 24.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Colors.black, ), ), @@ -425,7 +426,7 @@ class _VipDetailPage extends State { S.of(context).chakan, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Color(0xff32A060), ), ), @@ -446,7 +447,7 @@ class _VipDetailPage extends State { "${S.of(context).dizhi}: ", style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xff353535), ), ), @@ -456,7 +457,7 @@ class _VipDetailPage extends State { overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xff353535), ), ), @@ -480,7 +481,7 @@ class _VipDetailPage extends State { : "${store.openStartTime.substring(0, store.openStartTime.lastIndexOf(":"))} - ${store.openEndTime.substring(0, store.openEndTime.lastIndexOf(":"))}"), style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xff353535), ), ), @@ -494,7 +495,7 @@ class _VipDetailPage extends State { .mi(((store.distance ?? 0) * 100).toInt() / 100.0), style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xff868686), ), ), @@ -552,6 +553,7 @@ class _VipDetailPage extends State { overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 10.sp, + fontWeight: MyFontWeight.regular, color: Color(0xFF353535), ), ), diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index 9582ca60..ebce206c 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -178,13 +178,16 @@ class _OrderDetailPage extends State { child:*/ Stack( children: [ - Positioned( - top: 0, - left: 0, - right: 0, - child: Container( - height: 36.h, - color: Color(0xFF3A405A), + Container( + color: Color(0xFF3A405A), + child:Positioned( + top: 0, + left: 0, + right: 0, + child: Container( + height: 36.h, + color: Color(0xFF3A405A), + ), ), ), SingleChildScrollView(