From 26bd01ddaea4a8de6c78cb1fb0694d81b83c741c Mon Sep 17 00:00:00 2001 From: w-R <953969641@qq.com> Date: Sat, 7 Aug 2021 18:40:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/generated/intl/messages_en.dart | 2 ++ lib/generated/intl/messages_zh_CN.dart | 2 ++ lib/generated/intl/messages_zh_Hans_CN.dart | 2 ++ lib/generated/intl/messages_zh_Hant_CN.dart | 2 ++ lib/generated/intl/messages_zh_TW.dart | 1 + lib/generated/l10n.dart | 20 ++++++++++++++++++++ lib/home/activity_list_page.dart | 17 +++++++++-------- lib/l10n/intl_en.arb | 2 ++ lib/l10n/intl_zh_CN.arb | 2 ++ lib/l10n/intl_zh_Hans_CN.arb | 3 +++ lib/l10n/intl_zh_Hant_CN.arb | 2 ++ lib/l10n/intl_zh_TW.arb | 2 ++ lib/mine/mine_page.dart | 7 ++++--- lib/order/exchange_history_page.dart | 18 ++++++++++++++---- lib/setting/help_feedback_page.dart | 8 ++++++-- lib/view_widget/mine_vip_view.dart | 12 +++++++----- 16 files changed, 80 insertions(+), 22 deletions(-) diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 8ba15063..619d5e37 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -169,6 +169,7 @@ class MessageLookup extends MessageLookupByLibrary { "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"), "fanhuiduihuanlishi" : MessageLookupByLibrary.simpleMessage("返回兑换历史"), "fankui" : MessageLookupByLibrary.simpleMessage("反馈"), + "fankuilizi" : MessageLookupByLibrary.simpleMessage("您可以在这里输入反馈内容,例如产品建议，功能异常等"), "fantizhongwen" : MessageLookupByLibrary.simpleMessage("繁体中文"), "fapiao" : MessageLookupByLibrary.simpleMessage("发票"), "fapiaozhushou" : MessageLookupByLibrary.simpleMessage("发票助手"), @@ -315,6 +316,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("请输入充值金额"), "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("请输入手机号"), "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("请输入验证码"), + "qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("请输入您的有效手机号"), "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"), "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("请填写收件人姓名"), diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index 5d1e3c5f..9581a7a7 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -169,6 +169,7 @@ class MessageLookup extends MessageLookupByLibrary { "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"), "fanhuiduihuanlishi" : MessageLookupByLibrary.simpleMessage("返回兑换历史"), "fankui" : MessageLookupByLibrary.simpleMessage("反馈"), + "fankuilizi" : MessageLookupByLibrary.simpleMessage("您可以在这里输入反馈内容,例如产品建议，功能异常等"), "fantizhongwen" : MessageLookupByLibrary.simpleMessage("繁体中文"), "fapiao" : MessageLookupByLibrary.simpleMessage("发票"), "fapiaozhushou" : MessageLookupByLibrary.simpleMessage("发票助手"), @@ -314,6 +315,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("请输入充值金额"), "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("请输入手机号"), "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("请输入验证码"), + "qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("请输入您的有效手机号"), "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"), "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("请填写收件人姓名"), diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index 8fac9398..f05ff147 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_CN.dart @@ -169,6 +169,7 @@ class MessageLookup extends MessageLookupByLibrary { "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"), "fanhuiduihuanlishi" : MessageLookupByLibrary.simpleMessage("返回兑换历史"), "fankui" : MessageLookupByLibrary.simpleMessage("反馈"), + "fankuilizi" : MessageLookupByLibrary.simpleMessage("您可以在这里输入反馈内容,例如产品建议，功能异常等"), "fantizhongwen" : MessageLookupByLibrary.simpleMessage("繁体中文"), "fapiao" : MessageLookupByLibrary.simpleMessage("发票"), "fapiaozhushou" : MessageLookupByLibrary.simpleMessage("发票助手"), @@ -314,6 +315,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("请输入充值金额"), "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("请输入手机号"), "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("请输入验证码"), + "qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("请输入您的有效手机号"), "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"), "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("请填写收件人姓名"), diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart index 1272d9ec..92ae5f43 100644 --- a/lib/generated/intl/messages_zh_Hant_CN.dart +++ b/lib/generated/intl/messages_zh_Hant_CN.dart @@ -169,6 +169,7 @@ class MessageLookup extends MessageLookupByLibrary { "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"), "fanhuiduihuanlishi" : MessageLookupByLibrary.simpleMessage("返回兌換歷史"), "fankui" : MessageLookupByLibrary.simpleMessage("反饋"), + "fankuilizi" : MessageLookupByLibrary.simpleMessage("您可以在這裡輸入迴響內容，例如產品建議,功能异常等"), "fantizhongwen" : MessageLookupByLibrary.simpleMessage("繁体中文"), "fapiao" : MessageLookupByLibrary.simpleMessage("發票"), "fapiaozhushou" : MessageLookupByLibrary.simpleMessage("發票助手"), @@ -314,6 +315,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("請輸入充值金額"), "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("請輸入手機號碼"), "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"), + "qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("请输入您的有效手机号"), "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("請輸入支付密碼"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("請填寫收件人手機號"), "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("請填寫收件人姓名"), diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index 5f60cd98..c1dcfaff 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/lib/generated/intl/messages_zh_TW.dart @@ -169,6 +169,7 @@ class MessageLookup extends MessageLookupByLibrary { "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"), "fanhuiduihuanlishi" : MessageLookupByLibrary.simpleMessage("返回兌換歷史"), "fankui" : MessageLookupByLibrary.simpleMessage("反饋"), + "fankuilizi" : MessageLookupByLibrary.simpleMessage("您可以在這裡輸入迴響內容，例如產品建議，功能异常等"), "fantizhongwen" : MessageLookupByLibrary.simpleMessage("繁体中文"), "fapiao" : MessageLookupByLibrary.simpleMessage("發票"), "fapiaozhushou" : MessageLookupByLibrary.simpleMessage("發票助手"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 58a6da36..a605352b 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -4475,6 +4475,26 @@ class S { ); } + /// `您可以在这里输入反馈内容,例如产品建议，功能异常等` + String get fankuilizi { + return Intl.message( + '您可以在这里输入反馈内容,例如产品建议，功能异常等', + name: 'fankuilizi', + desc: '', + args: [], + ); + } + + /// `请输入您的有效手机号` + String get qingshuruyouxiaoshoujihaoma { + return Intl.message( + '请输入您的有效手机号', + name: 'qingshuruyouxiaoshoujihaoma', + desc: '', + args: [], + ); + } + /// `并使用本机号码登录` String get privacy_policy4 { return Intl.message( diff --git a/lib/home/activity_list_page.dart b/lib/home/activity_list_page.dart index 563a983a..da44a72b 100644 --- a/lib/home/activity_list_page.dart +++ b/lib/home/activity_list_page.dart @@ -95,10 +95,8 @@ class _ActivityListPage extends State itemBuilder: (context, position) { return InkWell( onTap: () { - Navigator.of(context) - .pushNamed('/router/store_detail_page', arguments: { - "activityId": activityList[position].id - }); + Navigator.of(context).pushNamed('/router/store_detail_page', + arguments: {"activityId": activityList[position].id}); }, child: FrameSeparateWidget( child: activityItem(activityList[position]), @@ -132,7 +130,7 @@ class _ActivityListPage extends State Widget activityItem(Activity activity) { return Container( - margin: EdgeInsets.only(left: 16.w, right: 16.w, top: 8.h, bottom:12.h), + margin: EdgeInsets.only(left: 16.w, right: 16.w, top: 8.h, bottom: 12.h), decoration: BoxDecoration( color: Colors.white, boxShadow: [ @@ -188,7 +186,9 @@ class _ActivityListPage extends State color: Color(0xFF4C4C4C), ), ), - SizedBox(height: 12.h,), + SizedBox( + height: 12.h, + ), ConstrainedBox( constraints: BoxConstraints( maxWidth: double.infinity, @@ -218,7 +218,9 @@ class _ActivityListPage extends State fontWeight: FontWeight.w400, ), ), - SizedBox(width: 4.w,), + SizedBox( + width: 4.w, + ), Text( activity.startTime.split(" ")[1], style: TextStyle( @@ -227,7 +229,6 @@ class _ActivityListPage extends State fontWeight: FontWeight.w400, ), ), - ], ) ], diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 04dbf5c1..e7b7f663 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -464,6 +464,8 @@ "yiqianshou": "已签收", "jinrushangdian": "进入商店", "zanwuxianshangjindian": "暂无线上进店", + "fankuilizi": "您可以在这里输入反馈内容,例如产品建议，功能异常等", + "qingshuruyouxiaoshoujihaoma": "请输入您的有效手机号", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 16ccab67..fcabc25b 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -465,6 +465,8 @@ "yiqianshou": "已签收", "jinrushangdian": "进入商店", "zanwuxianshangjindian": "暂无线上进店", + "fankuilizi": "您可以在这里输入反馈内容,例如产品建议，功能异常等", + "qingshuruyouxiaoshoujihaoma": "请输入您的有效手机号", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 67657d7f..c4c6c7ef 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -465,6 +465,9 @@ "yiqianshou": "已签收", "jinrushangdian": "进入商店", "zanwuxianshangjindian": "暂无线上进店", + "fankuilizi": "您可以在这里输入反馈内容,例如产品建议，功能异常等", + "qingshuruyouxiaoshoujihaoma": "请输入您的有效手机号", + diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index 8528d6af..8695620e 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -459,6 +459,8 @@ "yiqianshou": "已簽收", "jinrushangdian": "進入商店", "zanwuxianshangjindian": "暫無綫上進店", + "fankuilizi": "您可以在這裡輸入迴響內容，例如產品建議,功能异常等", + "qingshuruyouxiaoshoujihaoma": "請輸入您的有效手機號", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index ebbd8160..65375959 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -457,6 +457,8 @@ "yiqianshou": "已簽收", "jinrushangdian": "進入商店", "zanwuxianshangjindian": "暫無綫上進店", + "fankuilizi": "您可以在這裡輸入迴響內容，例如產品建議，功能异常等", + "qingshuruyouxiaoshoujihaoma": "請輸入您的有效手機號", diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart index 5ebb9213..368ee822 100644 --- a/lib/mine/mine_page.dart +++ b/lib/mine/mine_page.dart @@ -157,7 +157,7 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { Column( children: [ Container( - margin: EdgeInsets.only(bottom:12.h,right: 16.w), + margin: EdgeInsets.only(bottom: 12.h, right: 16.w), alignment: Alignment.centerRight, child: Row( mainAxisAlignment: MainAxisAlignment.end, @@ -436,7 +436,7 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { child: Text( text, style: TextStyle( - fontWeight: FontWeight.w600, + fontWeight: FontWeight.w500, fontSize: 16.sp, color: Color(0xFF353535), ), @@ -455,7 +455,7 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { ///订单或者卡包试图 Widget orderOrCard() { return Container( - margin: EdgeInsets.fromLTRB(16.w,16.h, 16.w, 8.h), + margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 8.h), padding: EdgeInsets.fromLTRB(20.w, 12.h, 20.w, 12.h), decoration: BoxDecoration( color: Colors.white, @@ -644,6 +644,7 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { userinfo == null ? "" : "NO.${userinfo.vipNo}", style: TextStyle( fontSize: 12.sp, + fontWeight: FontWeight.w400, color: Color(0xFF2F2F2F), ), ), diff --git a/lib/order/exchange_history_page.dart b/lib/order/exchange_history_page.dart index 06312c69..bfa11fc6 100644 --- a/lib/order/exchange_history_page.dart +++ b/lib/order/exchange_history_page.dart @@ -264,11 +264,14 @@ class _ExchangeHistoryList extends State { height: 16.h, ), Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - S.of(context).zitidizhi, + S.of(context).zitidizhi + " :", style: TextStyle( color: Color(0xFF353535), + fontWeight: FontWeight.w400, fontSize: 12.sp, ), ), @@ -280,6 +283,7 @@ class _ExchangeHistoryList extends State { exchangeOrder.address ?? "", style: TextStyle( color: Colors.black, + fontWeight: FontWeight.w400, fontSize: 12.sp, ), ), @@ -292,9 +296,10 @@ class _ExchangeHistoryList extends State { Row( children: [ Text( - S.of(context).zitishijian, + S.of(context).zitishijian + " :", style: TextStyle( color: Color(0xFF353535), + fontWeight: FontWeight.w400, fontSize: 12.sp, ), ), @@ -306,6 +311,7 @@ class _ExchangeHistoryList extends State { S.of(context).duihuanhouwugegongzuori, style: TextStyle( color: Colors.black, + fontWeight: FontWeight.w400, fontSize: 12.sp, ), ), @@ -351,7 +357,7 @@ class _ExchangeHistoryList extends State { color: Color(0xFF353535)), ), SizedBox( - height: 2, + height: 5.h, ), Text( exchangeOrder.useTyped == 3 @@ -361,6 +367,7 @@ class _ExchangeHistoryList extends State { maxLines: 2, style: TextStyle( fontSize: 10.sp, + fontWeight: FontWeight.w400, color: Color(0xFF727272), ), ), @@ -373,6 +380,7 @@ class _ExchangeHistoryList extends State { "x1", style: TextStyle( fontSize: 12.sp, + fontWeight: FontWeight.w400, color: Color(0xFF353535), ), ) @@ -415,6 +423,7 @@ class _ExchangeHistoryList extends State { iconSize: 16, textStyle: TextStyle( fontSize: 12.sp, + fontWeight: FontWeight.w400, color: Color(0xFF353535), ), ), @@ -423,7 +432,8 @@ class _ExchangeHistoryList extends State { if (exchangeOrder.state == 1) { receive2Card(exchangeOrder.id); } else { - Navigator.of(context).pushNamed('/router/write_off_page', arguments: {}); + Navigator.of(context) + .pushNamed('/router/write_off_page', arguments: {}); } }, child: buildBtnStatus(exchangeOrder.state), diff --git a/lib/setting/help_feedback_page.dart b/lib/setting/help_feedback_page.dart index 735c15e2..12d32dbd 100644 --- a/lib/setting/help_feedback_page.dart +++ b/lib/setting/help_feedback_page.dart @@ -163,9 +163,10 @@ class _HelpFeedbackPage extends State { maxLines: 5, decoration: InputDecoration( border: InputBorder.none, - hintText: "您可以在这里输入反馈内容,例如产品建议，功能异常等", + hintText: S.of(context).fankuilizi, hintStyle: TextStyle( fontSize: 14.sp, + fontWeight: FontWeight.w400, color: Color(0xffA29E9E), ), ), @@ -178,6 +179,7 @@ class _HelpFeedbackPage extends State { "0/50", style: TextStyle( fontSize: 14.sp, + fontWeight: FontWeight.w400, color: Color(0xffA29E9E), ), ), @@ -211,9 +213,10 @@ class _HelpFeedbackPage extends State { child: TextField( decoration: InputDecoration( border: InputBorder.none, - hintText: "请输入您的有效手机号", + hintText: S.of(context).qingshuruyouxiaoshoujihaoma, hintStyle: TextStyle( fontSize: 14.sp, + fontWeight: FontWeight.w400, color: Color(0xffA29E9E), ), ), @@ -244,6 +247,7 @@ class _HelpFeedbackPage extends State { cnt, style: TextStyle( fontSize: 14.sp, + fontWeight: FontWeight.w400, color: Color(0xff8B8B8B), ), ), diff --git a/lib/view_widget/mine_vip_view.dart b/lib/view_widget/mine_vip_view.dart index 44b1275f..f68422a6 100644 --- a/lib/view_widget/mine_vip_view.dart +++ b/lib/view_widget/mine_vip_view.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -14,7 +13,7 @@ class MineVipView extends StatelessWidget { MineVipView( this.vipLevel, { this.padding = 16, - this.curLevel, + this.curLevel, this.rankMax = 0, this.rank = 0, this.createTime = "", @@ -34,7 +33,7 @@ class MineVipView extends StatelessWidget { if (curLevel == vipLevel) { topLeft = S.of(context).dangqiandengji; - } else if(vipLevel < curLevel) { + } else if (vipLevel < curLevel) { topLeft = S.of(context).shangyidengji; } else { topLeft = S.of(context).xiayidengji; @@ -170,7 +169,7 @@ class MineVipView extends StatelessWidget { ], ), Container( - margin: EdgeInsets.only(left: 13.w, right: 12.w, bottom:12.h), + margin: EdgeInsets.only(left: 13.w, right: 12.w, bottom: 12.h), child: Column( children: [ Row( @@ -186,6 +185,7 @@ class MineVipView extends StatelessWidget { overflow: TextOverflow.ellipsis, style: TextStyle( color: textColor, + fontWeight: FontWeight.w400, fontSize: 14.sp, ), ), @@ -208,6 +208,7 @@ class MineVipView extends StatelessWidget { text: rankMax > 0 ? "/$rankMax" : "/0", style: TextStyle( fontSize: 14.sp, + fontWeight: FontWeight.w400, color: textColor, ), ), @@ -239,7 +240,8 @@ class MineVipView extends StatelessWidget { : "$createTime"), style: TextStyle( color: textColor, - fontSize: 14.sp, + fontWeight: FontWeight.w400, + fontSize: 12.sp, ), ), Icon(