Browse Source

英文更改

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

38
lib/generated/intl/messages_en_US.dart

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

4
lib/generated/intl/messages_zh_CN.dart

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

4
lib/generated/intl/messages_zh_Hans_CN.dart

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

4
lib/generated/intl/messages_zh_Hant_CN.dart

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

4
lib/generated/intl/messages_zh_TW.dart

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

2
lib/home/home_view/shortcut_operation.dart

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

2
lib/home/welfare_exchange.dart

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

4
lib/l10n/intl_en.arb

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

39
lib/l10n/intl_en_US.arb

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

4
lib/l10n/intl_zh_Hans_CN.arb

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

4
lib/l10n/intl_zh_Hant_CN.arb

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

4
lib/l10n/intl_zh_TW.arb

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

4
lib/main.dart

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

2
lib/message/system_message.dart

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

628
lib/store/store_order.dart

@ -215,58 +215,68 @@ class _StoreOrderPage extends State<StoreOrderPage>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return WillPopScope(
color: Colors.white, onWillPop: () async {
child: Stack( if (dialogShowing) {
children: [ debugPrint("ssssasdadsasdadasd");
Positioned( SmartDialog.dismiss();
left: 0, return false;
right: 0, } else {
top: 0, return true;
bottom: 54.h, }
child: NestedScrollView( },
controller: controller, child: Container(
dragStartBehavior: DragStartBehavior.start, color: Colors.white,
physics: BouncingScrollPhysics(), child: Stack(
headerSliverBuilder: children: [
(BuildContext context, bool innerScrolled) { Positioned(
return [ left: 0,
SliverOverlapAbsorber( right: 0,
handle: top: 0,
NestedScrollView.sliverOverlapAbsorberHandleFor( bottom: 54.h,
context), child: NestedScrollView(
sliver: SliverAppBar( controller: controller,
expandedHeight: (storeInfo != null && dragStartBehavior: DragStartBehavior.start,
storeInfo.couponVOList != null) physics: BouncingScrollPhysics(),
? 400.h headerSliverBuilder:
: 395.h, (BuildContext context, bool innerScrolled) {
floating: false, return [
snap: false, SliverOverlapAbsorber(
pinned: true, handle:
stretch: false, NestedScrollView.sliverOverlapAbsorberHandleFor(
brightness: Brightness.light, context),
leading: GestureDetector( sliver: SliverAppBar(
behavior: HitTestBehavior.opaque, expandedHeight: (storeInfo != null &&
onTap: () { storeInfo.couponVOList != null)
Navigator.of(context).pop(); ? 400.h
}, : 395.h,
child: Container( floating: false,
width: double.infinity, snap: false,
height: double.infinity, pinned: true,
color: Colors.transparent, stretch: false,
alignment: Alignment.centerRight, brightness: Brightness.light,
margin: EdgeInsets.only(left: 10.w), leading: GestureDetector(
padding: EdgeInsets.all(10.h), behavior: HitTestBehavior.opaque,
child: Icon( onTap: () {
Icons.arrow_back_ios, Navigator.of(context).pop();
color: Colors.black, },
size: 24, child: Container(
width: double.infinity,
height: double.infinity,
color: Colors.transparent,
alignment: Alignment.centerRight,
margin: EdgeInsets.only(left: 10.w),
padding: EdgeInsets.all(10.h),
child: Icon(
Icons.arrow_back_ios,
color: Colors.black,
size: 24,
),
),
), ),
), flexibleSpace: FlexibleSpaceBar(
), title: Title(controller,
flexibleSpace: FlexibleSpaceBar( storeInfo != null ? storeInfo.storeName : '',
title: Title(controller,
storeInfo != null ? storeInfo.storeName : '',
(alpha) { (alpha) {
setState(() { setState(() {
if (alpha == 1) if (alpha == 1)
@ -276,178 +286,178 @@ class _StoreOrderPage extends State<StoreOrderPage>
NeverScrollableScrollPhysics(); NeverScrollableScrollPhysics();
}); });
}), }),
collapseMode: CollapseMode.pin, collapseMode: CollapseMode.pin,
stretchModes: [ stretchModes: [
StretchMode.zoomBackground, StretchMode.zoomBackground,
StretchMode.fadeTitle, StretchMode.fadeTitle,
StretchMode.blurBackground, StretchMode.blurBackground,
], ],
background: Container( background: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(8.w), borderRadius: BorderRadius.circular(8.w),
), ),
child: Stack( child: Stack(
children: [ children: [
Positioned( Positioned(
child: Column( child: Column(
children: [ children: [
buildSwiper(), buildSwiper(),
Expanded( Expanded(
child: Container( child: Container(
color: Colors.transparent, color: Colors.transparent,
),
flex: 1,
),
],
),
top: 0,
bottom: 0,
left: 0,
right: 0,
),
Positioned(
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius:
BorderRadius.circular(8.w),
),
child: Column(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
///
StoreInfoView(storeInfo),
// Padding(padding:EdgeInsets.only(left: 14.w),
// child: Text(
// S.of(context).diandan,
// style: TextStyle(
// fontWeight: MyFontWeight.bold,
// fontSize: 15.sp,
// color: Color(0xFF000000),
// ),
// ),),
// Container(
// width:22.w,
// height: 3.h,
// color: Color(0xFF32A060),
// margin: EdgeInsets.only(top: 5.h,left: 14.w),
// ),
// ///
// if (storeInfo != null &&
// storeInfo.couponVOList != null)
// UnionCoupon(
// storeInfo,
// _receiveCoupon,
// coupon: true,
// ),
//
// if (storeInfo == null ||
// storeInfo.couponVOList == null)
// SizedBox(
// height: 8,
// ),
//
// ///VIP信息
// Vip(storeInfo, () {}, false),
],
), ),
flex: 1,
), ),
], top: 233.h,
), bottom: 0,
top: 0, left: 0,
bottom: 0, right: 0,
left: 0, ),
right: 0, ],
), ),
Positioned( ),
child: Container( ),
decoration: BoxDecoration( backgroundColor: Color(0x33FAFAFA),
color: Colors.white, centerTitle: false,
borderRadius: elevation: 0,
BorderRadius.circular(8.w), bottom: PreferredSize(
preferredSize: Size(
MediaQuery.of(context).size.width,
38.h,
),
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10.w),
width: MediaQuery.of(context).size.width,
child: Theme(
data: ThemeData(
splashColor: Colors.transparent,
//
highlightColor:
Colors.transparent, //
), ),
child: Column( child: TabBar(
mainAxisAlignment: controller: tabcontroller,
MainAxisAlignment.start, automaticIndicatorColorAdjustment: true,
crossAxisAlignment: isScrollable: true,
CrossAxisAlignment.start, indicatorWeight: 3,
children: [ indicatorColor: Color(0xFF32A060),
/// labelPadding: EdgeInsets.only(
StoreInfoView(storeInfo), left: 8.w,
// Padding(padding:EdgeInsets.only(left: 14.w), right: 8.w,
// child: Text( ),
// S.of(context).diandan, indicatorSize: TabBarIndicatorSize.label,
// style: TextStyle( unselectedLabelStyle: TextStyle(
// fontWeight: MyFontWeight.bold, fontSize: 15.sp,
// fontSize: 15.sp, fontWeight: FontWeight.w400,
// color: Color(0xFF000000), ),
// ), labelStyle: TextStyle(
// ),), color: Colors.black,
// Container( fontSize: 18.sp,
// width:22.w, fontWeight: FontWeight.bold,
// height: 3.h, ),
// color: Color(0xFF32A060), labelColor: Colors.black,
// margin: EdgeInsets.only(top: 5.h,left: 14.w), tabs: [
// ), MyTab(text: S.of(context).diandan),
// /// // MyTab(text: ""),
// if (storeInfo != null &&
// storeInfo.couponVOList != null)
// UnionCoupon(
// storeInfo,
// _receiveCoupon,
// coupon: true,
// ),
//
// if (storeInfo == null ||
// storeInfo.couponVOList == null)
// SizedBox(
// height: 8,
// ),
//
// ///VIP信息
// Vip(storeInfo, () {}, false),
], ],
), )),
), ),
top: 233.h,
bottom: 0,
left: 0,
right: 0,
),
],
), ),
), ),
), ),
backgroundColor: Color(0x33FAFAFA), ];
centerTitle: false, },
elevation: 0, body:
bottom: PreferredSize(
preferredSize: Size(
MediaQuery.of(context).size.width,
38.h,
),
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10.w),
width: MediaQuery.of(context).size.width,
child: Theme(
data: ThemeData(
splashColor: Colors.transparent,
//
highlightColor:
Colors.transparent, //
),
child: TabBar(
controller: tabcontroller,
automaticIndicatorColorAdjustment: true,
isScrollable: true,
indicatorWeight: 3,
indicatorColor: Color(0xFF32A060),
labelPadding: EdgeInsets.only(
left: 8.w,
right: 8.w,
),
indicatorSize: TabBarIndicatorSize.label,
unselectedLabelStyle: TextStyle(
fontSize: 15.sp,
fontWeight: FontWeight.w400,
),
labelStyle: TextStyle(
color: Colors.black,
fontSize: 18.sp,
fontWeight: FontWeight.bold,
),
labelColor: Colors.black,
tabs: [
MyTab(text: S.of(context).diandan),
// MyTab(text: ""),
],
)),
),
),
),
),
];
},
body:
/// ///
TabBarView( TabBarView(
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
children: [ children: [
/// ///
StoreOrderListPage( StoreOrderListPage(
widget.arguments, widget.arguments,
activitys, activitys,
storeInfo, storeInfo,
shopCarGoods, shopCarGoods,
controller, controller,
minToken, minToken,
tenant, tenant,
tableId, tableId,
_queryMiNiDetail, () { _queryMiNiDetail, () {
queryShopCar().then((value) { queryShopCar().then((value) {
this.shopCarGoods = value; this.shopCarGoods = value;
setState(() {}); setState(() {});
}); });
}, scrollPhysics), }, scrollPhysics),
///, ///,
// StoreActivity( // StoreActivity(
// widget.arguments, // widget.arguments,
// activitys, // activitys,
// ), // ),
], ],
controller: tabcontroller, controller: tabcontroller,
), ),
), ),
/*SmartRefresher( /*SmartRefresher(
controller: refreshController = controller: refreshController =
RefreshController(initialRefresh: false), RefreshController(initialRefresh: false),
enablePullDown: true, enablePullDown: true,
@ -459,110 +469,110 @@ class _StoreOrderPage extends State<StoreOrderPage>
}, },
child: child:
),*/ ),*/
), ),
Positioned( Positioned(
bottom: 30, bottom: 30,
left: 0, left: 0,
right: 0, right: 0,
child: Stack( child: Stack(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
children: [ children: [
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 14), margin: EdgeInsets.symmetric(horizontal: 14),
height: 45.h, height: 45.h,
// color: Color(0xFFFAFAFA), // color: Color(0xFFFAFAFA),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFF383A38), color: Color(0xFF383A38),
borderRadius: BorderRadius.circular(100), borderRadius: BorderRadius.circular(100),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
width: 45.w,
), ),
Text.rich( child: Row(
TextSpan(children: [ mainAxisAlignment: MainAxisAlignment.spaceAround,
TextSpan( crossAxisAlignment: CrossAxisAlignment.center,
text: "", children: [
style: TextStyle( SizedBox(
fontSize: 12.sp, width: 45.w,
color: Color(0xFFFFFFFF),
fontWeight: MyFontWeight.bold),
), ),
TextSpan( Text.rich(
text: shopCarGoods != null TextSpan(children: [
? shopCarGoods.cartSum TextSpan(
: "0.0", text: "",
style: TextStyle( style: TextStyle(
fontSize: 20.sp, fontSize: 12.sp,
fontFamily: 'JDZhengHT', color: Color(0xFFFFFFFF),
color: Color(0xFFFFFFFF), fontWeight: MyFontWeight.bold),
fontWeight: MyFontWeight.medium), ),
TextSpan(
text: shopCarGoods != null
? shopCarGoods.cartSum
: "0.0",
style: TextStyle(
fontSize: 20.sp,
fontFamily: 'JDZhengHT',
color: Color(0xFFFFFFFF),
fontWeight: MyFontWeight.medium),
),
]),
), ),
]), Spacer(),
), GestureDetector(
Spacer(), onTap: () {
GestureDetector( // if(AppUtils.compareTime(storeInfo.openStartTime,DateFormat('HH:mm:ss').format(DateTime.now()))
onTap: () { // &&(!AppUtils.compareTime(storeInfo.openEndTime,DateFormat('HH:mm:ss').format(DateTime.now())))){
// if(AppUtils.compareTime(storeInfo.openStartTime,DateFormat('HH:mm:ss').format(DateTime.now())) toDownOrder();
// &&(!AppUtils.compareTime(storeInfo.openEndTime,DateFormat('HH:mm:ss').format(DateTime.now())))){ // }
toDownOrder(); // else
// } // SmartDialog.showToast("营业时间:${storeInfo.openStartTime}-${storeInfo.openEndTime}", alignment: Alignment.center);
// else },
// SmartDialog.showToast("营业时间:${storeInfo.openStartTime}-${storeInfo.openEndTime}", alignment: Alignment.center); child: RoundButton(
}, width: 103.w,
child: RoundButton( height: 54.h,
width: 103.w, text: S.current.jiesuan,
height: 54.h, textColor: Colors.white,
text: S.current.jiesuan, fontWeight: MyFontWeight.bold,
textColor: Colors.white, backgroup: Color(0xFF32A060),
fontWeight: MyFontWeight.bold, radius: 100,
backgroup: Color(0xFF32A060), fontSize: 16.sp,
radius: 100, padding: EdgeInsets.symmetric(vertical: 5.h),
fontSize: 16.sp, ),
padding: EdgeInsets.symmetric(vertical: 5.h), ),
), ],
),
],
),
),
Stack(
children: [
InkWell(
onTap: () {
if (count() != 0) showShoppingCart();
},
child: Image.asset(
"assets/image/shopping_bag.webp",
width: 66,
height: 66,
fit: BoxFit.fitWidth,
), ),
), ),
if (count() != 0) Stack(
Positioned( children: [
right: 5, InkWell(
// top: 14, onTap: () {
child: RoundButton( if (count() != 0) showShoppingCart();
width: 17.w, },
height: 17.h, child: Image.asset(
text: "${count()}", "assets/image/shopping_bag.webp",
textColor: Colors.white, width: 66,
fontWeight: MyFontWeight.regular, height: 66,
backgroup: Color(0xFFF65720), fit: BoxFit.fitWidth,
fontSize: 12.sp, ),
radius: 100,
), ),
), if (count() != 0)
Positioned(
right: 5,
// top: 14,
child: RoundButton(
width: 17.w,
height: 17.h,
text: "${count()}",
textColor: Colors.white,
fontWeight: MyFontWeight.regular,
backgroup: Color(0xFFF65720),
fontSize: 12.sp,
radius: 100,
),
),
],
),
], ],
), ),
], ),
), ],
), )));
],
));
} }
/// ///

8
lib/store/store_view/shop_goods.dart

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

6
lib/union/union_page.dart

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

Loading…
Cancel
Save