diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index ed8838f7..b50de1e0 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -409,6 +409,7 @@ class MessageLookup extends MessageLookupByLibrary { "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"), "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"), "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("请输入详细收货地址"), + "shouhuodizhi1" : MessageLookupByLibrary.simpleMessage("收货地址"), "shouhuorenshoujihao" : MessageLookupByLibrary.simpleMessage("请输入收货人手机号"), "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人详细地址"), "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("请输入收货人姓名"), diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index 91d22c28..db91a4ac 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -408,6 +408,7 @@ class MessageLookup extends MessageLookupByLibrary { "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"), "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"), "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("请输入详细收货地址"), + "shouhuodizhi1" : MessageLookupByLibrary.simpleMessage("收货地址"), "shouhuorenshoujihao" : MessageLookupByLibrary.simpleMessage("请输入收货人手机号"), "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人详细地址"), "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("请输入收货人姓名"), diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index b2b69bfe..b5035795 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_CN.dart @@ -408,6 +408,7 @@ class MessageLookup extends MessageLookupByLibrary { "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"), "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"), "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("请输入详细收货地址"), + "shouhuodizhi1" : MessageLookupByLibrary.simpleMessage("收货地址"), "shouhuorenshoujihao" : MessageLookupByLibrary.simpleMessage("请输入收货人手机号"), "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人详细地址"), "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("请输入收货人姓名"), diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart index 9b15cb4c..8797ea19 100644 --- a/lib/generated/intl/messages_zh_Hant_CN.dart +++ b/lib/generated/intl/messages_zh_Hant_CN.dart @@ -408,6 +408,7 @@ class MessageLookup extends MessageLookupByLibrary { "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"), "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"), "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("請輸入詳細收貨地址"), + "shouhuodizhi1" : MessageLookupByLibrary.simpleMessage("收貨地址"), "shouhuorenshoujihao" : MessageLookupByLibrary.simpleMessage("請輸入收貨人手機號"), "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人詳細地址"), "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("請輸入收貨人姓名"), diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index 83fca203..838f628e 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/lib/generated/intl/messages_zh_TW.dart @@ -408,6 +408,7 @@ class MessageLookup extends MessageLookupByLibrary { "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"), "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"), "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("請輸入詳細收貨地址"), + "shouhuodizhi1" : MessageLookupByLibrary.simpleMessage("收貨地址"), "shouhuorenshoujihao" : MessageLookupByLibrary.simpleMessage("請輸入收貨人手機號"), "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人詳細地址"), "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("請輸入收貨人姓名"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index bdf2ef63..ee69ab13 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -2005,11 +2005,11 @@ class S { ); } - /// `请输入详细收货地址` - String get shouhuodizhi { + /// `收货地址` + String get shouhuodizhi1 { return Intl.message( - '请输入详细收货地址', - name: 'shouhuodizhi', + '收货地址', + name: 'shouhuodizhi1', desc: '', args: [], ); @@ -4125,6 +4125,16 @@ class S { ); } + /// `请输入详细收货地址` + String get shouhuodizhi { + return Intl.message( + '请输入详细收货地址', + name: 'shouhuodizhi', + desc: '', + args: [], + ); + } + /// `详细地址` String get xiangxidizhi { return Intl.message( diff --git a/lib/home/points_mall_page.dart b/lib/home/points_mall_page.dart index af391230..ce4b4ad3 100644 --- a/lib/home/points_mall_page.dart +++ b/lib/home/points_mall_page.dart @@ -194,7 +194,7 @@ class _PointsMallPage extends State element, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: FontWeight.w500, color: Color(0xff353535)), ))); }); diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index b0f5ba64..935f184b 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -196,7 +196,7 @@ "yiwanchengdingdan": "已完成订单", "shixiaoquan": "失效券", "wenzhangxiangqing": "文章详情", - "shouhuodizhi": "收货地址", + "shouhuodizhi1": "收货地址", "yishiming": "已实名", "chakanshixiaoquan": "查看失效券", "meiyougengduoyouhuiquan": "没有更多优惠券了", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index a4aa7857..c2a88f3c 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -196,7 +196,7 @@ "yiwanchengdingdan": "已完成订单", "shixiaoquan": "失效券", "wenzhangxiangqing": "文章详情", - "shouhuodizhi": "收货地址", + "shouhuodizhi1": "收货地址", "yishiming": "已实名", "chakanshixiaoquan": "查看失效券", "meiyougengduoyouhuiquan": "没有更多优惠券了", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 0b1c4ab8..831a6927 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -196,7 +196,7 @@ "yiwanchengdingdan": "已完成订单", "shixiaoquan": "失效券", "wenzhangxiangqing": "文章详情", - "shouhuodizhi": "收货地址", + "shouhuodizhi1": "收货地址", "yishiming": "已实名", "chakanshixiaoquan": "查看失效券", "meiyougengduoyouhuiquan": "没有更多优惠券了", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index b9311e2f..886b456f 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -234,7 +234,7 @@ "peisong": "配送", "xuni": "虛擬", "qingxuanzeshouhuodizhi": "請選擇收貨地址", - "shouhuodizhi": "收貨地址", + "shouhuodizhi1": "收貨地址", "wenzhangxiangqing": "文章詳情", "feishiwushangpin": "非實物商品！", "duihuanhoufahuo": "兌換物商品", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 62172989..31f9f512 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -234,7 +234,7 @@ "peisong": "配送", "xuni": "虛擬", "qingxuanzeshouhuodizhi": "請選擇收貨地址", - "shouhuodizhi": "收貨地址", + "shouhuodizhi1": "收貨地址", "wenzhangxiangqing": "文章詳情", "feishiwushangpin": "非實物商品！", "duihuanhoufahuo": "兌換物商品", diff --git a/lib/mine/manage_address_page.dart b/lib/mine/manage_address_page.dart index 6dbb1de7..56c52c6b 100644 --- a/lib/mine/manage_address_page.dart +++ b/lib/mine/manage_address_page.dart @@ -55,7 +55,7 @@ class _ManageAddressPage extends State { Widget build(BuildContext context) { return Scaffold( appBar: MyAppBar( - title: S.of(context).shouhuodizhi, + title: S.of(context).shouhuodizhi1, titleColor: Colors.black, titleSize: 18.sp, background: Color(0xFFF7F7F7), @@ -193,6 +193,7 @@ class _ManageAddressPage extends State { textAxisAlignment: CrossAxisAlignment.start, textStyle: TextStyle( fontSize: 14, + fontWeight: FontWeight.w400, color: Color(0xFF353535), ), leftIcon: Icons.location_on, @@ -229,6 +230,7 @@ class _ManageAddressPage extends State { "", style: TextStyle( fontSize: 14, + fontWeight: FontWeight.w400, color: address.isDefault ? Color(0xFF39B54A) : Color(0xFFA29E9E), @@ -237,11 +239,14 @@ class _ManageAddressPage extends State { ), InkWell( child: Padding( - padding: EdgeInsets.only(top:5,), + padding: EdgeInsets.only( + top: 5, + ), child: Text( "删除", style: TextStyle( fontSize: 16, + fontWeight: FontWeight.w400, color: Colors.black, ), ), @@ -348,8 +353,7 @@ class _ManageAddressPage extends State { addressList[position].isDefault = true; BaseData baseData = await apiService.updateAddress(addressList[position].toJson()); - if (baseData != null && baseData.isSuccess) { - } + if (baseData != null && baseData.isSuccess) {} setState(() {}); } } diff --git a/lib/retrofit/data/PosTypeBean.dart b/lib/retrofit/data/PosTypeBean.dart deleted file mode 100644 index 83d7710c..00000000 --- a/lib/retrofit/data/PosTypeBean.dart +++ /dev/null @@ -1,20 +0,0 @@ -/// desc : "快消餐饮" -/// code : "FASTSTORE" - -class PosTypeBean { - String desc; - String code; - - static PosTypeBean fromMap(Map map) { - if (map == null) return null; - PosTypeBean posTypeBean = PosTypeBean(); - posTypeBean.desc = map['desc']; - posTypeBean.code = map['code']; - return posTypeBean; - } - - Map toJson() => { - "desc": desc, - "code": code, - }; -} \ No newline at end of file diff --git a/lib/retrofit/data/StoreListBean.dart b/lib/retrofit/data/StoreListBean.dart deleted file mode 100644 index d9d1e399..00000000 --- a/lib/retrofit/data/StoreListBean.dart +++ /dev/null @@ -1,148 +0,0 @@ - - -import 'PosTypeBean.dart'; - -/// id : "1381798825072525312" -/// createTime : "2021-04-13 10:38:07" -/// createUser : "1" -/// updateTime : "2021-06-12 21:20:22" -/// updateUser : "1381798824988639232" -/// tenantCode : "1\nI/flutter ( 6658): 180" -/// useErp : false -/// openStartTime : "09:30:00" -/// openEndTime : "18:30:00" -/// storeName : "稻田里的书店" -/// nickName : "" -/// logo : "https://pos.upload.gznl.top/1180/2021/07/574aaeff-df3c-451a-b34f-67f9b3552427.png" -/// shipAddress : "上海市崇明区东风农场东风公路833弄1-22号C2-C3" -/// remark : "" -/// mobile : "13554204268" -/// longitude : "121.4789730000" -/// latitude : "31.7092220000" -/// refundAddress : null -/// refundTel : null -/// refundContact : null -/// isAutoSendRefundAddress : 1 -/// province : "上海市" -/// city : "上海市" -/// district : "崇明区" -/// address : "上海市崇明区稻田里的书店咖啡茶饮区东平镇东风公路833号东风农场C2" -/// headName : "" -/// headMobile : "18672789329" -/// businessService : "WIFI,免费停车" -/// businessType : "书" -/// deliveryInfo : null -/// miniParam : null -/// is_delete : 0 -/// posType : {"desc":"快消餐饮","code":"FASTSTORE"} - -class StoreListBean { - String id; - String createTime; - String createUser; - String updateTime; - String updateUser; - String tenantCode; - bool useErp; - String openStartTime; - String openEndTime; - String storeName; - String nickName; - String logo; - String shipAddress; - String remark; - String mobile; - String longitude; - String latitude; - dynamic refundAddress; - dynamic refundTel; - dynamic refundContact; - int isAutoSendRefundAddress; - String province; - String city; - String district; - String address; - String headName; - String headMobile; - String businessService; - String businessType; - dynamic deliveryInfo; - dynamic miniParam; - int isDelete; - PosTypeBean posType; - - static StoreListBean fromMap(Map map) { - if (map == null) return null; - StoreListBean storeListBean = StoreListBean(); - storeListBean.id = map['id']; - storeListBean.createTime = map['createTime']; - storeListBean.createUser = map['createUser']; - storeListBean.updateTime = map['updateTime']; - storeListBean.updateUser = map['updateUser']; - storeListBean.tenantCode = map['tenantCode']; - storeListBean.useErp = map['useErp']; - storeListBean.openStartTime = map['openStartTime']; - storeListBean.openEndTime = map['openEndTime']; - storeListBean.storeName = map['storeName']; - storeListBean.nickName = map['nickName']; - storeListBean.logo = map['logo']; - storeListBean.shipAddress = map['shipAddress']; - storeListBean.remark = map['remark']; - storeListBean.mobile = map['mobile']; - storeListBean.longitude = map['longitude']; - storeListBean.latitude = map['latitude']; - storeListBean.refundAddress = map['refundAddress']; - storeListBean.refundTel = map['refundTel']; - storeListBean.refundContact = map['refundContact']; - storeListBean.isAutoSendRefundAddress = map['isAutoSendRefundAddress']; - storeListBean.province = map['province']; - storeListBean.city = map['city']; - storeListBean.district = map['district']; - storeListBean.address = map['address']; - storeListBean.headName = map['headName']; - storeListBean.headMobile = map['headMobile']; - storeListBean.businessService = map['businessService']; - storeListBean.businessType = map['businessType']; - storeListBean.deliveryInfo = map['deliveryInfo']; - storeListBean.miniParam = map['miniParam']; - storeListBean.isDelete = map['is_delete']; - storeListBean.posType = PosTypeBean.fromMap(map['posType']); - return storeListBean; - } - - Map toJson() => { - "id": id, - "createTime": createTime, - "createUser": createUser, - "updateTime": updateTime, - "updateUser": updateUser, - "tenantCode": tenantCode, - "useErp": useErp, - "openStartTime": openStartTime, - "openEndTime": openEndTime, - "storeName": storeName, - "nickName": nickName, - "logo": logo, - "shipAddress": shipAddress, - "remark": remark, - "mobile": mobile, - "longitude": longitude, - "latitude": latitude, - "refundAddress": refundAddress, - "refundTel": refundTel, - "refundContact": refundContact, - "isAutoSendRefundAddress": isAutoSendRefundAddress, - "province": province, - "city": city, - "district": district, - "address": address, - "headName": headName, - "headMobile": headMobile, - "businessService": businessService, - "businessType": businessType, - "deliveryInfo": deliveryInfo, - "miniParam": miniParam, - "is_delete": isDelete, - "posType": posType, - }; -} \ No newline at end of file diff --git a/lib/setting/about_page.dart b/lib/setting/about_page.dart index addaa294..daa96b1a 100644 --- a/lib/setting/about_page.dart +++ b/lib/setting/about_page.dart @@ -145,7 +145,7 @@ class _AboutPage extends State { style: TextStyle( color: Colors.black, fontSize: 12.sp, - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w500, ), ), ), @@ -177,7 +177,7 @@ class _AboutPage extends State { style: TextStyle( fontSize: 16.sp, color: Color(0xFF353535), - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, ), ), ), @@ -213,7 +213,7 @@ class _AboutPage extends State { child: Text( left, style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, fontSize: 16.sp, color: Color(0xFF353535), ), @@ -253,7 +253,7 @@ class _AboutPage extends State { child: Text( text, style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, fontSize: 16.sp, color: Color(0xFF353535), ), diff --git a/lib/setting/setting_page.dart b/lib/setting/setting_page.dart index 26daf967..57bc57b9 100644 --- a/lib/setting/setting_page.dart +++ b/lib/setting/setting_page.dart @@ -35,7 +35,6 @@ class _SettingPage extends State { cacheTotal = (value > 0) ? "${(value / 1024.0 ~/ 1024.0)}M" : "0B"; setState(() {}); }); - } setLanguage() async { @@ -72,7 +71,7 @@ class _SettingPage extends State { child: Text( S.of(context).shezhi, style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, color: Color(0xFF353535), fontSize: 16.sp, ), @@ -181,7 +180,7 @@ class _SettingPage extends State { clearCache() async { if (Platform.isAndroid) { - if(!(await Min.isInitialize())) { + if (!(await Min.isInitialize())) { await Min.initialize(); } } @@ -206,7 +205,6 @@ class _SettingPage extends State { cacheTotal = "0B"; setState(() {}); - } changeLanguage(language) { @@ -236,7 +234,8 @@ class _SettingPage extends State { sharedPreferences.setString("mobile", ""); sharedPreferences.setString("nick", ""); - Navigator.of(context).pushNamedAndRemoveUntil('/router/login_page', (route) => false); + Navigator.of(context) + .pushNamedAndRemoveUntil('/router/login_page', (route) => false); if (xgFlutterPlugin != null) { xgFlutterPlugin.stopXg(); } @@ -263,7 +262,7 @@ class _SettingPage extends State { child: Text( left, style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, fontSize: 14.sp, color: Color(0xFF353535), ), @@ -272,7 +271,10 @@ class _SettingPage extends State { ), Text( right, - style: TextStyle(fontSize: 12.sp, color: Color(0xFF727272)), + style: TextStyle( + fontSize: 12.sp, + fontWeight: FontWeight.w400, + color: Color(0xFF727272)), ), SizedBox( width: 16.w, @@ -310,7 +312,7 @@ class _SettingPage extends State { style: TextStyle( fontSize: 14.sp, color: Color(0xFF353535), - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, ), ), ), @@ -325,5 +327,4 @@ class _SettingPage extends State { ), ); } - } diff --git a/lib/setting/treaty_page.dart b/lib/setting/treaty_page.dart index 7ceb63c4..fdef5b64 100644 --- a/lib/setting/treaty_page.dart +++ b/lib/setting/treaty_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; + // import 'package:webview_flutter/webview_flutter.dart'; // import 'package:webview_flutter/src/webview_cupertino.dart'; diff --git a/lib/union/union_details_page.dart b/lib/union/union_details_page.dart index 3c48befc..d0ebb4c6 100644 --- a/lib/union/union_details_page.dart +++ b/lib/union/union_details_page.dart @@ -155,7 +155,7 @@ class _UnionDetailsPage extends State { style: TextStyle( fontSize: 16.sp, color: Colors.black, - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, ), ), Expanded( @@ -170,6 +170,7 @@ class _UnionDetailsPage extends State { ), style: TextStyle( fontSize: 14.sp, + fontWeight: FontWeight.w400, color: Color(0xFF353535), ), ), @@ -185,6 +186,7 @@ class _UnionDetailsPage extends State { textAlign: TextAlign.justify, style: TextStyle( color: Color(0xFF353535), + fontWeight: FontWeight.w400, fontSize: 12.sp, ), ), @@ -202,21 +204,20 @@ class _UnionDetailsPage extends State { CrossAxisAlignment.end, children: [ Expanded( - child: Text( - S.of(context).yingyeshijian(storeInfo == - null - ? "" - : (storeInfo.openStartTime == - null && - storeInfo - .openEndTime == - null) - ? S.of(context).quantian - : "${storeInfo.openStartTime.substring(0, storeInfo.openStartTime.lastIndexOf(":"))} - ${storeInfo.openEndTime.substring(0, storeInfo.openEndTime.lastIndexOf(":"))}"), - style: TextStyle( - color: Color(0xFF353535), - fontSize: 12.sp, - ), + child: Text( + S.of(context).yingyeshijian(storeInfo == + null + ? "" + : (storeInfo.openStartTime == + null && + storeInfo.openEndTime == + null) + ? S.of(context).quantian + : "${storeInfo.openStartTime.substring(0, storeInfo.openStartTime.lastIndexOf(":"))} - ${storeInfo.openEndTime.substring(0, storeInfo.openEndTime.lastIndexOf(":"))}"), + style: TextStyle( + color: Color(0xFF353535), + fontWeight: FontWeight.w400, + fontSize: 12.sp, ), ), SizedBox( @@ -404,7 +405,7 @@ class _UnionDetailsPage extends State { S.of(context).huiyuanyue, style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, color: Colors.white, ), ), @@ -415,7 +416,7 @@ class _UnionDetailsPage extends State { "¥${(storeInfo != null && storeInfo.memberSource != null) ? storeInfo.memberSource.balance : ""}", style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, color: Colors.white, ), ), @@ -438,7 +439,7 @@ class _UnionDetailsPage extends State { S.of(context).huiyuanjifen, style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, color: Colors.white, ), ), @@ -452,7 +453,7 @@ class _UnionDetailsPage extends State { : "", style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, color: Colors.white, ), ), @@ -469,7 +470,7 @@ class _UnionDetailsPage extends State { S.of(context).gongxinichengweibendianhuiyuan, style: TextStyle( fontSize: 10.sp, - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, color: Color(0xFFEDC98E), ), ) diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index 1558e5f1..5fd8f807 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -76,6 +76,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).shangjiaquan, style: TextStyle( fontSize: 10.sp, + fontWeight: FontWeight.w500, color: Color(0xFFFF7A1A), ), ), @@ -221,6 +222,7 @@ class NewCouponWidget extends StatelessWidget { "¥", style: TextStyle( fontSize: 22.sp, + fontWeight: FontWeight.w500, color: Color(0xff32A060), ), ), @@ -299,9 +301,8 @@ class NewCouponWidget extends StatelessWidget { children: [ Text( coupon != null - ? "${(coupon.discountPercent / 10.0 >= 10) ? 10 - : coupon.discountPercent / 10.0}" ?? - "0" + ? "${(coupon.discountPercent / 10.0 >= 10) ? 10 : coupon.discountPercent / 10.0}" ?? + "0" : "", style: TextStyle( fontSize: 40.sp, @@ -355,6 +356,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).lingqu, style: TextStyle( fontSize: 12.sp, + fontWeight: FontWeight.w500, color: Colors.white, ), ), @@ -374,6 +376,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).yilingqu, style: TextStyle( fontSize: 12.sp, + fontWeight: FontWeight.w500, color: Colors.white, ), ), @@ -400,6 +403,7 @@ class NewCouponWidget extends StatelessWidget { : S.of(context).qushiyong, style: TextStyle( fontSize: 12.sp, + fontWeight: FontWeight.w500, color: Colors.white, ), ), @@ -421,6 +425,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).yishiyong, style: TextStyle( fontSize: 12.sp, + fontWeight: FontWeight.w500, color: Colors.white, ), ), @@ -441,6 +446,7 @@ class NewCouponWidget extends StatelessWidget { S.of(context).yishixiao, style: TextStyle( fontSize: 12.sp, + fontWeight: FontWeight.w500, color: Colors.white, ), ),