Browse Source

英文更改

dart3_last
wurong 2 years ago
parent
commit
beed451496
  1. 4
      lib/generated/intl/messages_en.dart
  2. 36
      lib/generated/intl/messages_en_US.dart
  3. 4
      lib/generated/intl/messages_zh_CN.dart
  4. 4
      lib/generated/intl/messages_zh_Hans_CN.dart
  5. 4
      lib/generated/intl/messages_zh_Hant_CN.dart
  6. 4
      lib/generated/intl/messages_zh_TW.dart
  7. 40
      lib/generated/l10n.dart
  8. 2
      lib/home/home_view/shortcut_operation.dart
  9. 2
      lib/home/welfare_exchange.dart
  10. 4
      lib/l10n/intl_en.arb
  11. 37
      lib/l10n/intl_en_US.arb
  12. 4
      lib/l10n/intl_zh_CN.arb
  13. 4
      lib/l10n/intl_zh_Hans_CN.arb
  14. 4
      lib/l10n/intl_zh_Hant_CN.arb
  15. 4
      lib/l10n/intl_zh_TW.arb
  16. 4
      lib/main.dart
  17. 2
      lib/message/system_message.dart
  18. 14
      lib/store/store_order.dart
  19. 8
      lib/store/store_view/shop_goods.dart
  20. 6
      lib/union/union_page.dart

4
lib/generated/intl/messages_en.dart

@ -150,6 +150,7 @@ class MessageLookup extends MessageLookupByLibrary {
"chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"),
"chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"),
"chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员,享专属权益"),
"chi" : MessageLookupByLibrary.simpleMessage(""),
"chijiankang" : MessageLookupByLibrary.simpleMessage("吃健康"),
"chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
"chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
@ -189,6 +190,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dianputuijian" : MessageLookupByLibrary.simpleMessage("店铺推荐"),
"dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"),
"dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
"dianzan" : MessageLookupByLibrary.simpleMessage("点赞"),
"dianzanxihuan_" : m3,
"dingdan" : MessageLookupByLibrary.simpleMessage("订单"),
"dingdanbianhao" : MessageLookupByLibrary.simpleMessage("订单编号"),
@ -276,6 +278,7 @@ class MessageLookup extends MessageLookupByLibrary {
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友奖励规则"),
"he" : MessageLookupByLibrary.simpleMessage(""),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"),
"hejiankang" : MessageLookupByLibrary.simpleMessage("喝健康"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
@ -592,6 +595,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waimai" : MessageLookupByLibrary.simpleMessage("外卖"),
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wan" : MessageLookupByLibrary.simpleMessage(""),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),

36
lib/generated/intl/messages_en_US.dart

@ -115,14 +115,14 @@ class MessageLookup extends MessageLookupByLibrary {
"banben" : m0,
"bangdingfuka" : MessageLookupByLibrary.simpleMessage("binding sub card"),
"bangong" : MessageLookupByLibrary.simpleMessage("Office"),
"bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("Help and Feedback"),
"bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("Help"),
"baocun" : MessageLookupByLibrary.simpleMessage("Save"),
"baocunchenggong" : MessageLookupByLibrary.simpleMessage("Saving succeeded"),
"baocunsaoma" : MessageLookupByLibrary.simpleMessage("The screenshot saves the QR code below, invites others to scan WeChat for identification, long press follow, completes the small game, receives the coupon, and the invitation is successful!"),
"beiyaoqingdejiangli" : MessageLookupByLibrary.simpleMessage("Each invited user can get a coupon of 10 yuan for Qianjin Maiwei after entering the invitation code"),
"beizhu" : MessageLookupByLibrary.simpleMessage("Remarks"),
"beizhuxinxi" : MessageLookupByLibrary.simpleMessage("Remarks"),
"benzhouquanbao" : MessageLookupByLibrary.simpleMessage("coupon package of this week"),
"benzhouquanbao" : MessageLookupByLibrary.simpleMessage("This week coupon bag"),
"bianjidizhi" : MessageLookupByLibrary.simpleMessage("Edit Address"),
"bianjigerenziliao" : MessageLookupByLibrary.simpleMessage("Edit Profile "),
"biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("Mark as Read"),
@ -150,6 +150,7 @@ class MessageLookup extends MessageLookupByLibrary {
"chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("Achievement badge"),
"chengshixuanze" : MessageLookupByLibrary.simpleMessage("City Selection"),
"chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("Become an exclusive member of the store and enjoy exclusive rights"),
"chi" : MessageLookupByLibrary.simpleMessage("Eat"),
"chijiankang" : MessageLookupByLibrary.simpleMessage("Eat healthy"),
"chongzhi" : MessageLookupByLibrary.simpleMessage("Recharge"),
"chongzhichenggong" : MessageLookupByLibrary.simpleMessage("Recharge succeeded"),
@ -163,7 +164,7 @@ class MessageLookup extends MessageLookupByLibrary {
"code_error" : MessageLookupByLibrary.simpleMessage("Wrong input of verification code"),
"cunchu" : MessageLookupByLibrary.simpleMessage("Storage"),
"cunchutishixinxi" : MessageLookupByLibrary.simpleMessage("It is recommended that you open the storage permission during use in order to obtain photo usage, caching and other functions"),
"daifukuan" : MessageLookupByLibrary.simpleMessage("To be paid"),
"daifukuan" : MessageLookupByLibrary.simpleMessage("Obligations"),
"daipeisong" : MessageLookupByLibrary.simpleMessage("to be delivered"),
"daiqucan" : MessageLookupByLibrary.simpleMessage("To be picked up"),
"daiqueren" : MessageLookupByLibrary.simpleMessage("to be confirmed"),
@ -189,6 +190,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dianputuijian" : MessageLookupByLibrary.simpleMessage("Store recommendation"),
"dianpuyue" : MessageLookupByLibrary.simpleMessage("Shop balance"),
"dianwolingqu" : MessageLookupByLibrary.simpleMessage("Click me to get it"),
"dianzan" : MessageLookupByLibrary.simpleMessage("Like"),
"dianzanxihuan_" : m3,
"dingdan" : MessageLookupByLibrary.simpleMessage("Order"),
"dingdanbianhao" : MessageLookupByLibrary.simpleMessage("Order No"),
@ -216,7 +218,7 @@ class MessageLookup extends MessageLookupByLibrary {
"duihuanhouwugegongzuori" : MessageLookupByLibrary.simpleMessage("You can go to the store five working days after the exchange"),
"duihuanliangdidaogao" : MessageLookupByLibrary.simpleMessage("From low to high exchange volume"),
"duihuanlianggaodaodi" : MessageLookupByLibrary.simpleMessage("From high to low exchange volume"),
"duihuanlishi" : MessageLookupByLibrary.simpleMessage("Exchange History"),
"duihuanlishi" : MessageLookupByLibrary.simpleMessage("Exchange"),
"duihuanquan" : MessageLookupByLibrary.simpleMessage("exchange coupon"),
"duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("Details of exchanged goods"),
"duihuanxinxi" : MessageLookupByLibrary.simpleMessage("Exchange information"),
@ -237,7 +239,7 @@ class MessageLookup extends MessageLookupByLibrary {
"faxingshijian" : m4,
"feishiwuduihuanma" : MessageLookupByLibrary.simpleMessage("Non physical exchange code"),
"feishiwushangpin" : MessageLookupByLibrary.simpleMessage("After exchanging non physical goods, you can use the coupon!"),
"fensi" : MessageLookupByLibrary.simpleMessage("fans"),
"fensi" : MessageLookupByLibrary.simpleMessage("Fans"),
"fenxiang" : MessageLookupByLibrary.simpleMessage("Sharing"),
"fenxiangdao" : MessageLookupByLibrary.simpleMessage("Share to"),
"fenxiangjiankang" : MessageLookupByLibrary.simpleMessage("Sharing Health"),
@ -246,7 +248,7 @@ class MessageLookup extends MessageLookupByLibrary {
"fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("Share to WeChat"),
"fukashoujihao" : MessageLookupByLibrary.simpleMessage("Slave card mobile number"),
"fuliduihuan" : MessageLookupByLibrary.simpleMessage("Benefit exchange"),
"fulizhongxin" : MessageLookupByLibrary.simpleMessage("Benefit Center"),
"fulizhongxin" : MessageLookupByLibrary.simpleMessage("CNOUS"),
"ge" : m5,
"geiwopingfen" : MessageLookupByLibrary.simpleMessage("Rate me"),
"gengduo" : MessageLookupByLibrary.simpleMessage("more"),
@ -276,6 +278,7 @@ class MessageLookup extends MessageLookupByLibrary {
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("Straits Sister"),
"haowu" : MessageLookupByLibrary.simpleMessage("good things"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("Friend Reward Rules"),
"he" : MessageLookupByLibrary.simpleMessage("Drink"),
"heji" : MessageLookupByLibrary.simpleMessage("Total:"),
"hejiankang" : MessageLookupByLibrary.simpleMessage("Drink healthy"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("Write off succeeded"),
@ -285,7 +288,7 @@ class MessageLookup extends MessageLookupByLibrary {
"huifu" : MessageLookupByLibrary.simpleMessage("Delete"),
"huifu_" : m9,
"huixiangVIPka" : MessageLookupByLibrary.simpleMessage("Home Returning VIP Card"),
"huixiangqianbao" : MessageLookupByLibrary.simpleMessage("Homecoming Wallet"),
"huixiangqianbao" : MessageLookupByLibrary.simpleMessage("Wallet"),
"huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("For:Any store dedicated to returning home"),
"huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("Homecoming Headlines"),
"huixiangvipkazhuanxiang" : MessageLookupByLibrary.simpleMessage("Home Return VIP Card Exclusive Rights"),
@ -371,7 +374,7 @@ class MessageLookup extends MessageLookupByLibrary {
"kongtiao" : MessageLookupByLibrary.simpleMessage("Air conditioner"),
"kuaidi" : MessageLookupByLibrary.simpleMessage("express"),
"kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("express logistics"),
"lianxikefu" : MessageLookupByLibrary.simpleMessage("Contact customer service"),
"lianxikefu" : MessageLookupByLibrary.simpleMessage("Service"),
"lianxishoujihao" : MessageLookupByLibrary.simpleMessage("Contact phone number"),
"lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("Sign in continuously to receive double points"),
"liaojie" : MessageLookupByLibrary.simpleMessage("Understand"),
@ -402,7 +405,7 @@ class MessageLookup extends MessageLookupByLibrary {
"main_menu2" : MessageLookupByLibrary.simpleMessage("Union"),
"main_menu3" : MessageLookupByLibrary.simpleMessage("Organic Life"),
"main_menu4" : MessageLookupByLibrary.simpleMessage("Me"),
"main_menu5" : MessageLookupByLibrary.simpleMessage("Homecoming VIP"),
"main_menu5" : MessageLookupByLibrary.simpleMessage("VIP"),
"manlijiandaijinquan" : m19,
"manyuankeyong" : m20,
"meiriqiandao" : MessageLookupByLibrary.simpleMessage("Sign in every day"),
@ -410,7 +413,7 @@ class MessageLookup extends MessageLookupByLibrary {
"meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("No more data"),
"meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("No more coupons"),
"meizhousangengxin" : MessageLookupByLibrary.simpleMessage("updated every Wednesday"),
"meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("Update coupon package every Wednesday"),
"meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("Wednesday renewal coupon"),
"mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("Store Selection"),
"menpaihao" : MessageLookupByLibrary.simpleMessage("Please enter the house number"),
"mi" : m21,
@ -436,7 +439,7 @@ class MessageLookup extends MessageLookupByLibrary {
"peisongfuwu" : MessageLookupByLibrary.simpleMessage("Ordering time"),
"peisongzhong" : MessageLookupByLibrary.simpleMessage("Shipping"),
"phone_error" : MessageLookupByLibrary.simpleMessage("Wrong phone format"),
"pinglun" : MessageLookupByLibrary.simpleMessage("comment"),
"pinglun" : MessageLookupByLibrary.simpleMessage("Comment"),
"pinglun_" : m23,
"pingtaiyue" : MessageLookupByLibrary.simpleMessage("Platform Balance"),
"pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("Platform Payment Password"),
@ -527,10 +530,10 @@ class MessageLookup extends MessageLookupByLibrary {
"saoma" : MessageLookupByLibrary.simpleMessage("scanning code"),
"saomadiancan" : MessageLookupByLibrary.simpleMessage("You are about to scan the code to order"),
"saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("Scan code to identify and follow official account"),
"send_code" : MessageLookupByLibrary.simpleMessage("Send verification code"),
"send_code" : MessageLookupByLibrary.simpleMessage("Validate code"),
"shanchu" : MessageLookupByLibrary.simpleMessage("Delete"),
"shanchudingdan" : MessageLookupByLibrary.simpleMessage("Delete a single order"),
"shanghuruzhu" : MessageLookupByLibrary.simpleMessage("Merchant settlement"),
"shanghuruzhu" : MessageLookupByLibrary.simpleMessage("Settled"),
"shangjiaquan" : MessageLookupByLibrary.simpleMessage("merchant coupon"),
"shangjiaqueren" : MessageLookupByLibrary.simpleMessage("Merchant confirmation"),
"shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("Merchant has delivered goods"),
@ -592,6 +595,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waimai" : MessageLookupByLibrary.simpleMessage("take away"),
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("delivery"),
"waisong" : MessageLookupByLibrary.simpleMessage("sending out"),
"wan" : MessageLookupByLibrary.simpleMessage("Play"),
"wancheng" : MessageLookupByLibrary.simpleMessage("finish"),
"wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("Place an order once"),
@ -636,7 +640,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("Logistics status:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("Order placement time"),
"xiadanshijian_" : m33,
"xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("Place an order to earn points"),
"xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("Place orders integral"),
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("Pull down Refresh"),
"xiangce" : MessageLookupByLibrary.simpleMessage("album"),
"xiangji" : MessageLookupByLibrary.simpleMessage("camera"),
@ -661,7 +665,7 @@ class MessageLookup extends MessageLookupByLibrary {
"xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("System Messages"),
"xiugaichenggong" : MessageLookupByLibrary.simpleMessage("Modification succeeded"),
"xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("Modify User Name"),
"xuanguige" : MessageLookupByLibrary.simpleMessage("Select specification"),
"xuanguige" : MessageLookupByLibrary.simpleMessage("Select specs"),
"xuanji" : MessageLookupByLibrary.simpleMessage("Selection"),
"xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("Renewal member"),
"xuexijiankang" : MessageLookupByLibrary.simpleMessage("Learning Health"),
@ -716,7 +720,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yizhifu" : MessageLookupByLibrary.simpleMessage("Paid"),
"yonghuming" : MessageLookupByLibrary.simpleMessage("User name"),
"yonghuxiaofeijifen" : MessageLookupByLibrary.simpleMessage("The user can get 1 point for every 1 yuan spent。"),
"youhuiquan" : MessageLookupByLibrary.simpleMessage("coupon"),
"youhuiquan" : MessageLookupByLibrary.simpleMessage("Coupon"),
"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"),

4
lib/generated/intl/messages_zh_CN.dart

@ -150,6 +150,7 @@ class MessageLookup extends MessageLookupByLibrary {
"chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"),
"chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"),
"chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员,享专属权益"),
"chi" : MessageLookupByLibrary.simpleMessage(""),
"chijiankang" : MessageLookupByLibrary.simpleMessage("吃健康"),
"chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
"chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
@ -189,6 +190,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dianputuijian" : MessageLookupByLibrary.simpleMessage("店铺推荐"),
"dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"),
"dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
"dianzan" : MessageLookupByLibrary.simpleMessage("点赞"),
"dianzanxihuan_" : m3,
"dingdan" : MessageLookupByLibrary.simpleMessage("订单"),
"dingdanbianhao" : MessageLookupByLibrary.simpleMessage("订单编号"),
@ -276,6 +278,7 @@ class MessageLookup extends MessageLookupByLibrary {
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友奖励规则"),
"he" : MessageLookupByLibrary.simpleMessage(""),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"),
"hejiankang" : MessageLookupByLibrary.simpleMessage("喝健康"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
@ -592,6 +595,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waimai" : MessageLookupByLibrary.simpleMessage("外卖"),
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wan" : MessageLookupByLibrary.simpleMessage(""),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),

4
lib/generated/intl/messages_zh_Hans_CN.dart

@ -150,6 +150,7 @@ class MessageLookup extends MessageLookupByLibrary {
"chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"),
"chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"),
"chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员,享专属权益"),
"chi" : MessageLookupByLibrary.simpleMessage(""),
"chijiankang" : MessageLookupByLibrary.simpleMessage("吃健康"),
"chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
"chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
@ -189,6 +190,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dianputuijian" : MessageLookupByLibrary.simpleMessage("店铺推荐"),
"dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"),
"dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
"dianzan" : MessageLookupByLibrary.simpleMessage("点赞"),
"dianzanxihuan_" : m3,
"dingdan" : MessageLookupByLibrary.simpleMessage("订单"),
"dingdanbianhao" : MessageLookupByLibrary.simpleMessage("订单编号"),
@ -276,6 +278,7 @@ class MessageLookup extends MessageLookupByLibrary {
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友奖励规则"),
"he" : MessageLookupByLibrary.simpleMessage(""),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"),
"hejiankang" : MessageLookupByLibrary.simpleMessage("喝健康"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
@ -592,6 +595,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waimai" : MessageLookupByLibrary.simpleMessage("外卖"),
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wan" : MessageLookupByLibrary.simpleMessage(""),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),

4
lib/generated/intl/messages_zh_Hant_CN.dart

@ -146,6 +146,7 @@ class MessageLookup extends MessageLookupByLibrary {
"chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"),
"chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市選擇"),
"chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成為專屬會員,享專屬權益"),
"chi" : MessageLookupByLibrary.simpleMessage(""),
"chijiankang" : MessageLookupByLibrary.simpleMessage("吃健康"),
"chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
"chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
@ -185,6 +186,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dianputuijian" : MessageLookupByLibrary.simpleMessage("店鋪推薦"),
"dianpuyue" : MessageLookupByLibrary.simpleMessage("店鋪餘額"),
"dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"),
"dianzan" : MessageLookupByLibrary.simpleMessage("點贊"),
"dianzanxihuan_" : m3,
"dingdan" : MessageLookupByLibrary.simpleMessage("訂單"),
"dingdanbianhao" : MessageLookupByLibrary.simpleMessage("訂單編號"),
@ -272,6 +274,7 @@ class MessageLookup extends MessageLookupByLibrary {
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友獎勵規則"),
"he" : MessageLookupByLibrary.simpleMessage(""),
"heji" : MessageLookupByLibrary.simpleMessage("合計:"),
"hejiankang" : MessageLookupByLibrary.simpleMessage("喝健康"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"),
@ -586,6 +589,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waimai" : MessageLookupByLibrary.simpleMessage("外賣"),
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外賣配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wan" : MessageLookupByLibrary.simpleMessage(""),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"),

4
lib/generated/intl/messages_zh_TW.dart

@ -148,6 +148,7 @@ class MessageLookup extends MessageLookupByLibrary {
"chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"),
"chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市選擇"),
"chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成為專屬會員,享專屬權益"),
"chi" : MessageLookupByLibrary.simpleMessage(""),
"chijiankang" : MessageLookupByLibrary.simpleMessage("吃健康"),
"chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
"chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
@ -187,6 +188,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dianputuijian" : MessageLookupByLibrary.simpleMessage("店鋪推薦"),
"dianpuyue" : MessageLookupByLibrary.simpleMessage("店鋪餘額"),
"dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"),
"dianzan" : MessageLookupByLibrary.simpleMessage("點贊"),
"dianzanxihuan_" : m3,
"dingdan" : MessageLookupByLibrary.simpleMessage("訂單"),
"dingdanbianhao" : MessageLookupByLibrary.simpleMessage("訂單編號"),
@ -274,6 +276,7 @@ class MessageLookup extends MessageLookupByLibrary {
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友獎勵規則"),
"he" : MessageLookupByLibrary.simpleMessage(""),
"heji" : MessageLookupByLibrary.simpleMessage("合計:"),
"hejiankang" : MessageLookupByLibrary.simpleMessage("喝健康"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"),
@ -589,6 +592,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waimai" : MessageLookupByLibrary.simpleMessage("外賣"),
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外賣配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wan" : MessageLookupByLibrary.simpleMessage(""),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"),

40
lib/generated/l10n.dart

@ -6705,6 +6705,46 @@ class S {
);
}
/// ``
String get chi {
return Intl.message(
'',
name: 'chi',
desc: '',
args: [],
);
}
/// ``
String get he {
return Intl.message(
'',
name: 'he',
desc: '',
args: [],
);
}
/// ``
String get wan {
return Intl.message(
'',
name: 'wan',
desc: '',
args: [],
);
}
/// ``
String get dianzan {
return Intl.message(
'点赞',
name: 'dianzan',
desc: '',
args: [],
);
}
/// `使`
String get privacy_policy4 {
return Intl.message(

2
lib/home/home_view/shortcut_operation.dart

@ -28,7 +28,7 @@ class _ShortcutOperation extends State<ShortcutOperation> {
@override
Widget build(BuildContext context) {
return Container(
height: 70.h,
// height: 70.h,
width: double.infinity,
margin: EdgeInsets.only(bottom:28.h, left: 9.w, right: 9.w),
child: Row(

2
lib/home/welfare_exchange.dart

@ -311,7 +311,7 @@ class _WelfareExchange extends State<WelfareExchange> with SingleTickerProvider
Expanded(
child: Container(
margin: EdgeInsets.only(left: 12.w),
height: 50.h,
height: 55.h,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,

4
lib/l10n/intl_en.arb

@ -696,6 +696,10 @@
"zhankai":"展开",
"shouqi":"收起",
"tiantianlingjifen":"天天领积分",
"chi": "吃",
"he": "喝",
"wan": "玩",
"dianzan": "点赞",

37
lib/l10n/intl_en_US.arb

@ -5,7 +5,7 @@
"input_phone_hide": "Please enter your mobile number",
"input_code_hide": "Please enter the verification code",
"login": "login",
"send_code": "Send verification code",
"send_code": "Validate code",
"resend_in_seconds": "{second}s and then resend",
"phone_error": "Wrong phone format",
"code_error": "Wrong input of verification code",
@ -16,7 +16,7 @@
"main_menu2": "Union",
"main_menu3": "Organic Life",
"main_menu4": "Me",
"main_menu5":"Homecoming VIP",
"main_menu5":"VIP",
"shouye": "Home",
"huodongliebiao": "Activity List",
"jifenshangcheng": "Jingbi Point Mall",
@ -54,8 +54,8 @@
"fapiaozhushou": "Invoice Assistant",
"zaixiankefu": "Online Customer Service",
"shezhi": "Settings",
"youhuiquan": "coupon",
"bangzhuyufankui": "Help and Feedback",
"youhuiquan": "Coupon",
"bangzhuyufankui": "Help",
"shiyongriqi": "Use Date",
"keyongyouhuiquan": "Available Coupons",
"yishixiao": "Expired",
@ -92,7 +92,7 @@
"yishijiao": "Expired",
"lishijilu": "History",
"yue_": "Balance {yue}",
"duihuanlishi": "Exchange History",
"duihuanlishi": "Exchange",
"quanbuduihuan": "Exchange All",
"weulingqu": "Unclaimed",
"keshiyong": "available",
@ -279,7 +279,7 @@
"changjianwenti": "Frequently Asked Questions",
"fankui": "Feedback",
"quxiaozhifu": "Cancel Payment",
"daifukuan": "To be paid",
"daifukuan": "Obligations",
"quanbu": "All",
"wuliuxinxi": "Logistics Information",
"huiyuankaxiangqing": "Membership card details",
@ -508,7 +508,7 @@
"dianzanxihuan_": "Like{xihuan}",
"wenzhang": "Article",
"huodong": "activity",
"pinglun": "comment",
"pinglun": "Comment",
"fangshiyi": "Mode 1",
"fangshier": "Mode 2",
"baocunsaoma": "The screenshot saves the QR code below, invites others to scan WeChat for identification, long press follow, completes the small game, receives the coupon, and the invitation is successful!",
@ -533,9 +533,9 @@
"beizhuxinxi": "Remarks",
"huiyuanjia": "member price",
"yuanjia": "original price",
"xuanguige": "Select specification",
"xuanguige": "Select specs",
"chaojiyouhuiquan": "Premium coupon",
"fensi": "fans",
"fensi": "Fans",
"guanzhu": "Follow",
"wodedongtai": "My dynamic",
"yinkahuiyuan": "Silver card member",
@ -637,7 +637,7 @@
"lvbiyue_": "green coin {yue}",
"huodongyue_": "Activity balance {yue}",
"lvbiyue": "balance of green currency",
"huixiangqianbao": "Homecoming Wallet",
"huixiangqianbao": "Wallet",
"zongzichan": "Total assets",
"zongzichanyuan": "Total assets (元)",
"huodongyue": "Activity Balance",
@ -658,9 +658,9 @@
"dajiadouzaiduihuan":"Everyone is exchanging",
"dianputuijian":"Store recommendation",
"saomadiancan":"You are about to scan the code to order",
"xiadanzhuanjifen":"Place an order to earn points",
"xiadanzhuanjifen":"Place orders integral",
"chongzhifuliduo":"Recharge Fulido",
"fulizhongxin":"Benefit Center",
"fulizhongxin":"CNOUS",
"tiantiandefuli":"get benefits every day",
"chijiankang":"Eat healthy",
"wanjiankang":"Play healthy",
@ -682,8 +682,8 @@
"gengyouhui":"More preferential",
"gengduohaoquan":"more good coupons",
"liaojie":"Understand",
"benzhouquanbao":"coupon package of this week",
"meizhousanquanbao":"Update coupon package every Wednesday",
"benzhouquanbao":"This week coupon bag",
"meizhousanquanbao":"Wednesday renewal coupon",
"yaoqinghaoyoudefen":"Invite friends to score",
"jifenhuanquan":"points for coupons",
"duozhongyouhui":"A variety of coupons are waiting for you",
@ -692,11 +692,16 @@
"jifenmingxi":"Integral Details",
"meizhousangengxin":"updated every Wednesday",
"qita":"Other",
"shanghuruzhu":"Merchant settlement",
"lianxikefu":"Contact customer service",
"shanghuruzhu":"Settled",
"lianxikefu":"Service",
"zhankai":"Expand",
"shouqi":"Stow",
"tiantianlingjifen":"Earn points every day",
"chi": "Eat",
"he": "Drink",
"wan": "Play",
"dianzan": "Like",

4
lib/l10n/intl_zh_CN.arb

@ -697,6 +697,10 @@
"zhankai":"展开",
"shouqi":"收起",
"tiantianlingjifen":"天天领积分",
"chi": "吃",
"he": "喝",
"wan": "玩",
"dianzan": "点赞",

4
lib/l10n/intl_zh_Hans_CN.arb

@ -697,6 +697,10 @@
"zhankai":"展开",
"shouqi":"收起",
"tiantianlingjifen":"天天领积分",
"chi": "吃",
"he": "喝",
"wan": "玩",
"dianzan": "点赞",

4
lib/l10n/intl_zh_Hant_CN.arb

@ -688,6 +688,10 @@
"zhankai":"展開",
"shouqi":"收起",
"tiantianlingjifen":"天天領積分",
"chi": "吃",
"he": "喝",
"wan": "玩",
"dianzan": "點贊",

4
lib/l10n/intl_zh_TW.arb

@ -690,6 +690,10 @@
"zhankai":"展開",
"shouqi":"收起",
"tiantianlingjifen":"天天領積分",
"chi": "吃",
"he": "喝",
"wan": "玩",
"dianzan": "點贊",

4
lib/main.dart

@ -169,7 +169,7 @@ class MyApp extends StatelessWidget {
title: Platform.isAndroid ? (ExamineInstance.instance.isExamine?"一心回乡":""):"",
theme: ThemeData(
primarySwatch: Colors.blue,
fontFamily: 'JDZhengHT',
// fontFamily: 'JDZhengHT',
textTheme: TextTheme(
button: TextStyle(fontSize: 24.sp),
bodyText1: TextStyle(fontSize: 12.sp),
@ -196,7 +196,7 @@ class MyApp extends StatelessWidget {
} else if (locales[0].countryCode == "CN"){
locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'CH');
} else{
locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'CH');
locale = Locale.fromSubtags(languageCode: 'en', countryCode: 'US');
}
return appLocale ?? locale;
},

2
lib/message/system_message.dart

@ -249,7 +249,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
),
SizedBox(height: 6.h),
Text(
"点赞",
S.of(context).dianzan,
style: TextStyle(
fontSize: 14.sp,
fontWeight:MyFontWeight.medium,

14
lib/store/store_order.dart

@ -215,7 +215,17 @@ class _StoreOrderPage extends State<StoreOrderPage>
@override
Widget build(BuildContext context) {
return Container(
return WillPopScope(
onWillPop: () async {
if (dialogShowing) {
debugPrint("ssssasdadsasdadasd");
SmartDialog.dismiss();
return false;
} else {
return true;
}
},
child: Container(
color: Colors.white,
child: Stack(
children: [
@ -562,7 +572,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
),
),
],
));
)));
}
///

8
lib/store/store_view/shop_goods.dart

@ -191,7 +191,7 @@ class _ShopGoods extends State<ShopGoods> {
Text(
"¥${AppUtils.calculateDouble(double.tryParse(widget.isShopCart ? widget.shoppingCartSkuItemListBean.skuPrice : widget.productListBean.price) ?? 0)}",
style: TextStyle(
color: Color(0xFFFF7A1A),
color: Color(0xFFFF4500),
fontSize: 16.sp,
fontFamily: 'JDZhengHT',
fontWeight: MyFontWeight.medium,
@ -227,14 +227,14 @@ class _ShopGoods extends State<ShopGoods> {
Container(
margin: EdgeInsets.only(right: 8, top: 4),
child: RoundButton(
width: 49.w,
// width: 49.w,
text: S.of(context).xuanguige,
textColor: Colors.white,
fontWeight: MyFontWeight.medium,
radius: 3,
backgroup: Color(0xFF32A060),
fontSize: 11.sp,
padding: EdgeInsets.symmetric(vertical: 5.h),
padding: EdgeInsets.symmetric(vertical: 5.h,horizontal: 3.w),
callback: () {
if(widget.storeInfo.posType.code == "NORMALSTORE"&& widget.tableId == 0){
showDeleteDialog();
@ -350,7 +350,7 @@ class _ShopGoods extends State<ShopGoods> {
Text(
"${AppUtils.calculateDouble(double.tryParse(widget.productListBean.vipPrice ?? "0") ?? 0)}",
style: TextStyle(
fontSize: 16.sp,
fontSize: 14.sp,
fontWeight: MyFontWeight.medium,
fontFamily: 'JDZhengHT',
color: Color(0xff32A060),

6
lib/union/union_page.dart

@ -334,9 +334,9 @@ class UnionPageState extends State<UnionPage>
//
tabs: <Widget>[
MyTab(text: S.of(context).quanbu),
MyTab(text: ""),
MyTab(text: ""),
MyTab(text: ""),
MyTab(text: S.of(context).chi),
MyTab(text: S.of(context).he),
MyTab(text: S.of(context).wan),
],
)),
)),

Loading…
Cancel
Save