fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1.动态详情，评论-已显示全部—修改； 

2.动态详情，评论-输入框发送点击范围更改；
3.兑换列表实付处-增加集换卡兑换；
4.兑换结算处，增加计算集换卡兑换数量；
5.兑换成功页，增加集换卡数量余额显示，及集换卡消费数量计算；
6.方法类，增加使用16进制色值并返回对应色值的方法；
7.首页手机号码输入框间距更改；
8.订单结算页，VIP优惠显示，更改；
9.点单页接口调用更改；
10.动态异步加载处，样式更改；
11.福利兑换，分组处高度更改，兑换显示更改，部分间距更改；
12.福利中心，该页面整体优化，兑换处显示更改；
new_revision_app
wurong 2 years ago
parent
0309254ac5
commit
9e327581fb
25 changed files with 375 additions and 188 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      lib/generated/intl/messages_en.dart
  2. 59
      lib/generated/intl/messages_en_US.dart
  3. 57
      lib/generated/intl/messages_zh_CN.dart
  4. 57
      lib/generated/intl/messages_zh_Hans_CN.dart
  5. 57
      lib/generated/intl/messages_zh_Hant_CN.dart
  6. 57
      lib/generated/intl/messages_zh_TW.dart
  7. 50
      lib/generated/l10n.dart
  8. 8
      lib/home/welfare_exchange.dart
  9. 27
      lib/home/welfare_page.dart
  10. 7
      lib/l10n/intl_en.arb
  11. 6
      lib/l10n/intl_en_US.arb
  12. 6
      lib/l10n/intl_zh_CN.arb
  13. 6
      lib/l10n/intl_zh_Hans_CN.arb
  14. 6
      lib/l10n/intl_zh_Hant_CN.arb
  15. 6
      lib/l10n/intl_zh_TW.arb
  16. 2
      lib/login/new_login_page.dart
  17. 4
      lib/order/exchange_history_page.dart
  18. 10
      lib/order/exchange_order_page.dart
  19. 11
      lib/order/exchange_order_success_page.dart
  20. 3
      lib/retrofit/data/exchange_order.dart
  21. 4
      lib/setting/account_security_page.dart
  22. 2
      lib/settlement/settlement_view/settlement_order_commodity.dart
  23. 1
      lib/store/store_order.dart
  24. 19
      lib/utils/flutter_utils.dart
  25. 15
      lib/utils/upload_async.dart

57
lib/generated/intl/messages_en.dart
Unescape View File

@ -81,31 +81,33 @@ class MessageLookup extends MessageLookupByLibrary {
static m30(jifen) => "实付积分 ${jifen}积分";
static m31(sui) => "${sui}岁";
static m31(jihuanka) => "实付集换卡 ${jihuanka}集换卡";
static m32(num) => "完成${num}";
static m32(sui) => "${sui}岁";
static m33(time) => "下单时间:${time}";
static m33(num) => "完成${num}";
static m34(xihuan) => "喜欢(${xihuan})";
static m34(time) => "下单时间:${time}";
static m35(shoujihao) => "邀请人手机号:${shoujihao}";
static m35(xihuan) => "喜欢(${xihuan})";
static m36(jian) => "已兑换${jian}件";
static m36(shoujihao) => "邀请人手机号:${shoujihao}";
static m37(time) => "营业时间: ${time}";
static m37(jian) => "已兑换${jian}件";
static m38(date) => "有效期:${date}";
static m38(time) => "营业时间: ${time}";
static m39(date) => "有效期至${date}";
static m39(date) => "有效期:${date}";
static m40(yuan) => "${yuan}元";
static m40(date) => "有效期至${date}";
static m41(yue) => "余额${yue}";
static m41(yuan) => "${yuan}元";
static m42(yue) => "余额${yue}";
static m43(zuozhe) => "作者:${zuozhe}";
static m43(yue) => "余额 ${yue}";
static m44(zuozhe) => "作者:${zuozhe}";
final messages = _notInlinedMessages(_notInlinedMessages);
static _notInlinedMessages(_) => <String, Function> {
@ -114,6 +116,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白银会员"),
"banben" : m0,
"bangdingfuka" : MessageLookupByLibrary.simpleMessage("绑定副卡"),
"bangdingshouji" : MessageLookupByLibrary.simpleMessage("绑定手机"),
"bangong" : MessageLookupByLibrary.simpleMessage("办公"),
"bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("帮助与反馈"),
"baocun" : MessageLookupByLibrary.simpleMessage("保存"),
@ -346,6 +349,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenmingxi" : MessageLookupByLibrary.simpleMessage("积分明细"),
"jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"),
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
"jihuanka" : MessageLookupByLibrary.simpleMessage("集换卡"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
"jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"),
"jingxuanhuodong" : MessageLookupByLibrary.simpleMessage("精选活动"),
@ -569,6 +573,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"),
"shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"),
"shifujifen" : m30,
"shifujihuanka" : m31,
"shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"),
"shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
"shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@ -595,7 +600,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shuliang" : MessageLookupByLibrary.simpleMessage("数量"),
"shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"),
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
"sui" : m31,
"sui" : m32,
"tangshi" : MessageLookupByLibrary.simpleMessage("堂食"),
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
"tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠专区"),
@ -621,7 +626,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wan" : MessageLookupByLibrary.simpleMessage("玩"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32,
"wancheng_" : m33,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),
"wangjimima" : MessageLookupByLibrary.simpleMessage("忘记密码"),
"wanjiankang" : MessageLookupByLibrary.simpleMessage("玩健康"),
@ -665,7 +670,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"),
"xiadanshijian_" : m33,
"xiadanshijian_" : m34,
"xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("下单赚积分"),
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相册"),
@ -678,17 +683,19 @@ class MessageLookup extends MessageLookupByLibrary {
"xianxiashiyong" : MessageLookupByLibrary.simpleMessage("线下使用"),
"xiaofei" : MessageLookupByLibrary.simpleMessage("消费"),
"xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
"xiaofeijihuanka" : MessageLookupByLibrary.simpleMessage("消费集换卡"),
"xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消费记录"),
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
"xiedongtai" : MessageLookupByLibrary.simpleMessage("写动态"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
"xihuan_" : m34,
"xihuan_" : m35,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
"xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
"xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
"xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"),
"xiugai" : MessageLookupByLibrary.simpleMessage("修改"),
"xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
"xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用户名"),
"xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"),
@ -703,11 +710,11 @@ class MessageLookup extends MessageLookupByLibrary {
"yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"),
"yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀请好友"),
"yaoqinghaoyoudefen" : MessageLookupByLibrary.simpleMessage("邀请好友得分"),
"yaoqingrenshoujihao_" : m35,
"yaoqingrenshoujihao_" : m36,
"yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀请完成"),
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
"yiduihuanjian" : m36,
"yiduihuanjian" : m37,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
"yiguanzhu" : MessageLookupByLibrary.simpleMessage("已关注"),
"yihouzaishuo" : MessageLookupByLibrary.simpleMessage("以后再说"),
@ -725,7 +732,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"),
"yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
"yingwen" : MessageLookupByLibrary.simpleMessage("英文"),
"yingyeshijian" : m37,
"yingyeshijian" : m38,
"yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"),
"yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
@ -755,15 +762,15 @@ class MessageLookup extends MessageLookupByLibrary {
"youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"),
"youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"),
"youkedenglu" : MessageLookupByLibrary.simpleMessage("游客登录"),
"youxiaoqi" : m38,
"youxiaoqi" : m39,
"youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
"youxiaoqizhi" : m39,
"youxiaoqizhi" : m40,
"yuan" : MessageLookupByLibrary.simpleMessage("元"),
"yuan_" : m40,
"yuan_" : m41,
"yuanjia" : MessageLookupByLibrary.simpleMessage("原价"),
"yue" : MessageLookupByLibrary.simpleMessage("余额"),
"yue_" : m41,
"yue__" : m42,
"yue_" : m42,
"yue__" : m43,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("预留电话"),
"yunfei" : MessageLookupByLibrary.simpleMessage("运费"),
@ -814,6 +821,6 @@ class MessageLookup extends MessageLookupByLibrary {
"zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"),
"zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
"zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"),
"zuozhe" : m43
"zuozhe" : m44
};
}

59
lib/generated/intl/messages_en_US.dart
Unescape View File

@ -81,31 +81,33 @@ class MessageLookup extends MessageLookupByLibrary {
static m30(jifen) => "Paid in integral ${jifen}integral";
static m31(sui) => "${sui}years old";
static m31(jihuanka) => "paid-in trading card ${jihuanka}trading card";
static m32(num) => "Finish${num}";
static m32(sui) => "${sui}years old";
static m33(time) => "Ordering time:${time}";
static m33(num) => "Finish${num}";
static m34(xihuan) => "Like(${xihuan})";
static m34(time) => "Ordering time:${time}";
static m35(shoujihao) => "Inviter\'s mobile number:${shoujihao}";
static m35(xihuan) => "Like(${xihuan})";
static m36(jian) => "${jian}pieces redeemed";
static m36(shoujihao) => "Inviter\'s mobile number:${shoujihao}";
static m37(time) => "Business hours: ${time}";
static m37(jian) => "${jian}pieces redeemed";
static m38(date) => "Validity:${date}";
static m38(time) => "Business hours: ${time}";
static m39(date) => "Valid until ${date}";
static m39(date) => "Validity:${date}";
static m40(yuan) => "${yuan}yuan";
static m40(date) => "Valid until ${date}";
static m41(yue) => "Balance ${yue}";
static m41(yuan) => "${yuan}yuan";
static m42(yue) => "Balance ${yue}";
static m43(zuozhe) => "Author:${zuozhe}";
static m43(yue) => "Balance ${yue}";
static m44(zuozhe) => "Author:${zuozhe}";
final messages = _notInlinedMessages(_notInlinedMessages);
static _notInlinedMessages(_) => <String, Function> {
@ -114,6 +116,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("Silver Member"),
"banben" : m0,
"bangdingfuka" : MessageLookupByLibrary.simpleMessage("binding sub card"),
"bangdingshouji" : MessageLookupByLibrary.simpleMessage("bind phone"),
"bangong" : MessageLookupByLibrary.simpleMessage("Office"),
"bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("Help"),
"baocun" : MessageLookupByLibrary.simpleMessage("Save"),
@ -346,6 +349,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenmingxi" : MessageLookupByLibrary.simpleMessage("Integral Details"),
"jifenshangcheng" : MessageLookupByLibrary.simpleMessage("Points Mall"),
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("Points Details"),
"jihuanka" : MessageLookupByLibrary.simpleMessage("trading card"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("Jingbi League Member Store"),
"jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("Selected good articles "),
"jingxuanhuodong" : MessageLookupByLibrary.simpleMessage("Selected Activities"),
@ -455,7 +459,7 @@ class MessageLookup extends MessageLookupByLibrary {
"pinglun" : MessageLookupByLibrary.simpleMessage("Comment"),
"pinglun_" : m23,
"pingtaiyue" : MessageLookupByLibrary.simpleMessage("Platform Balance"),
"pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("Platform Payment Password"),
"pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("Platform payment password"),
"pingtaizongyue" : m24,
"pinpai" : MessageLookupByLibrary.simpleMessage("brand"),
"pinpaijieshao" : MessageLookupByLibrary.simpleMessage("Brand Introduction"),
@ -569,6 +573,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("Release Load More"),
"shifangshuaxin" : MessageLookupByLibrary.simpleMessage("Release Refresh"),
"shifujifen" : m30,
"shifujihuanka" : m31,
"shimingrenzheng" : MessageLookupByLibrary.simpleMessage("Real name authentication"),
"shixiaoquan" : MessageLookupByLibrary.simpleMessage("Invalid coupon"),
"shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("Invalid coupon"),
@ -595,7 +600,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shuliang" : MessageLookupByLibrary.simpleMessage("number"),
"shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("Please enter the consignee address"),
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("Enter payment password"),
"sui" : m31,
"sui" : m32,
"tangshi" : MessageLookupByLibrary.simpleMessage("tang shi"),
"tebieshengming" : MessageLookupByLibrary.simpleMessage("Special statement"),
"tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("Special offer area"),
@ -621,7 +626,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waisong" : MessageLookupByLibrary.simpleMessage("sending out"),
"wan" : MessageLookupByLibrary.simpleMessage("Play"),
"wancheng" : MessageLookupByLibrary.simpleMessage("finish"),
"wancheng_" : m32,
"wancheng_" : m33,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("Place an order once"),
"wangjimima" : MessageLookupByLibrary.simpleMessage("Forgot password"),
"wanjiankang" : MessageLookupByLibrary.simpleMessage("Play healthy"),
@ -665,7 +670,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("Logistics Information"),
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("Logistics status:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("Order placement time"),
"xiadanshijian_" : m33,
"xiadanshijian_" : m34,
"xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("Place orders integral"),
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("Pull down Refresh"),
"xiangce" : MessageLookupByLibrary.simpleMessage("album"),
@ -678,17 +683,19 @@ class MessageLookup extends MessageLookupByLibrary {
"xianxiashiyong" : MessageLookupByLibrary.simpleMessage("offline use"),
"xiaofei" : MessageLookupByLibrary.simpleMessage("consumption"),
"xiaofeijifen" : MessageLookupByLibrary.simpleMessage("Consumption Points"),
"xiaofeijihuanka" : MessageLookupByLibrary.simpleMessage("consume trading card"),
"xiaofeijilu" : MessageLookupByLibrary.simpleMessage("Consumption Record"),
"xiaoxi" : MessageLookupByLibrary.simpleMessage("Messages"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("Next Level"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("Loading completed"),
"xiedongtai" : MessageLookupByLibrary.simpleMessage("Write dynamic"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("privacy policy for returning home users"),
"xihuan_" : m34,
"xihuan_" : m35,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("Star Store Activity"),
"xingming" : MessageLookupByLibrary.simpleMessage("name"),
"xitongtongzhi" : MessageLookupByLibrary.simpleMessage("System Notification"),
"xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("System Messages"),
"xiugai" : MessageLookupByLibrary.simpleMessage("modify"),
"xiugaichenggong" : MessageLookupByLibrary.simpleMessage("Modification succeeded"),
"xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("Modify User Name"),
"xuanguige" : MessageLookupByLibrary.simpleMessage("Select specs"),
@ -703,11 +710,11 @@ class MessageLookup extends MessageLookupByLibrary {
"yanzhengma" : MessageLookupByLibrary.simpleMessage("verification code"),
"yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("Invite friends"),
"yaoqinghaoyoudefen" : MessageLookupByLibrary.simpleMessage("Invite friends to score"),
"yaoqingrenshoujihao_" : m35,
"yaoqingrenshoujihao_" : m36,
"yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("Invitation completed"),
"yibangfuka" : MessageLookupByLibrary.simpleMessage("bound sub card"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("redeemed"),
"yiduihuanjian" : m36,
"yiduihuanjian" : m37,
"yifahuo" : MessageLookupByLibrary.simpleMessage("Shipped"),
"yiguanzhu" : MessageLookupByLibrary.simpleMessage("Followed"),
"yihouzaishuo" : MessageLookupByLibrary.simpleMessage("Talk Later"),
@ -725,7 +732,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yindaoye3" : MessageLookupByLibrary.simpleMessage("Member activity zone"),
"yindaoye4" : MessageLookupByLibrary.simpleMessage("Live a healthy and organic life"),
"yingwen" : MessageLookupByLibrary.simpleMessage("United States"),
"yingyeshijian" : m37,
"yingyeshijian" : m38,
"yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("Silver card member"),
"yinshi" : MessageLookupByLibrary.simpleMessage("diet"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("Privacy Statement"),
@ -755,15 +762,15 @@ class MessageLookup extends MessageLookupByLibrary {
"youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("coupon collection"),
"youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("The preferential amount cannot accumulate points, and the corresponding points cannot be obtained for orders that are not successfully paid due to order cancellation or other reasons。"),
"youkedenglu" : MessageLookupByLibrary.simpleMessage("Visitor login"),
"youxiaoqi" : m38,
"youxiaoqi" : m39,
"youxiaoqixian" : MessageLookupByLibrary.simpleMessage("Valid Period:"),
"youxiaoqizhi" : m39,
"youxiaoqizhi" : m40,
"yuan" : MessageLookupByLibrary.simpleMessage("yuan"),
"yuan_" : m40,
"yuan_" : m41,
"yuanjia" : MessageLookupByLibrary.simpleMessage("original price"),
"yue" : MessageLookupByLibrary.simpleMessage("Balance"),
"yue_" : m41,
"yue__" : m42,
"yue_" : m42,
"yue__" : m43,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("Balance Details"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("Reserved telephone"),
"yunfei" : MessageLookupByLibrary.simpleMessage("Freight"),
@ -814,6 +821,6 @@ class MessageLookup extends MessageLookupByLibrary {
"zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("Diamond Member"),
"zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("Latest Articles"),
"zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("Score points for doing tasks"),
"zuozhe" : m43
"zuozhe" : m44
};
}

57
lib/generated/intl/messages_zh_CN.dart
Unescape View File

@ -81,31 +81,33 @@ class MessageLookup extends MessageLookupByLibrary {
static m30(jifen) => "实付积分 ${jifen}积分";
static m31(sui) => "${sui}岁";
static m31(jihuanka) => "实付集换卡 ${jihuanka}集换卡";
static m32(num) => "完成${num}";
static m32(sui) => "${sui}岁";
static m33(time) => "下单时间:${time}";
static m33(num) => "完成${num}";
static m34(xihuan) => "喜欢(${xihuan})";
static m34(time) => "下单时间:${time}";
static m35(shoujihao) => "邀请人手机号:${shoujihao}";
static m35(xihuan) => "喜欢(${xihuan})";
static m36(jian) => "已兑换${jian}件";
static m36(shoujihao) => "邀请人手机号:${shoujihao}";
static m37(time) => "营业时间: ${time}";
static m37(jian) => "已兑换${jian}件";
static m38(date) => "有效期:${date}";
static m38(time) => "营业时间: ${time}";
static m39(date) => "有效期至${date}";
static m39(date) => "有效期:${date}";
static m40(yuan) => "${yuan}元";
static m40(date) => "有效期至${date}";
static m41(yue) => "余额${yue}";
static m41(yuan) => "${yuan}元";
static m42(yue) => "余额${yue}";
static m43(zuozhe) => "作者:${zuozhe}";
static m43(yue) => "余额 ${yue}";
static m44(zuozhe) => "作者:${zuozhe}";
final messages = _notInlinedMessages(_notInlinedMessages);
static _notInlinedMessages(_) => <String, Function> {
@ -114,6 +116,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白银会员"),
"banben" : m0,
"bangdingfuka" : MessageLookupByLibrary.simpleMessage("绑定副卡"),
"bangdingshouji" : MessageLookupByLibrary.simpleMessage("绑定手机"),
"bangong" : MessageLookupByLibrary.simpleMessage("办公"),
"bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("帮助与反馈"),
"baocun" : MessageLookupByLibrary.simpleMessage("保存"),
@ -346,6 +349,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenmingxi" : MessageLookupByLibrary.simpleMessage("积分明细"),
"jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"),
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
"jihuanka" : MessageLookupByLibrary.simpleMessage("集换卡"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
"jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"),
"jingxuanhuodong" : MessageLookupByLibrary.simpleMessage("精选活动"),
@ -569,6 +573,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"),
"shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"),
"shifujifen" : m30,
"shifujihuanka" : m31,
"shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"),
"shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
"shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@ -595,7 +600,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shuliang" : MessageLookupByLibrary.simpleMessage("数量"),
"shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"),
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
"sui" : m31,
"sui" : m32,
"tangshi" : MessageLookupByLibrary.simpleMessage("堂食"),
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
"tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠专区"),
@ -621,7 +626,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wan" : MessageLookupByLibrary.simpleMessage("玩"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32,
"wancheng_" : m33,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),
"wangjimima" : MessageLookupByLibrary.simpleMessage("忘记密码"),
"wanjiankang" : MessageLookupByLibrary.simpleMessage("玩健康"),
@ -665,7 +670,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"),
"xiadanshijian_" : m33,
"xiadanshijian_" : m34,
"xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("下单赚积分"),
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相册"),
@ -678,17 +683,19 @@ class MessageLookup extends MessageLookupByLibrary {
"xianxiashiyong" : MessageLookupByLibrary.simpleMessage("线下使用"),
"xiaofei" : MessageLookupByLibrary.simpleMessage("消费"),
"xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
"xiaofeijihuanka" : MessageLookupByLibrary.simpleMessage("消费集换卡"),
"xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消费记录"),
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
"xiedongtai" : MessageLookupByLibrary.simpleMessage("写动态"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
"xihuan_" : m34,
"xihuan_" : m35,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
"xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
"xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
"xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"),
"xiugai" : MessageLookupByLibrary.simpleMessage("修改"),
"xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
"xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用户名"),
"xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"),
@ -703,11 +710,11 @@ class MessageLookup extends MessageLookupByLibrary {
"yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"),
"yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀请好友"),
"yaoqinghaoyoudefen" : MessageLookupByLibrary.simpleMessage("邀请好友得分"),
"yaoqingrenshoujihao_" : m35,
"yaoqingrenshoujihao_" : m36,
"yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀请完成"),
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
"yiduihuanjian" : m36,
"yiduihuanjian" : m37,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
"yiguanzhu" : MessageLookupByLibrary.simpleMessage("已关注"),
"yihouzaishuo" : MessageLookupByLibrary.simpleMessage("以后再说"),
@ -725,7 +732,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"),
"yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
"yingwen" : MessageLookupByLibrary.simpleMessage("英文"),
"yingyeshijian" : m37,
"yingyeshijian" : m38,
"yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"),
"yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
@ -755,15 +762,15 @@ class MessageLookup extends MessageLookupByLibrary {
"youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"),
"youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"),
"youkedenglu" : MessageLookupByLibrary.simpleMessage("游客登录"),
"youxiaoqi" : m38,
"youxiaoqi" : m39,
"youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
"youxiaoqizhi" : m39,
"youxiaoqizhi" : m40,
"yuan" : MessageLookupByLibrary.simpleMessage("元"),
"yuan_" : m40,
"yuan_" : m41,
"yuanjia" : MessageLookupByLibrary.simpleMessage("原价"),
"yue" : MessageLookupByLibrary.simpleMessage("余额"),
"yue_" : m41,
"yue__" : m42,
"yue_" : m42,
"yue__" : m43,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("预留电话"),
"yunfei" : MessageLookupByLibrary.simpleMessage("运费"),
@ -814,6 +821,6 @@ class MessageLookup extends MessageLookupByLibrary {
"zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"),
"zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
"zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"),
"zuozhe" : m43
"zuozhe" : m44
};
}

57
lib/generated/intl/messages_zh_Hans_CN.dart
Unescape View File

@ -81,31 +81,33 @@ class MessageLookup extends MessageLookupByLibrary {
static m30(jifen) => "实付积分 ${jifen}积分";
static m31(sui) => "${sui}岁";
static m31(jihuanka) => "实付集换卡 ${jihuanka}集换卡";
static m32(num) => "完成${num}";
static m32(sui) => "${sui}岁";
static m33(time) => "下单时间:${time}";
static m33(num) => "完成${num}";
static m34(xihuan) => "喜欢(${xihuan})";
static m34(time) => "下单时间:${time}";
static m35(shoujihao) => "邀请人手机号:${shoujihao}";
static m35(xihuan) => "喜欢(${xihuan})";
static m36(jian) => "已兑换${jian}件";
static m36(shoujihao) => "邀请人手机号:${shoujihao}";
static m37(time) => "营业时间: ${time}";
static m37(jian) => "已兑换${jian}件";
static m38(date) => "有效期:${date}";
static m38(time) => "营业时间: ${time}";
static m39(date) => "有效期至${date}";
static m39(date) => "有效期:${date}";
static m40(yuan) => "${yuan}元";
static m40(date) => "有效期至${date}";
static m41(yue) => "余额${yue}";
static m41(yuan) => "${yuan}元";
static m42(yue) => "余额${yue}";
static m43(zuozhe) => "作者:${zuozhe}";
static m43(yue) => "余额 ${yue}";
static m44(zuozhe) => "作者:${zuozhe}";
final messages = _notInlinedMessages(_notInlinedMessages);
static _notInlinedMessages(_) => <String, Function> {
@ -114,6 +116,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白银会员"),
"banben" : m0,
"bangdingfuka" : MessageLookupByLibrary.simpleMessage("绑定副卡"),
"bangdingshouji" : MessageLookupByLibrary.simpleMessage("绑定手机"),
"bangong" : MessageLookupByLibrary.simpleMessage("办公"),
"bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("帮助与反馈"),
"baocun" : MessageLookupByLibrary.simpleMessage("保存"),
@ -346,6 +349,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenmingxi" : MessageLookupByLibrary.simpleMessage("积分明细"),
"jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"),
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
"jihuanka" : MessageLookupByLibrary.simpleMessage("集换卡"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
"jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"),
"jingxuanhuodong" : MessageLookupByLibrary.simpleMessage("精选活动"),
@ -569,6 +573,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"),
"shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"),
"shifujifen" : m30,
"shifujihuanka" : m31,
"shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"),
"shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
"shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@ -595,7 +600,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shuliang" : MessageLookupByLibrary.simpleMessage("数量"),
"shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"),
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
"sui" : m31,
"sui" : m32,
"tangshi" : MessageLookupByLibrary.simpleMessage("堂食"),
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
"tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠专区"),
@ -621,7 +626,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wan" : MessageLookupByLibrary.simpleMessage("玩"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32,
"wancheng_" : m33,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),
"wangjimima" : MessageLookupByLibrary.simpleMessage("忘记密码"),
"wanjiankang" : MessageLookupByLibrary.simpleMessage("玩健康"),
@ -665,7 +670,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"),
"xiadanshijian_" : m33,
"xiadanshijian_" : m34,
"xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("下单赚积分"),
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相册"),
@ -678,17 +683,19 @@ class MessageLookup extends MessageLookupByLibrary {
"xianxiashiyong" : MessageLookupByLibrary.simpleMessage("线下使用"),
"xiaofei" : MessageLookupByLibrary.simpleMessage("消费"),
"xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
"xiaofeijihuanka" : MessageLookupByLibrary.simpleMessage("消费集换卡"),
"xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消费记录"),
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
"xiedongtai" : MessageLookupByLibrary.simpleMessage("写动态"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
"xihuan_" : m34,
"xihuan_" : m35,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
"xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
"xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
"xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"),
"xiugai" : MessageLookupByLibrary.simpleMessage("修改"),
"xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
"xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用户名"),
"xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"),
@ -703,11 +710,11 @@ class MessageLookup extends MessageLookupByLibrary {
"yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"),
"yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀请好友"),
"yaoqinghaoyoudefen" : MessageLookupByLibrary.simpleMessage("邀请好友得分"),
"yaoqingrenshoujihao_" : m35,
"yaoqingrenshoujihao_" : m36,
"yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀请完成"),
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
"yiduihuanjian" : m36,
"yiduihuanjian" : m37,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
"yiguanzhu" : MessageLookupByLibrary.simpleMessage("已关注"),
"yihouzaishuo" : MessageLookupByLibrary.simpleMessage("以后再说"),
@ -725,7 +732,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"),
"yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
"yingwen" : MessageLookupByLibrary.simpleMessage("英文"),
"yingyeshijian" : m37,
"yingyeshijian" : m38,
"yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"),
"yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
@ -755,15 +762,15 @@ class MessageLookup extends MessageLookupByLibrary {
"youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"),
"youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"),
"youkedenglu" : MessageLookupByLibrary.simpleMessage("游客登录"),
"youxiaoqi" : m38,
"youxiaoqi" : m39,
"youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
"youxiaoqizhi" : m39,
"youxiaoqizhi" : m40,
"yuan" : MessageLookupByLibrary.simpleMessage("元"),
"yuan_" : m40,
"yuan_" : m41,
"yuanjia" : MessageLookupByLibrary.simpleMessage("原价"),
"yue" : MessageLookupByLibrary.simpleMessage("余额"),
"yue_" : m41,
"yue__" : m42,
"yue_" : m42,
"yue__" : m43,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("预留电话"),
"yunfei" : MessageLookupByLibrary.simpleMessage("运费"),
@ -814,6 +821,6 @@ class MessageLookup extends MessageLookupByLibrary {
"zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"),
"zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
"zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"),
"zuozhe" : m43
"zuozhe" : m44
};
}

57
lib/generated/intl/messages_zh_Hant_CN.dart
Unescape View File

@ -79,31 +79,33 @@ class MessageLookup extends MessageLookupByLibrary {
static m30(jifen) => "實付積分 ${jifen}積分";
static m31(sui) => "${sui}嵗";
static m31(jihuanka) => "實付集換卡 ${jihuanka}集換卡";
static m32(num) => "完成${num}";
static m32(sui) => "${sui}嵗";
static m33(time) => "下單時間:${time}";
static m33(num) => "完成${num}";
static m34(xihuan) => "喜歡(${xihuan})";
static m34(time) => "下單時間:${time}";
static m35(shoujihao) => "邀请人手機號:${shoujihao}";
static m35(xihuan) => "喜歡(${xihuan})";
static m36(jian) => "已兌換${jian}件";
static m36(shoujihao) => "邀请人手機號:${shoujihao}";
static m37(time) => "營業時間: ${time}";
static m37(jian) => "已兌換${jian}件";
static m38(date) => "有效期:${date}";
static m38(time) => "營業時間: ${time}";
static m39(date) => "有效期至${date}";
static m39(date) => "有效期:${date}";
static m40(yuan) => "${yuan}元";
static m40(date) => "有效期至${date}";
static m41(yue) => "餘額${yue}";
static m41(yuan) => "${yuan}元";
static m42(yue) => "餘額${yue}";
static m43(zuozhe) => "作者:${zuozhe}";
static m43(yue) => "餘額 ${yue}";
static m44(zuozhe) => "作者:${zuozhe}";
final messages = _notInlinedMessages(_notInlinedMessages);
static _notInlinedMessages(_) => <String, Function> {
@ -112,6 +114,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白銀會員"),
"banben" : m0,
"bangdingfuka" : MessageLookupByLibrary.simpleMessage("綁定副卡"),
"bangdingshouji" : MessageLookupByLibrary.simpleMessage("綁定手機"),
"bangong" : MessageLookupByLibrary.simpleMessage("辦公"),
"bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("幫助與反饋"),
"baocun" : MessageLookupByLibrary.simpleMessage("保存"),
@ -342,6 +345,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenmingxi" : MessageLookupByLibrary.simpleMessage("積分明細"),
"jifenshangcheng" : MessageLookupByLibrary.simpleMessage("積分商城"),
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"),
"jihuanka" : MessageLookupByLibrary.simpleMessage("集換卡"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"),
"jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精選好文"),
"jingxuanhuodong" : MessageLookupByLibrary.simpleMessage("精選活動"),
@ -564,6 +568,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("釋放加載更多"),
"shifangshuaxin" : MessageLookupByLibrary.simpleMessage("釋放刷新"),
"shifujifen" : m30,
"shifujihuanka" : m31,
"shimingrenzheng" : MessageLookupByLibrary.simpleMessage("實名認證"),
"shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
"shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@ -589,7 +594,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shuliang" : MessageLookupByLibrary.simpleMessage("數量"),
"shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人地址"),
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"),
"sui" : m31,
"sui" : m32,
"tangshi" : MessageLookupByLibrary.simpleMessage("堂食"),
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"),
"tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠專區"),
@ -615,7 +620,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wan" : MessageLookupByLibrary.simpleMessage("玩"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32,
"wancheng_" : m33,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"),
"wangjimima" : MessageLookupByLibrary.simpleMessage("忘記密碼"),
"wanjiankang" : MessageLookupByLibrary.simpleMessage("玩健康"),
@ -659,7 +664,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流狀態:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下單時間"),
"xiadanshijian_" : m33,
"xiadanshijian_" : m34,
"xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("下單賺積分"),
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相冊"),
@ -672,17 +677,19 @@ class MessageLookup extends MessageLookupByLibrary {
"xianxiashiyong" : MessageLookupByLibrary.simpleMessage("線下使用"),
"xiaofei" : MessageLookupByLibrary.simpleMessage("消費"),
"xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
"xiaofeijihuanka" : MessageLookupByLibrary.simpleMessage("消費集換卡"),
"xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消費記錄"),
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加載完成"),
"xiedongtai" : MessageLookupByLibrary.simpleMessage("寫動態"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"),
"xihuan_" : m34,
"xihuan_" : m35,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"),
"xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
"xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系統通知"),
"xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系統消息"),
"xiugai" : MessageLookupByLibrary.simpleMessage("修改"),
"xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
"xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用戶名"),
"xuanguige" : MessageLookupByLibrary.simpleMessage("選規格"),
@ -697,11 +704,11 @@ class MessageLookup extends MessageLookupByLibrary {
"yanzhengma" : MessageLookupByLibrary.simpleMessage("驗證碼"),
"yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀請好友"),
"yaoqinghaoyoudefen" : MessageLookupByLibrary.simpleMessage("邀請好友得分"),
"yaoqingrenshoujihao_" : m35,
"yaoqingrenshoujihao_" : m36,
"yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀請完成"),
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已綁副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"),
"yiduihuanjian" : m36,
"yiduihuanjian" : m37,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"),
"yiguanzhu" : MessageLookupByLibrary.simpleMessage("已關注"),
"yihouzaishuo" : MessageLookupByLibrary.simpleMessage("以後再說"),
@ -719,7 +726,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"),
"yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
"yingwen" : MessageLookupByLibrary.simpleMessage("英文"),
"yingyeshijian" : m37,
"yingyeshijian" : m38,
"yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"),
"yinshi" : MessageLookupByLibrary.simpleMessage("飲食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"),
@ -749,15 +756,15 @@ class MessageLookup extends MessageLookupByLibrary {
"youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("優惠券領取"),
"youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("優惠金額無法累積積分，訂單撤銷或其他原因造成的未成功支付的訂單，無法獲得對應的積分。"),
"youkedenglu" : MessageLookupByLibrary.simpleMessage("遊客登錄"),
"youxiaoqi" : m38,
"youxiaoqi" : m39,
"youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
"youxiaoqizhi" : m39,
"youxiaoqizhi" : m40,
"yuan" : MessageLookupByLibrary.simpleMessage("元"),
"yuan_" : m40,
"yuan_" : m41,
"yuanjia" : MessageLookupByLibrary.simpleMessage("原價"),
"yue" : MessageLookupByLibrary.simpleMessage("餘額"),
"yue_" : m41,
"yue__" : m42,
"yue_" : m42,
"yue__" : m43,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("預留電話"),
"yunfei" : MessageLookupByLibrary.simpleMessage("運費"),
@ -808,6 +815,6 @@ class MessageLookup extends MessageLookupByLibrary {
"zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"),
"zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
"zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"),
"zuozhe" : m43
"zuozhe" : m44
};
}

57
lib/generated/intl/messages_zh_TW.dart
Unescape View File

@ -79,31 +79,33 @@ class MessageLookup extends MessageLookupByLibrary {
static m30(jifen) => "實付積分 ${jifen}積分";
static m31(sui) => "${sui}嵗";
static m31(jihuanka) => "實付集換卡 ${jihuanka}集換卡";
static m32(num) => "完成${num}";
static m32(sui) => "${sui}嵗";
static m33(time) => "下單時間:${time}";
static m33(num) => "完成${num}";
static m34(xihuan) => "喜歡(${xihuan})";
static m34(time) => "下單時間:${time}";
static m35(shoujihao) => "邀请人手機號:${shoujihao}";
static m35(xihuan) => "喜歡(${xihuan})";
static m36(jian) => "已兌換${jian}件";
static m36(shoujihao) => "邀请人手機號:${shoujihao}";
static m37(time) => "營業時間: ${time}";
static m37(jian) => "已兌換${jian}件";
static m38(date) => "有效期:${date}";
static m38(time) => "營業時間: ${time}";
static m39(date) => "有效期至${date}";
static m39(date) => "有效期:${date}";
static m40(yuan) => "${yuan}元";
static m40(date) => "有效期至${date}";
static m41(yue) => "餘額${yue}";
static m41(yuan) => "${yuan}元";
static m42(yue) => "餘額${yue}";
static m43(zuozhe) => "作者:${zuozhe}";
static m43(yue) => "餘額 ${yue}";
static m44(zuozhe) => "作者:${zuozhe}";
final messages = _notInlinedMessages(_notInlinedMessages);
static _notInlinedMessages(_) => <String, Function> {
@ -112,6 +114,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白銀會員"),
"banben" : m0,
"bangdingfuka" : MessageLookupByLibrary.simpleMessage("綁定副卡"),
"bangdingshouji" : MessageLookupByLibrary.simpleMessage("綁定手機"),
"bangong" : MessageLookupByLibrary.simpleMessage("辦公"),
"bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("幫助與反饋"),
"baocun" : MessageLookupByLibrary.simpleMessage("保存"),
@ -344,6 +347,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenmingxi" : MessageLookupByLibrary.simpleMessage("積分明細"),
"jifenshangcheng" : MessageLookupByLibrary.simpleMessage("積分商城"),
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"),
"jihuanka" : MessageLookupByLibrary.simpleMessage("集換卡"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"),
"jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精選好文"),
"jingxuanhuodong" : MessageLookupByLibrary.simpleMessage("精選活動"),
@ -566,6 +570,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("釋放加載更多"),
"shifangshuaxin" : MessageLookupByLibrary.simpleMessage("釋放刷新"),
"shifujifen" : m30,
"shifujihuanka" : m31,
"shimingrenzheng" : MessageLookupByLibrary.simpleMessage("實名認證"),
"shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
"shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@ -592,7 +597,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shuliang" : MessageLookupByLibrary.simpleMessage("數量"),
"shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人地址"),
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"),
"sui" : m31,
"sui" : m32,
"tangshi" : MessageLookupByLibrary.simpleMessage("堂食"),
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"),
"tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠專區"),
@ -618,7 +623,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wan" : MessageLookupByLibrary.simpleMessage("玩"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32,
"wancheng_" : m33,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"),
"wangjimima" : MessageLookupByLibrary.simpleMessage("忘記密碼"),
"wanjiankang" : MessageLookupByLibrary.simpleMessage("玩健康"),
@ -662,7 +667,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流狀態:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下單時間"),
"xiadanshijian_" : m33,
"xiadanshijian_" : m34,
"xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("下單賺積分"),
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相冊"),
@ -675,17 +680,19 @@ class MessageLookup extends MessageLookupByLibrary {
"xianxiashiyong" : MessageLookupByLibrary.simpleMessage("線下使用"),
"xiaofei" : MessageLookupByLibrary.simpleMessage("消費"),
"xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
"xiaofeijihuanka" : MessageLookupByLibrary.simpleMessage("消費集換卡"),
"xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消費記錄"),
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加載完成"),
"xiedongtai" : MessageLookupByLibrary.simpleMessage("寫動態"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"),
"xihuan_" : m34,
"xihuan_" : m35,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"),
"xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
"xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系統通知"),
"xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系統消息"),
"xiugai" : MessageLookupByLibrary.simpleMessage("修改"),
"xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
"xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用戶名"),
"xuanguige" : MessageLookupByLibrary.simpleMessage("選規格"),
@ -700,11 +707,11 @@ class MessageLookup extends MessageLookupByLibrary {
"yanzhengma" : MessageLookupByLibrary.simpleMessage("驗證碼"),
"yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀請好友"),
"yaoqinghaoyoudefen" : MessageLookupByLibrary.simpleMessage("邀請好友得分"),
"yaoqingrenshoujihao_" : m35,
"yaoqingrenshoujihao_" : m36,
"yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀請完成"),
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已綁副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"),
"yiduihuanjian" : m36,
"yiduihuanjian" : m37,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"),
"yiguanzhu" : MessageLookupByLibrary.simpleMessage("已關注"),
"yihouzaishuo" : MessageLookupByLibrary.simpleMessage("以後再說"),
@ -722,7 +729,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"),
"yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
"yingwen" : MessageLookupByLibrary.simpleMessage("英文"),
"yingyeshijian" : m37,
"yingyeshijian" : m38,
"yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"),
"yinshi" : MessageLookupByLibrary.simpleMessage("飲食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"),
@ -752,15 +759,15 @@ class MessageLookup extends MessageLookupByLibrary {
"youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("優惠券領取"),
"youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("優惠金額無法累積積分，訂單撤銷或其他原因造成的未成功支付的訂單，無法獲得對應的積分。"),
"youkedenglu" : MessageLookupByLibrary.simpleMessage("遊客登錄"),
"youxiaoqi" : m38,
"youxiaoqi" : m39,
"youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
"youxiaoqizhi" : m39,
"youxiaoqizhi" : m40,
"yuan" : MessageLookupByLibrary.simpleMessage("元"),
"yuan_" : m40,
"yuan_" : m41,
"yuanjia" : MessageLookupByLibrary.simpleMessage("原價"),
"yue" : MessageLookupByLibrary.simpleMessage("餘額"),
"yue_" : m41,
"yue__" : m42,
"yue_" : m42,
"yue__" : m43,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("預留電話"),
"yunfei" : MessageLookupByLibrary.simpleMessage("運費"),
@ -811,6 +818,6 @@ class MessageLookup extends MessageLookupByLibrary {
"zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"),
"zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
"zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"),
"zuozhe" : m43
"zuozhe" : m44
};
}

50
lib/generated/l10n.dart
Unescape View File

@ -7085,6 +7085,56 @@ class S {
);
}
/// `实付集换卡 {jihuanka}集换卡`
String shifujihuanka(Object jihuanka) {
return Intl.message(
'实付集换卡 $jihuanka集换卡',
name: 'shifujihuanka',
desc: '',
args: [jihuanka],
);
}
/// `集换卡`
String get jihuanka {
return Intl.message(
'集换卡',
name: 'jihuanka',
desc: '',
args: [],
);
}
/// `消费集换卡`
String get xiaofeijihuanka {
return Intl.message(
'消费集换卡',
name: 'xiaofeijihuanka',
desc: '',
args: [],
);
}
/// `修改`
String get xiugai {
return Intl.message(
'修改',
name: 'xiugai',
desc: '',
args: [],
);
}
/// `绑定手机`
String get bangdingshouji {
return Intl.message(
'绑定手机',
name: 'bangdingshouji',
desc: '',
args: [],
);
}
/// `并使用本机号码登录`
String get privacy_policy4 {
return Intl.message(

8
lib/home/welfare_exchange.dart
Unescape View File

@ -211,7 +211,7 @@ class _WelfareExchange extends State<WelfareExchange>
),
],
)),
expandedHeight: 258.h,
expandedHeight: MediaQuery.of(context).size.height >= 750 ? 245.h : 258.h,
bottom: PreferredSize(
preferredSize: Size(double.infinity, 0),
child: DefaultTabController(
@ -269,7 +269,7 @@ class _WelfareExchange extends State<WelfareExchange>
onRefresh: _onRefresh,
child: Container(
color: Colors.white,
padding: EdgeInsets.only(top: 19.h),
padding: EdgeInsets.only(top: 15.h),
child: pointList(),
)),
),
@ -561,7 +561,9 @@ class _WelfareExchange extends State<WelfareExchange>
String pointPrice(Goods goods) {
if (goods == null) return "";
if (goods?.onePrice != null && goods?.onePrice != "0") {
if(goods?.oneBean!=null && goods?.oneBean!="0"){
return "${goods?.oneBean}集换卡";
} else if (goods?.onePrice != null && goods?.onePrice != "0") {
return S.of(context).jifen_(goods?.onePrice);
} else if ((goods?.onePrice == null || goods?.onePrice == "0") &&
((goods?.price != null && goods?.price != "0") ||

27
lib/home/welfare_page.dart
Unescape View File

@ -144,6 +144,8 @@ class _WelfarePage extends State<WelfarePage> {
@override
Widget build(BuildContext context) {
return Stack(
children: [
Column(
children: [
Container(
decoration: BoxDecoration(
@ -155,6 +157,9 @@ class _WelfarePage extends State<WelfarePage> {
width: double.infinity,
height: 236.h,
),
Expanded(child: Container(color: Colors.white,))
],
),
Scaffold(
backgroundColor: Colors.transparent,
appBar: MyAppBar(
@ -183,7 +188,21 @@ class _WelfarePage extends State<WelfarePage> {
physics: BouncingScrollPhysics(),
scrollController: ScrollController(),
child: Container(
// margin: EdgeInsets.only(top:30.h,left: 14,right: 14),
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(6),
topRight: Radius.circular(6),),
color: Colors.white,
boxShadow: [
BoxShadow(
color: Color(0x08213303).withAlpha(12),
offset: Offset(0, 2),
blurRadius: 3,
spreadRadius: 0,
),
],
),
margin: EdgeInsets.only(top: 95.h),
child: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Column(
@ -220,7 +239,6 @@ class _WelfarePage extends State<WelfarePage> {
Widget weekCoupons() {
return Container(
width: double.infinity,
margin: EdgeInsets.only(top: 95.h),
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(6),
@ -235,7 +253,6 @@ class _WelfarePage extends State<WelfarePage> {
),
],
),
// margin: EdgeInsets.only(top: 139.h),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
@ -898,7 +915,9 @@ class _WelfarePage extends State<WelfarePage> {
String pointPrice(Goods goodsPrice){
if(goodsPrice == null)
return "";
if(goodsPrice?.onePrice!=null && goodsPrice?.onePrice!="0"){
if(goodsPrice?.oneBean!=null && goodsPrice?.oneBean!="0"){
return "${goodsPrice?.oneBean}集换卡";
} else if(goodsPrice?.onePrice!=null && goodsPrice?.onePrice!="0"){
return S.of(context).jifen_(goodsPrice?.onePrice);
}else if((goodsPrice?.onePrice == null || goodsPrice?.onePrice == "0") && ((goodsPrice?.price != null && goodsPrice?.price != "0") || (goodsPrice?.money != null && goodsPrice?.money != "0.00"))){
return (goodsPrice?.price== "0"|| goodsPrice?.price == null ? "" : S.of(context).jifen_(goodsPrice?.price)) + (goodsPrice?.money== "0"|| goodsPrice?.money == null ? "" : " + ${AppUtils.calculateDouble(double.tryParse(goodsPrice?.money) ?? 0)}元");

7
lib/l10n/intl_en.arb
Unescape View File

@ -736,6 +736,13 @@
"xuanhaola":"选好啦",
"qudaolaiyuan":"渠道来源",
"shuliang":"数量",
"shifujihuanka": "实付集换卡 {jihuanka}集换卡",
"jihuanka":"集换卡",
"xiaofeijihuanka":"消费集换卡",
"pingtaizhifumima":"平台支付密码",
"xiugai":"修改",
"bangdingshouji":"绑定手机",

6
lib/l10n/intl_en_US.arb
Unescape View File

@ -737,6 +737,12 @@
"xuanhaola":"select success",
"qudaolaiyuan":"channel source",
"shuliang":"number",
"shifujihuanka": "paid-in trading card {jihuanka}trading card",
"jihuanka":"trading card",
"xiaofeijihuanka":"consume trading card",
"pingtaizhifumima":"Platform payment password",
"xiugai":"modify",
"bangdingshouji":"bind phone",

6
lib/l10n/intl_zh_CN.arb
Unescape View File

@ -737,6 +737,12 @@
"xuanhaola":"选好啦",
"qudaolaiyuan":"渠道来源",
"shuliang":"数量",
"shifujihuanka": "实付集换卡 {jihuanka}集换卡",
"jihuanka":"集换卡",
"xiaofeijihuanka":"消费集换卡",
"pingtaizhifumima":"平台支付密码",
"xiugai":"修改",
"bangdingshouji":"绑定手机",

6
lib/l10n/intl_zh_Hans_CN.arb
Unescape View File

@ -737,6 +737,12 @@
"xuanhaola":"选好啦",
"qudaolaiyuan":"渠道来源",
"shuliang":"数量",
"shifujihuanka": "实付集换卡 {jihuanka}集换卡",
"jihuanka":"集换卡",
"xiaofeijihuanka":"消费集换卡",
"pingtaizhifumima":"平台支付密码",
"xiugai":"修改",
"bangdingshouji":"绑定手机",

6
lib/l10n/intl_zh_Hant_CN.arb
Unescape View File

@ -728,6 +728,12 @@
"xuanhaola":"選好啦",
"qudaolaiyuan":"渠道來源",
"shuliang":"數量",
"shifujihuanka": "實付集換卡 {jihuanka}集換卡",
"jihuanka":"集換卡",
"xiaofeijihuanka":"消費集換卡",
"pingtaizhifumima":"平臺支付密碼",
"xiugai":"修改",
"bangdingshouji":"綁定手機",

6
lib/l10n/intl_zh_TW.arb
Unescape View File

@ -730,6 +730,12 @@
"xuanhaola":"選好啦",
"qudaolaiyuan":"渠道來源",
"shuliang":"數量",
"shifujihuanka": "實付集換卡 {jihuanka}集換卡",
"jihuanka":"集換卡",
"xiaofeijihuanka":"消費集換卡",
"pingtaizhifumima":"平臺支付密碼",
"xiugai":"修改",
"bangdingshouji":"綁定手機",

2
lib/login/new_login_page.dart
Unescape View File

@ -445,7 +445,7 @@ class _NewLoginPage extends State<NewLoginPage> {
Container(
height: 30.h,
width: MediaQuery.of(context).size.width - 100.w,
margin: EdgeInsets.only(bottom:Platform.isIOS ? 10.h:0),
margin: EdgeInsets.only(bottom:Platform.isIOS ? 10.h:5.h),
child: TextField(
style: TextStyle(
height: 1.h,

4
lib/order/exchange_history_page.dart
Unescape View File

@ -445,12 +445,12 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList>
Text(
exchangeOrder?.amount == null || exchangeOrder.amount == "0"
? ""
: S.of(context).shifujifen((exchangeOrder.amount)) +
: exchangeOrder.payType == 2 ? S.of(context).shifujihuanka(exchangeOrder.amount):(S.of(context).shifujifen(exchangeOrder.amount) +
( exchangeOrder?.creditOrderDetailList[0]?.money == null ||
exchangeOrder?.creditOrderDetailList[0]?.money ==
"0.00"
? ""
: " + ${double.parse(exchangeOrder?.creditOrderDetailList[0]?.money.toString()) * exchangeOrder?.creditOrderDetailList[0].goodsNumber}元"),
: " + ${double.parse(exchangeOrder?.creditOrderDetailList[0]?.money.toString()) * exchangeOrder?.creditOrderDetailList[0].goodsNumber}元")),
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.semi_bold,

10
lib/order/exchange_order_page.dart
Unescape View File

@ -680,7 +680,7 @@ class _ExchangeOrderPage extends State<ExchangeOrderPage> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
payableAmount().contains("集换卡")? "现金抵扣集换卡":"现金抵扣积分",
payableAmount().contains(S.of(context).jihuanka)? "现金抵扣集换卡":"现金抵扣积分",
style: TextStyle(
fontSize: 14,
color: Color(0xFF353535),
@ -1210,8 +1210,11 @@ class _ExchangeOrderPage extends State<ExchangeOrderPage> {
}
await Navigator.of(context)
.pushNamed('/router/exchange_order_success_page', arguments: {
"price": realPay.contains("积分")
? realPay.substring(0, realPay.indexOf("积分"))
"price": realPay.contains(S.of(context).jifen)
? realPay.substring(0, realPay.indexOf(S.of(context).jifen))
: "0",
"happyBeanPrice":realPay.contains(S.of(context).xiaofeijihuanka)
? realPay.substring(0, realPay.indexOf(S.of(context).xiaofeijihuanka))
: "0",
"realPay": realPay,
"points": points,
@ -1220,6 +1223,7 @@ class _ExchangeOrderPage extends State<ExchangeOrderPage> {
"id": baseDate.data
});
points = "${int.tryParse(points) - int.tryParse(widget.arguments["price"])}";
happyBean = "${int.tryParse(happyBean) - int.tryParse(widget.arguments["price"])}";
Navigator.of(context).pop();
} else {
SmartDialog.showToast(baseDate.msg, alignment: Alignment.center);

11
lib/order/exchange_order_success_page.dart
Unescape View File

@ -25,20 +25,22 @@ class ExchangeOrderSuccessPage extends StatefulWidget {
class _ExchangeOrderSuccessPage extends State<ExchangeOrderSuccessPage> {
int price = 0;
int happyBean = 0;
ApiService apiService;
int happyBeanPrice= 0;
@override
void initState() {
super.initState();
price = double.parse((widget.arguments["points"] ?? "0").toString()).toInt() -
double.parse((widget.arguments["price"] ?? "0").toString()).toInt();
happyBeanPrice = double.parse((widget.arguments["happyBean"] ?? "0").toString()).toInt() -
double.parse((widget.arguments["happyBeanPrice"] ?? "0").toString()).toInt();
UserInfo userInfo;
SharedPreferences.getInstance().then((value){
apiService = ApiService(Dio(), context: context, token: value.getString("token"));
userInfo = UserInfo.fromJson(jsonDecode(value.getString('user')));
userInfo.points = "$price";
userInfo.happyBean = "$happyBean";
userInfo.happyBean = "$happyBeanPrice";
value.setString('user', jsonEncode(userInfo.toJson()));
});
@ -84,7 +86,8 @@ class _ExchangeOrderSuccessPage extends State<ExchangeOrderSuccessPage> {
height:45.h,
),
Text(
widget.arguments["realPay"].toString().contains("集换卡") ? "消费集换卡":S.of(context).xiaofeijifen,
widget.arguments["realPay"].toString().contains(S.of(context).xiaofeijihuanka) ?
S.of(context).xiaofeijihuanka: (widget.arguments["realPay"].toString().contains(S.of(context).jifen) ? S.of(context).xiaofeijifen : "消费金额"),
style: TextStyle(
color: Color(0xFF727272),
fontSize: 14.sp,
@ -119,7 +122,7 @@ class _ExchangeOrderSuccessPage extends State<ExchangeOrderSuccessPage> {
height: 14.h,
),
Text(
"$happyBean",
"$happyBeanPrice",
style: TextStyle(
color: Colors.black,
fontSize: 21.sp,

3
lib/retrofit/data/exchange_order.dart
Unescape View File

@ -14,6 +14,7 @@ class ExchangeOrder {
String amount;
String money;
int payStatus;
int payType;
int sendStatus;
String address;
String recAddress;
@ -34,6 +35,7 @@ class ExchangeOrder {
..amount = json['amount'] as String
..money = json['money'] as String
..payStatus = json['payStatus'] as int
..payType = json['payType'] as int
..sendStatus = json['sendStatus'] as int
..address = json['address'] as String
..recAddress = json['recAddress'] as String
@ -58,6 +60,7 @@ class ExchangeOrder {
'amount': this.amount,
'money': this.money,
'payStatus': this.payStatus,
'payType':this.payType,
'sendStatus': this.sendStatus,
'address': this.address,
'recAddress': this.recAddress,

4
lib/setting/account_security_page.dart
Unescape View File

@ -102,7 +102,7 @@ class _AccountSecurityPage extends State<AccountSecurityPage> {
children: [
Expanded(
child: Text(
"绑定手机",
S.of(context).bangdingshouji,
style: TextStyle(
fontWeight: MyFontWeight.semi_bold,
fontSize: 15.sp,
@ -154,7 +154,7 @@ class _AccountSecurityPage extends State<AccountSecurityPage> {
),
if(userInfo?.hasPayPassword != null)
Text(
(userInfo?.hasPayPassword ?? true)? "修改" :"设置",
(userInfo?.hasPayPassword ?? true)? S.of(context).xiugai :S.of(context).shezhi,
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.regular,

2
lib/settlement/settlement_view/settlement_order_commodity.dart
Unescape View File

@ -135,7 +135,7 @@ class _SettlementOrderCommodity extends State<SettlementOrderCommodity> {
if (widget.useVipPriceSelect &&
widget.settleOrderInfo.memberVO.isVip &&
(widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false)) &&
(widget?.settleOrderInfo?.discountType == "VIP" )) {
(widget?.settleOrderInfo?.discountType == "VIP" && widget?.settleOrderInfo?.vipDiscountAmount != "0")) {
widgets.add(vipItem(Color(0xFFFF7A1A), "VIP优惠",
(widget.minOrderInfo != null && widget.minOrderInfo.orderProductVOList != null) ? (widget.minOrderInfo?.discountAmount ?? ""):(widget?.settleOrderInfo?.vipDiscountAmount ?? "")));
}

1
lib/store/store_order.dart
Unescape View File

@ -92,7 +92,6 @@ class _StoreOrderPage extends State<StoreOrderPage>
SharedPreferences.getInstance().then((value) {
minLogin(value);
queryStoreInfo();
});
}

19
lib/utils/flutter_utils.dart
Unescape View File

@ -28,6 +28,25 @@ class AppUtils {
return double.tryParse(valueStr.substring(0, valueStr.indexOf(".") + 3))??0;
}
///使用16进制色值并返回对应色值的方法
static Color getLighterColor(String hexColor) {
// 将16进制颜色值转换为Color对象
Color color = Color(int.parse(hexColor.replaceAll("#", ""), radix: 16));
// 计算颜色的RGB值
int red = color.red + 39;
int green = color.green + 52;
int blue = color.blue + 86;
// 确保RGB值不超过255
red = red > 255 ? 255 : red;
green = green > 255 ? 255 : green;
blue = blue > 255 ? 255 : blue;
// 返回较浅的颜色值
return Color.fromARGB(255, red, green, blue);
}
///版本号
static bool versionCompare(String localVersion, String serverVersion) {
try {

15
lib/utils/upload_async.dart
Unescape View File

@ -34,14 +34,23 @@ class UploadAsync {
decoration: BoxDecoration(
color: Colors.grey, borderRadius: BorderRadius.circular(2)),
child: dynamicType == 0
? Text(
? Expanded(child: Column(
children: [
Text(
dynamicText,
maxLines: 5,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontWeight: MyFontWeight.semi_bold,
fontSize: 10.sp,
fontSize: dynamicText.length > 10 ? (dynamicText.length > 20?8.sp:10.sp):15.sp,
color: Color(0xFFCDCCCC),
),
)
),
Expanded(child:
Container(
height: 20.h,
))
]))
: ClipRRect(
borderRadius: BorderRadius.circular(2),
child: Image.file(

Write Preview
Loading…
Cancel
Save