From bca3d3f832ca40d3d7b88903180976877f398d45 Mon Sep 17 00:00:00 2001
From: w-R <953969641@qq.com>
Date: Wed, 1 Sep 2021 16:46:05 +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/main_page.dart                         | 5 +++--
 lib/mine/vip_card_page.dart                | 2 +-
 lib/order/write_off_page.dart              | 3 ++-
 lib/view_widget/cupertino_date_picker.dart | 7 ++++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/main_page.dart b/lib/main_page.dart
index 7c82ca14..b939c58b 100644
--- a/lib/main_page.dart
+++ b/lib/main_page.dart
@@ -15,6 +15,7 @@ import 'package:huixiang/union/union_page.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:huixiang/utils/bridge.dart';
 import 'package:huixiang/utils/event_type.dart';
+import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/utils/native_event_handler.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -320,7 +321,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
                 text,
                 style: TextStyle(
                   fontSize: 10,
-                  fontWeight: FontWeight.bold,
+                  fontWeight: MyFontWeight.semi_bold,
                   color: Color(isSelected ? 0xFF4C4C4C : 0xFFA29E9E),
                 ),
               ),
@@ -385,7 +386,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
                   text,
                   style: TextStyle(
                     fontSize: 10.sp,
-                    fontWeight: FontWeight.bold,
+                    fontWeight: MyFontWeight.semi_bold,
                     color: Color(isSelected ? 0xFF4C4C4C : 0xFFA29E9E),
                   ),
                 ),
diff --git a/lib/mine/vip_card_page.dart b/lib/mine/vip_card_page.dart
index d66e9ddf..af88735b 100644
--- a/lib/mine/vip_card_page.dart
+++ b/lib/mine/vip_card_page.dart
@@ -219,7 +219,7 @@ class _VipCardPage extends State<VipCardPage> {
                           text:S.of(context).chakanxiangqing,
                           style: TextStyle(
                             fontSize: 12.sp,
-                            fontWeight: FontWeight.bold,
+                            fontWeight: MyFontWeight.semi_bold,
                             color: Colors.black,
                           ),
                         ),
diff --git a/lib/order/write_off_page.dart b/lib/order/write_off_page.dart
index 6f234eb5..b7cd6997 100644
--- a/lib/order/write_off_page.dart
+++ b/lib/order/write_off_page.dart
@@ -2,6 +2,7 @@ import 'package:barcode_widget/barcode_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/coupon.dart';
+import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
 import 'package:huixiang/view_widget/separator.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -120,7 +121,7 @@ class _WriteOffPage extends State<WriteOffPage> {
                                     : (MediaQuery.of(context).size.width -
                                             64.w) /
                                         (((coupon.id.length) * 4)),
-                                fontWeight: FontWeight.bold,
+                                fontWeight: MyFontWeight.semi_bold,
                                 color: Color(0xFF353535),
                               ),
                             ),
diff --git a/lib/view_widget/cupertino_date_picker.dart b/lib/view_widget/cupertino_date_picker.dart
index 80ce6a60..96d66cc2 100644
--- a/lib/view_widget/cupertino_date_picker.dart
+++ b/lib/view_widget/cupertino_date_picker.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class CupertinoDatePickerWidget extends StatelessWidget {
 
@@ -19,7 +20,7 @@ class CupertinoDatePickerWidget extends StatelessWidget {
       child: Column(
         children: [
           Container(
-            height: 50,
+            height: 50.h,
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               crossAxisAlignment: CrossAxisAlignment.center,
@@ -60,11 +61,11 @@ class CupertinoDatePickerWidget extends StatelessWidget {
             ),
           ),
           Container(
-            height: 2,
+            height: 2.h,
             color: Color(0xFFF4F4F4),
           ),
           Container(
-            height: 200,
+            height: 200.h,
             child: CupertinoDatePicker(
               mode: CupertinoDatePickerMode.date,
               backgroundColor: Colors.white,