From c6791cf9f56a43fb437ab5fb74bb5a3e657d5acc Mon Sep 17 00:00:00 2001 From: wurong <953969641@qq.com> Date: Mon, 8 May 2023 15:18:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BB=93=E7=AE=97=E9=A1=B5?= =?UTF-8?q?=E5=A4=96=E5=8D=96=EF=BC=8C=E7=89=A9=E6=B5=81=EF=BC=8C=E5=A0=82?= =?UTF-8?q?=E9=A3=9F=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=AF=B9=E5=BA=94=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=9B=20=E6=9B=B4=E6=94=B9=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E8=AF=AD=E8=A8=80=E9=A1=BA=E5=BA=8F=EF=BC=9B=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9=E9=A4=90=E9=A1=B5banner=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=BB=91=E5=8A=A8=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/generated/intl/messages_en.dart | 7 ++ lib/generated/intl/messages_en_US.dart | 9 ++- lib/generated/intl/messages_zh_CN.dart | 7 ++ lib/generated/intl/messages_zh_Hans_CN.dart | 7 ++ lib/generated/intl/messages_zh_Hant_CN.dart | 7 ++ lib/generated/intl/messages_zh_TW.dart | 7 ++ lib/generated/l10n.dart | 70 +++++++++++++++++++ lib/l10n/intl_en.arb | 7 ++ lib/l10n/intl_en_US.arb | 9 ++- lib/l10n/intl_zh_CN.arb | 7 ++ lib/l10n/intl_zh_Hans_CN.arb | 7 ++ lib/l10n/intl_zh_Hant_CN.arb | 7 ++ lib/l10n/intl_zh_TW.arb | 7 ++ lib/settlement/settlement.dart | 14 ++-- .../settlement_view/distribution.dart | 22 +++--- lib/store/shop_details_page.dart | 4 +- lib/store/store_view/product_sku.dart | 2 +- lib/store/store_view/shop_goods.dart | 2 +- 18 files changed, 177 insertions(+), 25 deletions(-) diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 30115b46..0ffb34dd 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -165,6 +165,7 @@ class MessageLookup extends MessageLookupByLibrary { "code_error" : MessageLookupByLibrary.simpleMessage("验证码输入错误"), "cunchu" : MessageLookupByLibrary.simpleMessage("存储"), "cunchutishixinxi" : MessageLookupByLibrary.simpleMessage("为了获得照片使用、缓存等功能，推荐您在使用期间打开存储权限"), + "dabaodaodianqu" : MessageLookupByLibrary.simpleMessage("打包到店取"), "daifukuan" : MessageLookupByLibrary.simpleMessage("待付款"), "daipeisong" : MessageLookupByLibrary.simpleMessage("待配送"), "daiqucan" : MessageLookupByLibrary.simpleMessage("待取餐"), @@ -188,6 +189,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("点单"), "dianhua" : MessageLookupByLibrary.simpleMessage("电话"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"), + "dianneiyongcan" : MessageLookupByLibrary.simpleMessage("店内用餐"), "dianputuijian" : MessageLookupByLibrary.simpleMessage("店铺推荐"), "dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"), @@ -393,6 +395,7 @@ class MessageLookup extends MessageLookupByLibrary { "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"), "lijishiyong" : MessageLookupByLibrary.simpleMessage("立即使用"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"), + "lijiyuyue" : MessageLookupByLibrary.simpleMessage("立即预约"), "likekaitong" : MessageLookupByLibrary.simpleMessage("立刻开通"), "likexufei" : MessageLookupByLibrary.simpleMessage("立刻续费"), "likezhifu" : MessageLookupByLibrary.simpleMessage("立刻支付"), @@ -483,6 +486,8 @@ class MessageLookup extends MessageLookupByLibrary { "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("请选择使用门店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("请选择收货地址"), "qingxuanzeyigemendian" : MessageLookupByLibrary.simpleMessage("请选择一个门店"), + "qingxuanzeyuyeushijian" : MessageLookupByLibrary.simpleMessage("请选择预约时间"), + "qingxuanzeyuyuemendian" : MessageLookupByLibrary.simpleMessage("请选择预约门店"), "qingxuanzhemendian" : MessageLookupByLibrary.simpleMessage("请选择门店"), "qingxuanzheninxiangshezhideyuyan" : MessageLookupByLibrary.simpleMessage("请选择您想设置的语言"), "qingzaiguidingshijianneizhifu" : MessageLookupByLibrary.simpleMessage("请在规定时间内完成支付"), @@ -588,6 +593,7 @@ class MessageLookup extends MessageLookupByLibrary { "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), "sui" : m31, + "tangshi" : MessageLookupByLibrary.simpleMessage("堂食"), "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), "tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠专区"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), @@ -606,6 +612,7 @@ class MessageLookup extends MessageLookupByLibrary { "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登录"), "tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"), "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), + "waidai" : MessageLookupByLibrary.simpleMessage("外带"), "waimai" : MessageLookupByLibrary.simpleMessage("外卖"), "waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), diff --git a/lib/generated/intl/messages_en_US.dart b/lib/generated/intl/messages_en_US.dart index 7bbb27d2..67fb5e18 100644 --- a/lib/generated/intl/messages_en_US.dart +++ b/lib/generated/intl/messages_en_US.dart @@ -165,6 +165,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"), + "dabaodaodianqu" : MessageLookupByLibrary.simpleMessage("pack to shop take away"), "daifukuan" : MessageLookupByLibrary.simpleMessage("Obligations"), "daipeisong" : MessageLookupByLibrary.simpleMessage("to be delivered"), "daiqucan" : MessageLookupByLibrary.simpleMessage("To be picked up"), @@ -188,6 +189,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("Order"), "dianhua" : MessageLookupByLibrary.simpleMessage("Telephone"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("Click login to enjoy more wonderful information"), + "dianneiyongcan" : MessageLookupByLibrary.simpleMessage("store dining"), "dianputuijian" : MessageLookupByLibrary.simpleMessage("Store recommendation"), "dianpuyue" : MessageLookupByLibrary.simpleMessage("Shop balance"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("Click me to get it"), @@ -220,7 +222,7 @@ class MessageLookup extends MessageLookupByLibrary { "duihuanliangdidaogao" : MessageLookupByLibrary.simpleMessage("From low to high exchange volume"), "duihuanlianggaodaodi" : MessageLookupByLibrary.simpleMessage("From high to low exchange volume"), "duihuanlishi" : MessageLookupByLibrary.simpleMessage("Exchange"), - "duihuanquan" : MessageLookupByLibrary.simpleMessage("exchange coupon"), + "duihuanquan" : MessageLookupByLibrary.simpleMessage("redeem coupon"), "duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("Details of exchanged goods"), "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("Exchange information"), "duozhongyouhui" : MessageLookupByLibrary.simpleMessage("A variety of coupons are waiting for you"), @@ -393,6 +395,7 @@ class MessageLookup extends MessageLookupByLibrary { "lijiqiandao" : MessageLookupByLibrary.simpleMessage("Sign in immediately"), "lijishiyong" : MessageLookupByLibrary.simpleMessage("Use Now"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("Experience Now"), + "lijiyuyue" : MessageLookupByLibrary.simpleMessage("directly reservation"), "likekaitong" : MessageLookupByLibrary.simpleMessage("Open now"), "likexufei" : MessageLookupByLibrary.simpleMessage("Renew now"), "likezhifu" : MessageLookupByLibrary.simpleMessage("Pay Now"), @@ -483,6 +486,8 @@ class MessageLookup extends MessageLookupByLibrary { "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("Please select a store to use"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("Please select the shipping address"), "qingxuanzeyigemendian" : MessageLookupByLibrary.simpleMessage("Please select a store"), + "qingxuanzeyuyeushijian" : MessageLookupByLibrary.simpleMessage("please select subscribe time"), + "qingxuanzeyuyuemendian" : MessageLookupByLibrary.simpleMessage("please select subscribe shop"), "qingxuanzhemendian" : MessageLookupByLibrary.simpleMessage("Please select a store"), "qingxuanzheninxiangshezhideyuyan" : MessageLookupByLibrary.simpleMessage("Please select the language you want to set"), "qingzaiguidingshijianneizhifu" : MessageLookupByLibrary.simpleMessage("Please complete the payment within the specified time"), @@ -588,6 +593,7 @@ class MessageLookup extends MessageLookupByLibrary { "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("Please enter the consignee address"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("Enter payment password"), "sui" : m31, + "tangshi" : MessageLookupByLibrary.simpleMessage("tang shi"), "tebieshengming" : MessageLookupByLibrary.simpleMessage("Special statement"), "tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("Special offer area"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("Add a new secondary card"), @@ -606,6 +612,7 @@ class MessageLookup extends MessageLookupByLibrary { "tuichudenglu" : MessageLookupByLibrary.simpleMessage("Log out"), "tuiguangma" : MessageLookupByLibrary.simpleMessage("Promotion code"), "tuikuan" : MessageLookupByLibrary.simpleMessage("Refund"), + "waidai" : MessageLookupByLibrary.simpleMessage("take away"), "waimai" : MessageLookupByLibrary.simpleMessage("take away"), "waimaipeisong" : MessageLookupByLibrary.simpleMessage("delivery"), "waisong" : MessageLookupByLibrary.simpleMessage("sending out"), diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index a45c22b4..93d3e971 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -165,6 +165,7 @@ class MessageLookup extends MessageLookupByLibrary { "code_error" : MessageLookupByLibrary.simpleMessage("验证码输入错误"), "cunchu" : MessageLookupByLibrary.simpleMessage("存储"), "cunchutishixinxi" : MessageLookupByLibrary.simpleMessage("为了获得照片使用、缓存等功能，推荐您在使用期间打开存储权限"), + "dabaodaodianqu" : MessageLookupByLibrary.simpleMessage("打包到店取"), "daifukuan" : MessageLookupByLibrary.simpleMessage("待付款"), "daipeisong" : MessageLookupByLibrary.simpleMessage("待配送"), "daiqucan" : MessageLookupByLibrary.simpleMessage("待取餐"), @@ -188,6 +189,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("点单"), "dianhua" : MessageLookupByLibrary.simpleMessage("电话"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"), + "dianneiyongcan" : MessageLookupByLibrary.simpleMessage("店内用餐"), "dianputuijian" : MessageLookupByLibrary.simpleMessage("店铺推荐"), "dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"), @@ -393,6 +395,7 @@ class MessageLookup extends MessageLookupByLibrary { "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"), "lijishiyong" : MessageLookupByLibrary.simpleMessage("立即使用"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"), + "lijiyuyue" : MessageLookupByLibrary.simpleMessage("立即预约"), "likekaitong" : MessageLookupByLibrary.simpleMessage("立刻开通"), "likexufei" : MessageLookupByLibrary.simpleMessage("立刻续费"), "likezhifu" : MessageLookupByLibrary.simpleMessage("立刻支付"), @@ -483,6 +486,8 @@ class MessageLookup extends MessageLookupByLibrary { "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("请选择使用门店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("请选择收货地址"), "qingxuanzeyigemendian" : MessageLookupByLibrary.simpleMessage("请选择一个门店"), + "qingxuanzeyuyeushijian" : MessageLookupByLibrary.simpleMessage("请选择预约时间"), + "qingxuanzeyuyuemendian" : MessageLookupByLibrary.simpleMessage("请选择预约门店"), "qingxuanzhemendian" : MessageLookupByLibrary.simpleMessage("请选择门店"), "qingxuanzheninxiangshezhideyuyan" : MessageLookupByLibrary.simpleMessage("请选择您想设置的语言"), "qingzaiguidingshijianneizhifu" : MessageLookupByLibrary.simpleMessage("请在规定时间内完成支付"), @@ -588,6 +593,7 @@ class MessageLookup extends MessageLookupByLibrary { "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), "sui" : m31, + "tangshi" : MessageLookupByLibrary.simpleMessage("堂食"), "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), "tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠专区"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), @@ -606,6 +612,7 @@ class MessageLookup extends MessageLookupByLibrary { "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登录"), "tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"), "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), + "waidai" : MessageLookupByLibrary.simpleMessage("外带"), "waimai" : MessageLookupByLibrary.simpleMessage("外卖"), "waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index 335a315f..e9779c5f 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_CN.dart @@ -165,6 +165,7 @@ class MessageLookup extends MessageLookupByLibrary { "code_error" : MessageLookupByLibrary.simpleMessage("验证码输入错误"), "cunchu" : MessageLookupByLibrary.simpleMessage("存储"), "cunchutishixinxi" : MessageLookupByLibrary.simpleMessage("为了获得照片使用、缓存等功能，推荐您在使用期间打开存储权限"), + "dabaodaodianqu" : MessageLookupByLibrary.simpleMessage("打包到店取"), "daifukuan" : MessageLookupByLibrary.simpleMessage("待付款"), "daipeisong" : MessageLookupByLibrary.simpleMessage("待配送"), "daiqucan" : MessageLookupByLibrary.simpleMessage("待取餐"), @@ -188,6 +189,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("点单"), "dianhua" : MessageLookupByLibrary.simpleMessage("电话"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"), + "dianneiyongcan" : MessageLookupByLibrary.simpleMessage("店内用餐"), "dianputuijian" : MessageLookupByLibrary.simpleMessage("店铺推荐"), "dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"), @@ -393,6 +395,7 @@ class MessageLookup extends MessageLookupByLibrary { "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"), "lijishiyong" : MessageLookupByLibrary.simpleMessage("立即使用"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"), + "lijiyuyue" : MessageLookupByLibrary.simpleMessage("立即预约"), "likekaitong" : MessageLookupByLibrary.simpleMessage("立刻开通"), "likexufei" : MessageLookupByLibrary.simpleMessage("立刻续费"), "likezhifu" : MessageLookupByLibrary.simpleMessage("立刻支付"), @@ -483,6 +486,8 @@ class MessageLookup extends MessageLookupByLibrary { "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("请选择使用门店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("请选择收货地址"), "qingxuanzeyigemendian" : MessageLookupByLibrary.simpleMessage("请选择一个门店"), + "qingxuanzeyuyeushijian" : MessageLookupByLibrary.simpleMessage("请选择预约时间"), + "qingxuanzeyuyuemendian" : MessageLookupByLibrary.simpleMessage("请选择预约门店"), "qingxuanzhemendian" : MessageLookupByLibrary.simpleMessage("请选择门店"), "qingxuanzheninxiangshezhideyuyan" : MessageLookupByLibrary.simpleMessage("请选择您想设置的语言"), "qingzaiguidingshijianneizhifu" : MessageLookupByLibrary.simpleMessage("请在规定时间内完成支付"), @@ -588,6 +593,7 @@ class MessageLookup extends MessageLookupByLibrary { "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), "sui" : m31, + "tangshi" : MessageLookupByLibrary.simpleMessage("堂食"), "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), "tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠专区"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), @@ -606,6 +612,7 @@ class MessageLookup extends MessageLookupByLibrary { "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登录"), "tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"), "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), + "waidai" : MessageLookupByLibrary.simpleMessage("外带"), "waimai" : MessageLookupByLibrary.simpleMessage("外卖"), "waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart index 80a05409..b7a6b659 100644 --- a/lib/generated/intl/messages_zh_Hant_CN.dart +++ b/lib/generated/intl/messages_zh_Hant_CN.dart @@ -161,6 +161,7 @@ class MessageLookup extends MessageLookupByLibrary { "code_error" : MessageLookupByLibrary.simpleMessage("驗證碼輸入錯誤"), "cunchu" : MessageLookupByLibrary.simpleMessage("存儲"), "cunchutishixinxi" : MessageLookupByLibrary.simpleMessage("為了獲得照片使用、緩存等功能，推薦您使用期間打開存儲權限"), + "dabaodaodianqu" : MessageLookupByLibrary.simpleMessage("打包到店取"), "daifukuan" : MessageLookupByLibrary.simpleMessage("待付款"), "daipeisong" : MessageLookupByLibrary.simpleMessage("待配送"), "daiqucan" : MessageLookupByLibrary.simpleMessage("待取餐"), @@ -184,6 +185,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("點單"), "dianhua" : MessageLookupByLibrary.simpleMessage("電話"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄，享受更多精彩信息"), + "dianneiyongcan" : MessageLookupByLibrary.simpleMessage("店内用餐"), "dianputuijian" : MessageLookupByLibrary.simpleMessage("店鋪推薦"), "dianpuyue" : MessageLookupByLibrary.simpleMessage("店鋪餘額"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"), @@ -389,6 +391,7 @@ class MessageLookup extends MessageLookupByLibrary { "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即簽到"), "lijishiyong" : MessageLookupByLibrary.simpleMessage("立即使用"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即體驗"), + "lijiyuyue" : MessageLookupByLibrary.simpleMessage("立即預約"), "likekaitong" : MessageLookupByLibrary.simpleMessage("立刻開通"), "likexufei" : MessageLookupByLibrary.simpleMessage("立刻續費"), "likezhifu" : MessageLookupByLibrary.simpleMessage("立刻支付"), @@ -478,6 +481,8 @@ class MessageLookup extends MessageLookupByLibrary { "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("請選擇使用門店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("請選擇收貨地址"), "qingxuanzeyigemendian" : MessageLookupByLibrary.simpleMessage("請選擇一個門店"), + "qingxuanzeyuyeushijian" : MessageLookupByLibrary.simpleMessage("請選擇預約時間"), + "qingxuanzeyuyuemendian" : MessageLookupByLibrary.simpleMessage("請選擇預約門店"), "qingxuanzhemendian" : MessageLookupByLibrary.simpleMessage("请选择门店"), "qingxuanzheninxiangshezhideyuyan" : MessageLookupByLibrary.simpleMessage("請選擇您要設置的語言"), "qingzaiguidingshijianneizhifu" : MessageLookupByLibrary.simpleMessage("請在規定時間内完成支付"), @@ -582,6 +587,7 @@ class MessageLookup extends MessageLookupByLibrary { "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人地址"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"), "sui" : m31, + "tangshi" : MessageLookupByLibrary.simpleMessage("堂食"), "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"), "tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠專區"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), @@ -600,6 +606,7 @@ class MessageLookup extends MessageLookupByLibrary { "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登錄"), "tuiguangma" : MessageLookupByLibrary.simpleMessage("推廣碼"), "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), + "waidai" : MessageLookupByLibrary.simpleMessage("外帶"), "waimai" : MessageLookupByLibrary.simpleMessage("外賣"), "waimaipeisong" : MessageLookupByLibrary.simpleMessage("外賣配送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index 80763869..c61a4a7b 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/lib/generated/intl/messages_zh_TW.dart @@ -163,6 +163,7 @@ class MessageLookup extends MessageLookupByLibrary { "code_error" : MessageLookupByLibrary.simpleMessage("驗證碼輸入錯誤"), "cunchu" : MessageLookupByLibrary.simpleMessage("存儲"), "cunchutishixinxi" : MessageLookupByLibrary.simpleMessage("為了獲得照片使用、緩存等功能，推薦您使用期間打開存儲權限"), + "dabaodaodianqu" : MessageLookupByLibrary.simpleMessage("打包到店取"), "daifukuan" : MessageLookupByLibrary.simpleMessage("待付款"), "daipeisong" : MessageLookupByLibrary.simpleMessage("待配送"), "daiqucan" : MessageLookupByLibrary.simpleMessage("待取餐"), @@ -186,6 +187,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("點單"), "dianhua" : MessageLookupByLibrary.simpleMessage("電話"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄，享受更多精彩信息"), + "dianneiyongcan" : MessageLookupByLibrary.simpleMessage("店内用餐"), "dianputuijian" : MessageLookupByLibrary.simpleMessage("店鋪推薦"), "dianpuyue" : MessageLookupByLibrary.simpleMessage("店鋪餘額"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"), @@ -391,6 +393,7 @@ class MessageLookup extends MessageLookupByLibrary { "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即簽到"), "lijishiyong" : MessageLookupByLibrary.simpleMessage("立即使用"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即體驗"), + "lijiyuyue" : MessageLookupByLibrary.simpleMessage("立即預約"), "likekaitong" : MessageLookupByLibrary.simpleMessage("立刻開通"), "likexufei" : MessageLookupByLibrary.simpleMessage("立刻續費"), "likezhifu" : MessageLookupByLibrary.simpleMessage("立刻支付"), @@ -480,6 +483,8 @@ class MessageLookup extends MessageLookupByLibrary { "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("請選擇使用門店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("請選擇收貨地址"), "qingxuanzeyigemendian" : MessageLookupByLibrary.simpleMessage("請選擇一個門店"), + "qingxuanzeyuyeushijian" : MessageLookupByLibrary.simpleMessage("請選擇預約時間"), + "qingxuanzeyuyuemendian" : MessageLookupByLibrary.simpleMessage("請選擇預約門店"), "qingxuanzhemendian" : MessageLookupByLibrary.simpleMessage("请选择门店"), "qingxuanzheninxiangshezhideyuyan" : MessageLookupByLibrary.simpleMessage("請選擇您要設置的語言"), "qingzaiguidingshijianneizhifu" : MessageLookupByLibrary.simpleMessage("請在規定時間内完成支付"), @@ -585,6 +590,7 @@ class MessageLookup extends MessageLookupByLibrary { "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人地址"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"), "sui" : m31, + "tangshi" : MessageLookupByLibrary.simpleMessage("堂食"), "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"), "tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠專區"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), @@ -603,6 +609,7 @@ class MessageLookup extends MessageLookupByLibrary { "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登錄"), "tuiguangma" : MessageLookupByLibrary.simpleMessage("推廣碼"), "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), + "waidai" : MessageLookupByLibrary.simpleMessage("外帶"), "waimai" : MessageLookupByLibrary.simpleMessage("外賣"), "waimaipeisong" : MessageLookupByLibrary.simpleMessage("外賣配送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 2e4c0f26..dddd44aa 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -6975,6 +6975,76 @@ class S { ); } + /// `立即预约` + String get lijiyuyue { + return Intl.message( + '立即预约', + name: 'lijiyuyue', + desc: '', + args: [], + ); + } + + /// `请选择预约时间` + String get qingxuanzeyuyeushijian { + return Intl.message( + '请选择预约时间', + name: 'qingxuanzeyuyeushijian', + desc: '', + args: [], + ); + } + + /// `请选择预约门店` + String get qingxuanzeyuyuemendian { + return Intl.message( + '请选择预约门店', + name: 'qingxuanzeyuyuemendian', + desc: '', + args: [], + ); + } + + /// `堂食` + String get tangshi { + return Intl.message( + '堂食', + name: 'tangshi', + desc: '', + args: [], + ); + } + + /// `店内用餐` + String get dianneiyongcan { + return Intl.message( + '店内用餐', + name: 'dianneiyongcan', + desc: '', + args: [], + ); + } + + /// `外带` + String get waidai { + return Intl.message( + '外带', + name: 'waidai', + desc: '', + args: [], + ); + } + + /// `打包到店取` + String get dabaodaodianqu { + return Intl.message( + '打包到店取', + name: 'dabaodaodianqu', + desc: '', + args: [], + ); + } + /// `并使用本机号码登录` String get privacy_policy4 { return Intl.message( diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 0f40d16d..d1f4f32c 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -725,6 +725,13 @@ "lvbizhifu":"绿币支付", "xuanzetuijianmendian":"选择推荐门店", "yingwen":"英文", + "lijiyuyue":"立即预约", + "qingxuanzeyuyeushijian":"请选择预约时间", + "qingxuanzeyuyuemendian":"请选择预约门店", + "tangshi":"堂食", + "dianneiyongcan":"店内用餐", + "waidai":"外带", + "dabaodaodianqu":"打包到店取", diff --git a/lib/l10n/intl_en_US.arb b/lib/l10n/intl_en_US.arb index b8c06677..fd08a44e 100644 --- a/lib/l10n/intl_en_US.arb +++ b/lib/l10n/intl_en_US.arb @@ -414,7 +414,7 @@ "xiangce": "album", "xianxiashiyong": "offline use", "xianshangshiyong": "online use", - "duihuanquan": "exchange coupon", + "duihuanquan": "redeem coupon", "quhexiao": "De write off", "biaojiweiyidu": "Mark as Read", "xitongtongzhi": "System Notification", @@ -726,6 +726,13 @@ "lvbizhifu":"green payment", "xuanzetuijianmendian":"select recommended store", "yingwen":"United States", + "lijiyuyue":"directly reservation", + "qingxuanzeyuyeushijian":"please select subscribe time", + "qingxuanzeyuyuemendian":"please select subscribe shop", + "tangshi":"tang shi", + "dianneiyongcan":"store dining", + "waidai":"take away", + "dabaodaodianqu":"pack to shop take away", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index a90f096e..966e8b8e 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -726,6 +726,13 @@ "lvbizhifu":"绿币支付", "xuanzetuijianmendian":"选择推荐门店", "yingwen":"英文", + "lijiyuyue":"立即预约", + "qingxuanzeyuyeushijian":"请选择预约时间", + "qingxuanzeyuyuemendian":"请选择预约门店", + "tangshi":"堂食", + "dianneiyongcan":"店内用餐", + "waidai":"外带", + "dabaodaodianqu":"打包到店取", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 26333f99..a20b0174 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -726,6 +726,13 @@ "lvbizhifu":"绿币支付", "xuanzetuijianmendian":"选择推荐门店", "yingwen":"英文", + "lijiyuyue":"立即预约", + "qingxuanzeyuyeushijian":"请选择预约时间", + "qingxuanzeyuyuemendian":"请选择预约门店", + "tangshi":"堂食", + "dianneiyongcan":"店内用餐", + "waidai":"外带", + "dabaodaodianqu":"打包到店取", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index 0b89d1f3..d9ee9ec7 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -717,6 +717,13 @@ "lvbizhifu":"綠幣支付", "xuanzetuijianmendian":"選擇推薦門店", "yingwen":"英文", + "lijiyuyue":"立即預約", + "qingxuanzeyuyeushijian":"請選擇預約時間", + "qingxuanzeyuyuemendian":"請選擇預約門店", + "tangshi":"堂食", + "dianneiyongcan":"店内用餐", + "waidai":"外帶", + "dabaodaodianqu":"打包到店取", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 575272d4..62a6df75 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -719,6 +719,13 @@ "lvbizhifu":"綠幣支付", "xuanzetuijianmendian":"選擇推薦門店", "yingwen":"英文", + "lijiyuyue":"立即預約", + "qingxuanzeyuyeushijian":"請選擇預約時間", + "qingxuanzeyuyuemendian":"請選擇預約門店", + "tangshi":"堂食", + "dianneiyongcan":"店内用餐", + "waidai":"外帶", + "dabaodaodianqu":"打包到店取", diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart index d19ca702..19e0813a 100644 --- a/lib/settlement/settlement.dart +++ b/lib/settlement/settlement.dart @@ -976,8 +976,8 @@ class _Settlement extends State { ((subscribeParam.stores.length ==1 ? subscribeParam.stores[0] : subscribeStoresName) == null))) { SmartDialog.showToast( (reservationTime == null) - ? "请选择预约时间" - : "请选择预约门店", + ? S.of(context).qingxuanzeyuyeushijian + : S.of(context).qingxuanzeyuyuemendian, alignment: Alignment.center); return; } @@ -1057,7 +1057,7 @@ class _Settlement extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - "堂食", + S.of(context).tangshi, style: TextStyle( color: Color(0xFF353535), fontSize: 14.sp, @@ -1066,7 +1066,7 @@ class _Settlement extends State { ), SizedBox(height: 6.h,), Text( - "店内用餐", + S.of(context).dianneiyongcan, style: TextStyle( color: Color(0xFF32A060), fontSize: 12.sp, @@ -1114,7 +1114,7 @@ class _Settlement extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - "外带", + S.of(context).waidai, style: TextStyle( color: Color(0xFF353535), fontSize: 14.sp, @@ -1123,7 +1123,7 @@ class _Settlement extends State { ), SizedBox(height: 6.h,), Text( - "打包到店取", + S.of(context).dabaodaodianqu, style: TextStyle( color: Color(0xFF32A060), fontSize: 12.sp, @@ -1361,7 +1361,7 @@ class _Settlement extends State { alignment: Alignment.center, margin: EdgeInsets.symmetric(vertical:5.h), child: Text( - "请选择预约门店", + S.of(context).qingxuanzeyuyuemendian, style: TextStyle( fontWeight: MyFontWeight.bold, fontSize: 15.sp, diff --git a/lib/settlement/settlement_view/distribution.dart b/lib/settlement/settlement_view/distribution.dart index 6b63cdee..b26d048c 100644 --- a/lib/settlement/settlement_view/distribution.dart +++ b/lib/settlement/settlement_view/distribution.dart @@ -146,12 +146,11 @@ class _DistributionMode extends State { flex: 1, child: GestureDetector( onTap: () { - // if (widget.storeInfo.storeName == "一心回乡商城") - if ((widget?.storeInfo?.pickupType?.takeawayStatus ?? false) == false) { - SmartDialog.showToast("该功能暂未开放!", - alignment: Alignment.center); - return; - } + // if (widget.storeInfo.storeName == "一心回乡商城") { + // SmartDialog.showToast("该功能暂未开放!", + // alignment: Alignment.center); + // return; + // } selectedBtn = 1; widget.queryAddress(selectedBtn); // SmartDialog.showToast("该功能暂未开放!", @@ -175,12 +174,11 @@ class _DistributionMode extends State { flex: 1, child: GestureDetector( onTap: () { - // if (widget.storeInfo.storeName == "一心回乡商城") - if((widget?.storeInfo?.pickupType?.expressDeliveryStatus ?? false) == false){ - SmartDialog.showToast("该功能暂未开放!", - alignment: Alignment.center); - return; - } + // if (widget.storeInfo.storeName == "一心回乡商城"){ + // SmartDialog.showToast("该功能暂未开放!", + // alignment: Alignment.center); + // return; + // } selectedBtn = 2; widget.queryAddress(selectedBtn); // SmartDialog.showToast("该功能暂未开放!", diff --git a/lib/store/shop_details_page.dart b/lib/store/shop_details_page.dart index 76e8d150..b5b8cf82 100644 --- a/lib/store/shop_details_page.dart +++ b/lib/store/shop_details_page.dart @@ -877,7 +877,7 @@ class _ShopDetailsPage extends State { ((miNiDetail?.subscribeParam?.isEnableSubscribe ?? false) == true) - ? "立即预约" + ? S.of(context).lijiyuyue : "加入购物车", style: TextStyle( fontSize: 12.sp, @@ -1153,7 +1153,7 @@ class _ShopDetailsPage extends State { text: ((miNiDetail?.subscribeParam?.isEnableSubscribe ?? false) == true) - ? "立即预约" + ? S.of(context).lijiyuyue : "加入购物车", textColor: Colors.white, fontWeight: MyFontWeight.semi_bold, diff --git a/lib/store/store_view/product_sku.dart b/lib/store/store_view/product_sku.dart index 98599e00..557c68e8 100644 --- a/lib/store/store_view/product_sku.dart +++ b/lib/store/store_view/product_sku.dart @@ -296,7 +296,7 @@ class _ProductSku extends State { RoundButton( width: double.infinity, height: 54.h, - text: (widget?.miNiDetail?.subscribeParam?.isEnableSubscribe ?? false) == true ? "立即预约":"加入购物车", + text: (widget?.miNiDetail?.subscribeParam?.isEnableSubscribe ?? false) == true ? S.of(context).lijiyuyue:"加入购物车", textColor: Colors.white, fontWeight: MyFontWeight.semi_bold, radius: 27, diff --git a/lib/store/store_view/shop_goods.dart b/lib/store/store_view/shop_goods.dart index 008f32e1..e9f70532 100644 --- a/lib/store/store_view/shop_goods.dart +++ b/lib/store/store_view/shop_goods.dart @@ -403,7 +403,7 @@ class _ShopGoods extends State { ), margin: EdgeInsets.only(right: 8, top: 4), child: RoundButton( - text: "立即预约", + text: S.of(context).lijiyuyue, textColor: Colors.white, fontWeight: MyFontWeight.medium, radius: 3,