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

更改

master
w-R 3 years ago
parent
295037c02e
commit
dcccc21f94
2 changed files with 11 additions and 9 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. 11
      lib/login/login_page.dart
  2. 9
      lib/order/logistics_information_page.dart

11
lib/login/login_page.dart
Unescape View File

@ -10,6 +10,7 @@ import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/retrofit/data/user_entity.dart'; import 'package:huixiang/retrofit/data/user_entity.dart';
import 'package:huixiang/utils/event_type.dart'; import 'package:huixiang/utils/event_type.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/border_text.dart'; import 'package:huixiang/view_widget/border_text.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -523,7 +524,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
S.of(context).login_splash, S.of(context).login_splash,
style: TextStyle( style: TextStyle(
fontSize: 18.sp, fontSize: 18.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Color(0xFF32A060), color: Color(0xFF32A060),
), ),
), ),
@ -561,7 +562,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
S.of(context).login, S.of(context).login,
style: TextStyle( style: TextStyle(
fontSize: 18.sp, fontSize: 18.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Colors.white), color: Colors.white),
), ),
), ),
@ -947,7 +948,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
TextSpan( TextSpan(
text: S.of(context).yinsizhengce1, text: S.of(context).yinsizhengce1,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
fontSize: 14.sp, fontSize: 14.sp,
height: 1.3.h, height: 1.3.h,
color: Color(0xff727272), color: Color(0xff727272),
@ -956,7 +957,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
TextSpan( TextSpan(
text: S.of(context).yinsixieyi, text: S.of(context).yinsixieyi,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xff32A060)), color: Color(0xff32A060)),
recognizer: TapGestureRecognizer() recognizer: TapGestureRecognizer()
@ -976,7 +977,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
color: Color(0xff727272), color: Color(0xff727272),
fontSize: 14.sp, fontSize: 14.sp,
height: 1.3.h, height: 1.3.h,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
), ),
), ),
SizedBox( SizedBox(

9
lib/order/logistics_information_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/logistics.dart'; import 'package:huixiang/retrofit/data/logistics.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/my_appbar.dart'; import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/no_data_view.dart'; import 'package:huixiang/view_widget/no_data_view.dart';
@ -320,7 +321,7 @@ class _LogisticsInformationPage extends State<LogisticsInformationPage> {
logistics.acceptTime.split(" ")[0], logistics.acceptTime.split(" ")[0],
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Color(0xff353535)), color: Color(0xff353535)),
), ),
SizedBox( SizedBox(
@ -330,7 +331,7 @@ class _LogisticsInformationPage extends State<LogisticsInformationPage> {
logistics.acceptTime.split(" ")[1], logistics.acceptTime.split(" ")[1],
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Color(0xff868686)), color: Color(0xff868686)),
), ),
], ],
@ -368,7 +369,7 @@ class _LogisticsInformationPage extends State<LogisticsInformationPage> {
logisticsTripStatus(logistics.acceptStation), logisticsTripStatus(logistics.acceptStation),
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Colors.black), color: Colors.black),
), ),
SizedBox( SizedBox(
@ -378,7 +379,7 @@ class _LogisticsInformationPage extends State<LogisticsInformationPage> {
logistics.acceptStation, logistics.acceptStation,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Color(0xff353535)), color: Color(0xff353535)),
), ),
], ],

Write Preview
Loading…
Cancel
Save