fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

部分更改

master
w-R 3 years ago
parent
9d5f7bb1e4
commit
62bd05d682
4 changed files with 26 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lib/home/points_mall_page.dart
  2. 9
      lib/mine/vip_card_page.dart
  3. 18
      lib/mine/vip_detail_page.dart
  4. 5
      lib/order/order_detail_page.dart

2
lib/home/points_mall_page.dart
Unescape View File

@ -415,7 +415,7 @@ class _PointsMallPage extends State<PointsMallPage>
style: TextStyle( style: TextStyle(
color: Color(0xFF32A060), color: Color(0xFF32A060),
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
), ),
), ),
], ],

9
lib/mine/vip_card_page.dart
Unescape View File

@ -5,6 +5,7 @@ import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/vip_card.dart'; import 'package:huixiang/retrofit/data/vip_card.dart';
import 'package:huixiang/retrofit/retrofit_api.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/classic_header.dart';
import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/my_footer.dart'; import 'package:huixiang/view_widget/my_footer.dart';
@ -189,7 +190,7 @@ class _VipCardPage extends State<VipCardPage> {
text:S.of(context).huiyuanka, text:S.of(context).huiyuanka,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Colors.black, color: Colors.black,
), ),
), ),
@ -241,7 +242,7 @@ class _VipCardPage extends State<VipCardPage> {
text: "No.${vipCard.id}", text: "No.${vipCard.id}",
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Colors.black, color: Colors.black,
), ),
), ),
@ -254,7 +255,7 @@ class _VipCardPage extends State<VipCardPage> {
text: S.of(context).youxiaoqixian, text: S.of(context).youxiaoqixian,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Color(0Xff353535), color: Color(0Xff353535),
), ),
), ),
@ -266,7 +267,7 @@ class _VipCardPage extends State<VipCardPage> {
text: S.of(context).changqiyouxiao, text: S.of(context).changqiyouxiao,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Color(0Xff353535), color: Color(0Xff353535),
), ),
), ),

18
lib/mine/vip_detail_page.dart
Unescape View File

@ -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/order_info.dart';
import 'package:huixiang/retrofit/data/vip_card.dart'; import 'package:huixiang/retrofit/data/vip_card.dart';
import 'package:huixiang/retrofit/retrofit_api.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/location.dart';
import 'package:huixiang/utils/painter_bg.dart'; import 'package:huixiang/utils/painter_bg.dart';
import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/custom_image.dart';
@ -238,7 +239,7 @@ class _VipDetailPage extends State<VipDetailPage> {
text: S.of(context).huiyuanka, text: S.of(context).huiyuanka,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Colors.black, color: Colors.black,
), ),
), ),
@ -273,7 +274,7 @@ class _VipDetailPage extends State<VipDetailPage> {
"¥ ${vipCard != null ? vipCard.balance : ""}", "¥ ${vipCard != null ? vipCard.balance : ""}",
style: TextStyle( style: TextStyle(
fontSize: 24.sp, fontSize: 24.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Colors.black, color: Colors.black,
), ),
), ),
@ -321,7 +322,7 @@ class _VipDetailPage extends State<VipDetailPage> {
text: "0", text: "0",
style: TextStyle( style: TextStyle(
fontSize: 24.sp, fontSize: 24.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Colors.black, color: Colors.black,
), ),
), ),
@ -425,7 +426,7 @@ class _VipDetailPage extends State<VipDetailPage> {
S.of(context).chakan, S.of(context).chakan,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Color(0xff32A060), color: Color(0xff32A060),
), ),
), ),
@ -446,7 +447,7 @@ class _VipDetailPage extends State<VipDetailPage> {
"${S.of(context).dizhi}: ", "${S.of(context).dizhi}: ",
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Color(0xff353535), color: Color(0xff353535),
), ),
), ),
@ -456,7 +457,7 @@ class _VipDetailPage extends State<VipDetailPage> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Color(0xff353535), color: Color(0xff353535),
), ),
), ),
@ -480,7 +481,7 @@ class _VipDetailPage extends State<VipDetailPage> {
: "${store.openStartTime.substring(0, store.openStartTime.lastIndexOf(":"))} - ${store.openEndTime.substring(0, store.openEndTime.lastIndexOf(":"))}"), : "${store.openStartTime.substring(0, store.openStartTime.lastIndexOf(":"))} - ${store.openEndTime.substring(0, store.openEndTime.lastIndexOf(":"))}"),
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Color(0xff353535), color: Color(0xff353535),
), ),
), ),
@ -494,7 +495,7 @@ class _VipDetailPage extends State<VipDetailPage> {
.mi(((store.distance ?? 0) * 100).toInt() / 100.0), .mi(((store.distance ?? 0) * 100).toInt() / 100.0),
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Color(0xff868686), color: Color(0xff868686),
), ),
), ),
@ -552,6 +553,7 @@ class _VipDetailPage extends State<VipDetailPage> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontSize: 10.sp, fontSize: 10.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
), ),

5
lib/order/order_detail_page.dart
Unescape View File

@ -178,7 +178,9 @@ class _OrderDetailPage extends State<OrderDetailPage> {
child:*/ child:*/
Stack( Stack(
children: [ children: [
Positioned( Container(
color: Color(0xFF3A405A),
child:Positioned(
top: 0, top: 0,
left: 0, left: 0,
right: 0, right: 0,
@ -187,6 +189,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
color: Color(0xFF3A405A), color: Color(0xFF3A405A),
), ),
), ),
),
SingleChildScrollView( SingleChildScrollView(
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
child: Container( child: Container(

Write Preview
Loading…
Cancel
Save