Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app

 Conflicts:

	lib/mine/vip_card_page.dart

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),
                   ),
                 ),

lib/mine/vip_card_page.dart

@@ -224,15 +224,13 @@ class _VipCardPage extends State<VipCardPage> {
                       size: 24,
                     ),
                     Text.rich(
-                      TextSpan(
-                        children: [
-                          TextSpan(
-                            text: S.of(context).chakanxiangqing,
-                            style: TextStyle(
-                              fontSize: 12.sp,
-                              fontWeight: FontWeight.bold,
-                              color: Colors.black,
-                            ),
+                      TextSpan(children: [
+                        TextSpan(
+                          text:S.of(context).chakanxiangqing,
+                          style: TextStyle(
+                            fontSize: 12.sp,
+                            fontWeight: MyFontWeight.semi_bold,
+                            color: Colors.black,
                           ),
                         ],
                       ),

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),
                               ),
                             ),

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,