From dcccc21f94f1a26939c85b4ef220dc06b31321a6 Mon Sep 17 00:00:00 2001
From: w-R <953969641@qq.com>
Date: Thu, 2 Sep 2021 09:42:50 +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/login/login_page.dart                 | 11 ++++++-----
 lib/order/logistics_information_page.dart |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/login/login_page.dart b/lib/login/login_page.dart
index 2cb39be3..72ca940a 100644
--- a/lib/login/login_page.dart
+++ b/lib/login/login_page.dart
@@ -10,6 +10,7 @@ import 'package:huixiang/retrofit/data/base_data.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/retrofit/data/user_entity.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:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -523,7 +524,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
                                         S.of(context).login_splash,
                                         style: TextStyle(
                                           fontSize: 18.sp,
-                                          fontWeight: FontWeight.w400,
+                                          fontWeight: MyFontWeight.regular,
                                           color: Color(0xFF32A060),
                                         ),
                                       ),
@@ -561,7 +562,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
                     S.of(context).login,
                     style: TextStyle(
                         fontSize: 18.sp,
-                        fontWeight: FontWeight.w400,
+                        fontWeight: MyFontWeight.regular,
                         color: Colors.white),
                   ),
                 ),
@@ -947,7 +948,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
                           TextSpan(
                             text: S.of(context).yinsizhengce1,
                             style: TextStyle(
-                              fontWeight: FontWeight.w500,
+                              fontWeight: MyFontWeight.medium,
                               fontSize: 14.sp,
                               height: 1.3.h,
                               color: Color(0xff727272),
@@ -956,7 +957,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
                           TextSpan(
                             text: S.of(context).yinsixieyi,
                             style: TextStyle(
-                                fontWeight: FontWeight.w500,
+                                fontWeight: MyFontWeight.medium,
                                 fontSize: 14.sp,
                                 color: Color(0xff32A060)),
                             recognizer: TapGestureRecognizer()
@@ -976,7 +977,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
                           color: Color(0xff727272),
                           fontSize: 14.sp,
                           height: 1.3.h,
-                          fontWeight: FontWeight.w500,
+                          fontWeight: MyFontWeight.medium,
                         ),
                       ),
                       SizedBox(
diff --git a/lib/order/logistics_information_page.dart b/lib/order/logistics_information_page.dart
index 12f5f239..b2799d7e 100644
--- a/lib/order/logistics_information_page.dart
+++ b/lib/order/logistics_information_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/logistics.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:flutter_screenutil/flutter_screenutil.dart';
 import 'package:huixiang/view_widget/no_data_view.dart';
@@ -320,7 +321,7 @@ class _LogisticsInformationPage extends State<LogisticsInformationPage> {
               logistics.acceptTime.split(" ")[0],
               style: TextStyle(
                   fontSize: 14.sp,
-                  fontWeight: FontWeight.w500,
+                  fontWeight: MyFontWeight.medium,
                   color: Color(0xff353535)),
             ),
             SizedBox(
@@ -330,7 +331,7 @@ class _LogisticsInformationPage extends State<LogisticsInformationPage> {
               logistics.acceptTime.split(" ")[1],
               style: TextStyle(
                   fontSize: 12.sp,
-                  fontWeight: FontWeight.w500,
+                  fontWeight: MyFontWeight.medium,
                   color: Color(0xff868686)),
             ),
           ],
@@ -368,7 +369,7 @@ class _LogisticsInformationPage extends State<LogisticsInformationPage> {
                   logisticsTripStatus(logistics.acceptStation),
                   style: TextStyle(
                       fontSize: 14.sp,
-                      fontWeight: FontWeight.w500,
+                      fontWeight: MyFontWeight.medium,
                       color: Colors.black),
                 ),
               SizedBox(
@@ -378,7 +379,7 @@ class _LogisticsInformationPage extends State<LogisticsInformationPage> {
                 logistics.acceptStation,
                 style: TextStyle(
                     fontSize: 12.sp,
-                    fontWeight: FontWeight.w400,
+                    fontWeight: MyFontWeight.regular,
                     color: Color(0xff353535)),
               ),
             ],