diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 2b69a59a..119270bc 100644 --- a/lib/generated/intl/messages_en.dart +++ b/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("完成一次下单"), diff --git a/lib/generated/intl/messages_en_US.dart b/lib/generated/intl/messages_en_US.dart index 277f3b8a..609cf071 100644 --- a/lib/generated/intl/messages_en_US.dart +++ b/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"), @@ -607,7 +611,7 @@ class MessageLookup extends MessageLookupByLibrary { "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"), "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"), "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"), @@ -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"), diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index 1e9e3396..ea23c98b 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/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("完成一次下单"), diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index 3cd4851f..543d805d 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/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("完成一次下单"), diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart index a170e824..fbb56b35 100644 --- a/lib/generated/intl/messages_zh_Hant_CN.dart +++ b/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("完成一次下單"), diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index f26d9de7..2dc857a1 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/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("完成一次下單"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 1af72d1c..dc9ce61b 100644 --- a/lib/generated/l10n.dart +++ b/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( diff --git a/lib/home/home_view/shortcut_operation.dart b/lib/home/home_view/shortcut_operation.dart index 153dceea..53fe87a0 100644 --- a/lib/home/home_view/shortcut_operation.dart +++ b/lib/home/home_view/shortcut_operation.dart @@ -28,7 +28,7 @@ class _ShortcutOperation extends State { @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( diff --git a/lib/home/welfare_exchange.dart b/lib/home/welfare_exchange.dart index 6a7743e9..16a1aeba 100644 --- a/lib/home/welfare_exchange.dart +++ b/lib/home/welfare_exchange.dart @@ -311,7 +311,7 @@ class _WelfareExchange extends State 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, diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index b670c2f2..728c6dc4 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -696,6 +696,10 @@ "zhankai":"展开", "shouqi":"收起", "tiantianlingjifen":"天天领积分", + "chi": "吃", + "he": "喝", + "wan": "玩", + "dianzan": "点赞", diff --git a/lib/l10n/intl_en_US.arb b/lib/l10n/intl_en_US.arb index 191e3243..64584ce7 100644 --- a/lib/l10n/intl_en_US.arb +++ b/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,13 +54,13 @@ "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", "quanbudingdan": "All Orders", - "weiwancheng": " Incomplete ", + "weiwancheng": "Incomplete", "yingyeshijian": "Business hours: {time}", "yiwancheng": " Completed ", "yiquxiao": " Canceled ", @@ -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", + diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index e81cbe8d..740736ea 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -697,6 +697,10 @@ "zhankai":"展开", "shouqi":"收起", "tiantianlingjifen":"天天领积分", + "chi": "吃", + "he": "喝", + "wan": "玩", + "dianzan": "点赞", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index e4890bb6..5ac17b35 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -697,6 +697,10 @@ "zhankai":"展开", "shouqi":"收起", "tiantianlingjifen":"天天领积分", + "chi": "吃", + "he": "喝", + "wan": "玩", + "dianzan": "点赞", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index 53194512..1ea896ec 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -688,6 +688,10 @@ "zhankai":"展開", "shouqi":"收起", "tiantianlingjifen":"天天領積分", + "chi": "吃", + "he": "喝", + "wan": "玩", + "dianzan": "點贊", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 75eefc47..97f321ff 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -690,6 +690,10 @@ "zhankai":"展開", "shouqi":"收起", "tiantianlingjifen":"天天領積分", + "chi": "吃", + "he": "喝", + "wan": "玩", + "dianzan": "點贊", diff --git a/lib/main.dart b/lib/main.dart index bec258fa..ec654dcb 100644 --- a/lib/main.dart +++ b/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; }, diff --git a/lib/message/system_message.dart b/lib/message/system_message.dart index 21fa9df9..46d07411 100644 --- a/lib/message/system_message.dart +++ b/lib/message/system_message.dart @@ -249,7 +249,7 @@ class _SystemMessagePage extends State { ), SizedBox(height: 6.h), Text( - "点赞", + S.of(context).dianzan, style: TextStyle( fontSize: 14.sp, fontWeight:MyFontWeight.medium, diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart index db7e523a..7e67ca65 100644 --- a/lib/store/store_order.dart +++ b/lib/store/store_order.dart @@ -215,58 +215,68 @@ class _StoreOrderPage extends State @override Widget build(BuildContext context) { - return Container( - color: Colors.white, - child: Stack( - children: [ - Positioned( - left: 0, - right: 0, - top: 0, - bottom: 54.h, - child: NestedScrollView( - controller: controller, - dragStartBehavior: DragStartBehavior.start, - physics: BouncingScrollPhysics(), - headerSliverBuilder: - (BuildContext context, bool innerScrolled) { - return [ - SliverOverlapAbsorber( - handle: - NestedScrollView.sliverOverlapAbsorberHandleFor( - context), - sliver: SliverAppBar( - expandedHeight: (storeInfo != null && - storeInfo.couponVOList != null) - ? 400.h - : 395.h, - floating: false, - snap: false, - pinned: true, - stretch: false, - brightness: Brightness.light, - leading: GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - Navigator.of(context).pop(); - }, - 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, + return WillPopScope( + onWillPop: () async { + if (dialogShowing) { + debugPrint("ssssasdadsasdadasd"); + SmartDialog.dismiss(); + return false; + } else { + return true; + } + }, + child: Container( + color: Colors.white, + child: Stack( + children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 54.h, + child: NestedScrollView( + controller: controller, + dragStartBehavior: DragStartBehavior.start, + physics: BouncingScrollPhysics(), + headerSliverBuilder: + (BuildContext context, bool innerScrolled) { + return [ + SliverOverlapAbsorber( + handle: + NestedScrollView.sliverOverlapAbsorberHandleFor( + context), + sliver: SliverAppBar( + expandedHeight: (storeInfo != null && + storeInfo.couponVOList != null) + ? 400.h + : 395.h, + floating: false, + snap: false, + pinned: true, + stretch: false, + brightness: Brightness.light, + leading: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + Navigator.of(context).pop(); + }, + 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, - storeInfo != null ? storeInfo.storeName : '', + flexibleSpace: FlexibleSpaceBar( + title: Title(controller, + storeInfo != null ? storeInfo.storeName : '', (alpha) { setState(() { if (alpha == 1) @@ -276,178 +286,178 @@ class _StoreOrderPage extends State NeverScrollableScrollPhysics(); }); }), - collapseMode: CollapseMode.pin, - stretchModes: [ - StretchMode.zoomBackground, - StretchMode.fadeTitle, - StretchMode.blurBackground, - ], - background: Container( - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8.w), - ), - child: Stack( - children: [ - Positioned( - child: Column( - children: [ - buildSwiper(), - Expanded( - child: Container( - color: Colors.transparent, + collapseMode: CollapseMode.pin, + stretchModes: [ + StretchMode.zoomBackground, + StretchMode.fadeTitle, + StretchMode.blurBackground, + ], + background: Container( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8.w), + ), + child: Stack( + children: [ + Positioned( + child: Column( + children: [ + buildSwiper(), + Expanded( + child: Container( + 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: 0, - bottom: 0, - left: 0, - right: 0, + top: 233.h, + bottom: 0, + left: 0, + right: 0, + ), + ], ), - Positioned( - child: Container( - decoration: BoxDecoration( - color: Colors.white, - borderRadius: - BorderRadius.circular(8.w), + ), + ), + backgroundColor: Color(0x33FAFAFA), + centerTitle: false, + elevation: 0, + 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( - 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), + 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: ""), ], - ), - ), - top: 233.h, - bottom: 0, - left: 0, - right: 0, - ), - ], + )), + ), ), ), ), - backgroundColor: Color(0x33FAFAFA), - centerTitle: false, - elevation: 0, - 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: + ]; + }, + body: - ///点餐 - TabBarView( - physics: NeverScrollableScrollPhysics(), - children: [ - ///点餐 - StoreOrderListPage( - widget.arguments, - activitys, - storeInfo, - shopCarGoods, - controller, - minToken, - tenant, - tableId, - _queryMiNiDetail, () { - queryShopCar().then((value) { - this.shopCarGoods = value; - setState(() {}); - }); - }, scrollPhysics), + ///点餐 + TabBarView( + physics: NeverScrollableScrollPhysics(), + children: [ + ///点餐 + StoreOrderListPage( + widget.arguments, + activitys, + storeInfo, + shopCarGoods, + controller, + minToken, + tenant, + tableId, + _queryMiNiDetail, () { + queryShopCar().then((value) { + this.shopCarGoods = value; + setState(() {}); + }); + }, scrollPhysics), - ///星店活动, - // StoreActivity( - // widget.arguments, - // activitys, - // ), - ], - controller: tabcontroller, - ), - ), - /*SmartRefresher( + ///星店活动, + // StoreActivity( + // widget.arguments, + // activitys, + // ), + ], + controller: tabcontroller, + ), + ), + /*SmartRefresher( controller: refreshController = RefreshController(initialRefresh: false), enablePullDown: true, @@ -459,110 +469,110 @@ class _StoreOrderPage extends State }, child: ),*/ - ), - Positioned( - bottom: 30, - left: 0, - right: 0, - child: Stack( - alignment: Alignment.bottomLeft, - children: [ - Container( - margin: EdgeInsets.symmetric(horizontal: 14), - height: 45.h, - // color: Color(0xFFFAFAFA), - decoration: BoxDecoration( - color: Color(0xFF383A38), - borderRadius: BorderRadius.circular(100), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - width: 45.w, + ), + Positioned( + bottom: 30, + left: 0, + right: 0, + child: Stack( + alignment: Alignment.bottomLeft, + children: [ + Container( + margin: EdgeInsets.symmetric(horizontal: 14), + height: 45.h, + // color: Color(0xFFFAFAFA), + decoration: BoxDecoration( + color: Color(0xFF383A38), + borderRadius: BorderRadius.circular(100), ), - Text.rich( - TextSpan(children: [ - TextSpan( - text: "￥ ", - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFFFFFFFF), - fontWeight: MyFontWeight.bold), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox( + width: 45.w, ), - TextSpan( - text: shopCarGoods != null - ? shopCarGoods.cartSum - : "0.0", - style: TextStyle( - fontSize: 20.sp, - fontFamily: 'JDZhengHT', - color: Color(0xFFFFFFFF), - fontWeight: MyFontWeight.medium), + Text.rich( + TextSpan(children: [ + TextSpan( + text: "￥ ", + style: TextStyle( + fontSize: 12.sp, + color: Color(0xFFFFFFFF), + fontWeight: MyFontWeight.bold), + ), + TextSpan( + text: shopCarGoods != null + ? shopCarGoods.cartSum + : "0.0", + style: TextStyle( + fontSize: 20.sp, + fontFamily: 'JDZhengHT', + color: Color(0xFFFFFFFF), + fontWeight: MyFontWeight.medium), + ), + ]), ), - ]), - ), - Spacer(), - GestureDetector( - onTap: () { - // if(AppUtils.compareTime(storeInfo.openStartTime,DateFormat('HH:mm:ss').format(DateTime.now())) - // &&(!AppUtils.compareTime(storeInfo.openEndTime,DateFormat('HH:mm:ss').format(DateTime.now())))){ - toDownOrder(); - // } - // else - // SmartDialog.showToast("营业时间:${storeInfo.openStartTime}-${storeInfo.openEndTime}", alignment: Alignment.center); - }, - child: RoundButton( - width: 103.w, - height: 54.h, - text: S.current.jiesuan, - textColor: Colors.white, - fontWeight: MyFontWeight.bold, - backgroup: Color(0xFF32A060), - radius: 100, - 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, + Spacer(), + GestureDetector( + onTap: () { + // if(AppUtils.compareTime(storeInfo.openStartTime,DateFormat('HH:mm:ss').format(DateTime.now())) + // &&(!AppUtils.compareTime(storeInfo.openEndTime,DateFormat('HH:mm:ss').format(DateTime.now())))){ + toDownOrder(); + // } + // else + // SmartDialog.showToast("营业时间:${storeInfo.openStartTime}-${storeInfo.openEndTime}", alignment: Alignment.center); + }, + child: RoundButton( + width: 103.w, + height: 54.h, + text: S.current.jiesuan, + textColor: Colors.white, + fontWeight: MyFontWeight.bold, + backgroup: Color(0xFF32A060), + radius: 100, + fontSize: 16.sp, + padding: EdgeInsets.symmetric(vertical: 5.h), + ), + ), + ], ), ), - 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, + 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) + 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, + ), + ), + ], + ), ], ), - ], - ), - ), - ], - )); + ), + ], + ))); } ///领取优惠券 diff --git a/lib/store/store_view/shop_goods.dart b/lib/store/store_view/shop_goods.dart index 7755e4b6..c433a4bc 100644 --- a/lib/store/store_view/shop_goods.dart +++ b/lib/store/store_view/shop_goods.dart @@ -191,7 +191,7 @@ class _ShopGoods extends State { 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 { 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 { 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), diff --git a/lib/union/union_page.dart b/lib/union/union_page.dart index 569977f2..22486e4b 100644 --- a/lib/union/union_page.dart +++ b/lib/union/union_page.dart @@ -334,9 +334,9 @@ class UnionPageState extends State //指示器与文字等宽 tabs: [ 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), ], )), )),