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 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 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 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 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 with TickerProviderStateMixin { color: Color(0xff727272), fontSize: 14.sp, height: 1.3.h, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, ), ), SizedBox( diff --git a/lib/mine/vip_card_page.dart b/lib/mine/vip_card_page.dart index 55cb6dfd..fb3d596c 100644 --- a/lib/mine/vip_card_page.dart +++ b/lib/mine/vip_card_page.dart @@ -32,8 +32,7 @@ class _VipCardPage extends State { _refreshController = RefreshController(); SharedPreferences.getInstance().then((value) { - apiService = - ApiService(Dio(), context: context, token: value.getString("token")); + apiService = ApiService(Dio(), context: context, token: value.getString("token")); queryVipCard(); }); } @@ -41,8 +40,7 @@ class _VipCardPage extends State { List coupons = []; queryVipCard() async { - BaseData> baseData = - await apiService.vipList({}).catchError((error) { + BaseData> baseData = await apiService.vipList({}).catchError((error) { _refreshController.refreshFailed(); }); if (baseData != null && baseData.isSuccess) { @@ -72,27 +70,24 @@ class _VipCardPage extends State { controller: _refreshController, onRefresh: queryVipCard, physics: BouncingScrollPhysics(), - child: (coupons != null && coupons.length > 0) - ? ListView.builder( - padding: EdgeInsets.symmetric(vertical: 8.h), - itemBuilder: (context, position) { - return GestureDetector( - onTap: () { - Navigator.of(context).pushNamed( - '/router/vip_details_page', - arguments: {"id": coupons[position].id}); - }, - child: vipCardItem(coupons[position]), - ); - }, - itemCount: coupons != null ? coupons.length : 0, - ) - : NoDataView( - isShowBtn: false, - text: "还没有会员卡~", - fontSize: 16.sp, - margin: EdgeInsets.only(top: 120.h), - ), + child: (coupons != null && coupons.length > 0) ? ListView.builder( + padding: EdgeInsets.symmetric(vertical: 8.h), + itemBuilder: (context, position) { + return GestureDetector( + onTap: () { + Navigator.of(context).pushNamed('/router/vip_details_page', + arguments: {"id": coupons[position].id}); + }, + child: vipCardItem(coupons[position]), + ); + }, + itemCount: coupons != null ? coupons.length : 0, + ) : NoDataView( + isShowBtn: false, + text: "还没有会员卡~", + fontSize: 16.sp, + margin: EdgeInsets.only(top: 120.h), + ), ), ), ); @@ -234,8 +229,8 @@ class _VipCardPage extends State { color: Colors.black, ), ), - ], - ), + ), + ],), ), ], ), 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 { 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 { 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 { 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 { logistics.acceptStation, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xff353535)), ), ],