diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 83cd83e2..8719b45b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -43,7 +43,7 @@ PODS: - Flutter - fluwx (0.0.1): - Flutter - - OpenWeChatSDK (~> 1.9.6) + - "OpenWeChatSDK (~> 1.9.2+1)" - image_pickers (0.0.1): - AFNetworking - Flutter @@ -331,7 +331,7 @@ SPEC CHECKSUMS: flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08 flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1 flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf - fluwx: 1649fdbdb0a7e24f3a371ca0f302e25dc1c022ab + fluwx: 79c66b6d795ab8208262ada215d9e60388cfe492 image_pickers: 5e6ec7083f9363d014c0fb061f1b9cd97bb5e451 mob_sharesdk: b707987dfbe7e180ea60ddf4b5db30126ac98390 MOBFoundation: 2fcfc8b48bf311ace31e99c941b70f573c88880a diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 728f0ccd..4c6caf70 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -617,7 +617,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.1.6; + MARKETING_VERSION = 3.1.7; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -819,7 +819,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -869,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.1.6; + MARKETING_VERSION = 3.1.7; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -912,7 +912,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 6; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -962,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.1.6; + MARKETING_VERSION = 3.1.7; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/community/community_page.dart b/lib/community/community_page.dart index 165e1f00..d767da25 100644 --- a/lib/community/community_page.dart +++ b/lib/community/community_page.dart @@ -130,21 +130,21 @@ class _CommunityPage extends State child: TabBarView( physics: b, children: lables.map((e) { - if (e == S.of(context).guanyuhuixiang) { + if (e == "关于回乡") { return BrandPage(); - }else if(e == S.of(context).liaojiejiankang){ + }else if(e == "了解健康"){ return ArticlePage(onChildScroll); - }else if(e == S.of(context).xuexijiankang){ + }else if(e == "学习健康"){ return CommunityCourse(); } - else if(e == S.of(context).fenxiangjiankang){ + else if(e == "分享健康"){ if (tuijian == null){ - tuijian = CommunityChildPage(tuijianKey, S.of(context).fenxiangjiankang,onChildScroll,_toRelease); + tuijian = CommunityChildPage(tuijianKey,"分享健康",onChildScroll,_toRelease); } return tuijian; - }else if(e == S.of(context).guanzhu){ + }else if(e == "关注"){ if (guanzhu == null){ - guanzhu = CommunityChildPage(guanzhuKey,S.of(context).guanzhu,onChildScroll,_toRelease); + guanzhu = CommunityChildPage(guanzhuKey,"关注",onChildScroll,_toRelease); } return guanzhu; } diff --git a/lib/generated/intl/messages_all.dart b/lib/generated/intl/messages_all.dart index 7532d654..b6e31c3e 100644 --- a/lib/generated/intl/messages_all.dart +++ b/lib/generated/intl/messages_all.dart @@ -16,6 +16,7 @@ import 'package:intl/message_lookup_by_library.dart'; import 'package:intl/src/intl_helpers.dart'; import 'messages_en.dart' as messages_en; +import 'messages_en_US.dart' as messages_en_us; import 'messages_zh_CN.dart' as messages_zh_cn; import 'messages_zh_Hans_CN.dart' as messages_zh_hans_cn; import 'messages_zh_Hant_CN.dart' as messages_zh_hant_cn; @@ -24,6 +25,7 @@ import 'messages_zh_TW.dart' as messages_zh_tw; typedef Future LibraryLoader(); Map _deferredLibraries = { 'en': () => new Future.value(null), + 'en_US': () => new Future.value(null), 'zh_CN': () => new Future.value(null), 'zh_Hans_CN': () => new Future.value(null), 'zh_Hant_CN': () => new Future.value(null), @@ -34,6 +36,8 @@ MessageLookupByLibrary _findExact(String localeName) { switch (localeName) { case 'en': return messages_en.messages; + case 'en_US': + return messages_en_us.messages; case 'zh_CN': return messages_zh_cn.messages; case 'zh_Hans_CN': diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart index e4c5e904..a170e824 100644 --- a/lib/generated/intl/messages_zh_Hant_CN.dart +++ b/lib/generated/intl/messages_zh_Hant_CN.dart @@ -55,7 +55,7 @@ class MessageLookup extends MessageLookupByLibrary { static m17(shijian) => "領取時間 ${shijian}"; - static m18(yue) => "綠幣餘額 ${yue}"; + static m18(yue) => "綠幣 ${yue}"; static m19(man, jian) => "滿${man}元立減${jian}元代金券"; @@ -67,8 +67,6 @@ class MessageLookup extends MessageLookupByLibrary { static m23(pinglun) => "評論(${pinglun})"; - static m24(zongyue, huodongyue, lvbiyue) => "平台總餘額:${zongyue}(活動餘額${huodongyue} 綠幣餘額${lvbiyue}) "; - static m25(zhe) => "全場${zhe}折"; static m26(num) => "取單號${num}"; @@ -122,6 +120,7 @@ class MessageLookup extends MessageLookupByLibrary { "beiyaoqingdejiangli" : MessageLookupByLibrary.simpleMessage("每一位被邀請的用戶,在輸入邀請碼之後可獲得前進麥味10元代金券一張"), "beizhu" : MessageLookupByLibrary.simpleMessage("備注"), "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("備注信息"), + "benzhouquanbao" : MessageLookupByLibrary.simpleMessage("本周券包"), "bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"), "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("標為已讀"), "biaoweiyidu" : MessageLookupByLibrary.simpleMessage("標爲已讀"), @@ -147,8 +146,10 @@ class MessageLookup extends MessageLookupByLibrary { "chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"), "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市選擇"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成為專屬會員,享專屬權益"), + "chijiankang" : MessageLookupByLibrary.simpleMessage("吃健康"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), "chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"), + "chongzhifuliduo" : MessageLookupByLibrary.simpleMessage("充值福利多"), "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"), "chongzhizuixiaojine" : m1, "chuangjianshijian" : m2, @@ -164,6 +165,7 @@ class MessageLookup extends MessageLookupByLibrary { "daiqueren" : MessageLookupByLibrary.simpleMessage("待確認"), "daizhifu" : MessageLookupByLibrary.simpleMessage("待支付"), "daizhizuo" : MessageLookupByLibrary.simpleMessage("待製作"), + "dajiadouzaiduihuan" : MessageLookupByLibrary.simpleMessage("大家都在兌換"), "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打開定位"), "dangqianbanben" : MessageLookupByLibrary.simpleMessage("當前版本"), "dangqiandengji" : MessageLookupByLibrary.simpleMessage("當前等級"), @@ -180,6 +182,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("點單"), "dianhua" : MessageLookupByLibrary.simpleMessage("電話"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄,享受更多精彩信息"), + "dianputuijian" : MessageLookupByLibrary.simpleMessage("店鋪推薦"), "dianpuyue" : MessageLookupByLibrary.simpleMessage("店鋪餘額"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"), "dianzanxihuan_" : m3, @@ -200,6 +203,8 @@ class MessageLookup extends MessageLookupByLibrary { "dingwei" : MessageLookupByLibrary.simpleMessage("定位"), "dizhi" : MessageLookupByLibrary.simpleMessage("地址"), "dongtai" : MessageLookupByLibrary.simpleMessage("動態"), + "dongtaitishi" : MessageLookupByLibrary.simpleMessage("用戶發佈內容需要等待系統稽核,稽核通過後才會在推薦廣場展示"), + "dongtaixiangqing" : MessageLookupByLibrary.simpleMessage("動態詳情"), "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"), "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"), "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"), @@ -211,6 +216,7 @@ class MessageLookup extends MessageLookupByLibrary { "duihuanquan" : MessageLookupByLibrary.simpleMessage("兌換券"), "duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("兑换商品详情"), "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"), + "duozhongyouhui" : MessageLookupByLibrary.simpleMessage("多種優惠券等你拿"), "fabu" : MessageLookupByLibrary.simpleMessage("發佈"), "fangshier" : MessageLookupByLibrary.simpleMessage("方式二"), "fangshiyi" : MessageLookupByLibrary.simpleMessage("方式一"), @@ -230,16 +236,21 @@ class MessageLookup extends MessageLookupByLibrary { "fensi" : MessageLookupByLibrary.simpleMessage("粉絲"), "fenxiang" : MessageLookupByLibrary.simpleMessage("分享"), "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), + "fenxiangjiankang" : MessageLookupByLibrary.simpleMessage("分享健康"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接點擊右上方的分享給到你想要邀請的人。"), "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("將邀請碼分享給好友,對方在一心回鄉App登入頁輸入邀請碼,即可邀請成功。"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手機號"), + "fuliduihuan" : MessageLookupByLibrary.simpleMessage("福利兌換"), + "fulizhongxin" : MessageLookupByLibrary.simpleMessage("福利中心"), "ge" : m5, "geiwopingfen" : MessageLookupByLibrary.simpleMessage("給我評分"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"), + "gengduohaoquan" : MessageLookupByLibrary.simpleMessage("更多好券"), "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多優惠券"), "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更換背景"), "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"), + "gengyouhui" : MessageLookupByLibrary.simpleMessage("更優惠"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("個人信息"), "gexingqianming" : MessageLookupByLibrary.simpleMessage("個性簽名"), "gong" : MessageLookupByLibrary.simpleMessage("共"), @@ -252,6 +263,8 @@ class MessageLookup extends MessageLookupByLibrary { "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("請勾選同意隱私服務和一心回鄉服務協定"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), "guanyu" : MessageLookupByLibrary.simpleMessage("關於"), + "guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("關於創始人"), + "guanyuhuixiang" : MessageLookupByLibrary.simpleMessage("關於回鄉"), "guanzhu" : MessageLookupByLibrary.simpleMessage("關注"), "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("過健康有機生活"), "haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("還沒有消息~"), @@ -260,14 +273,18 @@ class MessageLookup extends MessageLookupByLibrary { "haowu" : MessageLookupByLibrary.simpleMessage("好物"), "haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友獎勵規則"), "heji" : MessageLookupByLibrary.simpleMessage("合計:"), + "hejiankang" : MessageLookupByLibrary.simpleMessage("喝健康"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"), "huangjin" : MessageLookupByLibrary.simpleMessage("黄金"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黃金會員"), "huifu" : MessageLookupByLibrary.simpleMessage("回復"), "huifu_" : m9, + "huixiangVIPka" : MessageLookupByLibrary.simpleMessage("回鄉VIP卡"), + "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回鄉錢包"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"), "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回鄉頭條"), + "huixiangvipkazhuanxiang" : MessageLookupByLibrary.simpleMessage("回鄉VIP卡專享權益"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("會員等級説明"), "huiyuanguize" : MessageLookupByLibrary.simpleMessage("會員規則説明"), @@ -277,15 +294,18 @@ class MessageLookup extends MessageLookupByLibrary { "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"), "huiyuanka" : MessageLookupByLibrary.simpleMessage("會員卡"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("會員卡詳情"), + "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("會員權益"), "huiyuanyue" : MessageLookupByLibrary.simpleMessage("會員餘額"), "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("會員中心"), + "huiyuanzhuanxiangjiage" : MessageLookupByLibrary.simpleMessage("會員專享價格"), "huode" : MessageLookupByLibrary.simpleMessage("獲得"), "huodequanyi" : MessageLookupByLibrary.simpleMessage("獲得權益"), "huodong" : MessageLookupByLibrary.simpleMessage("活動"), "huodongjianmianpeisongfei" : m10, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活動進行中"), "huodongliebiao" : MessageLookupByLibrary.simpleMessage("活動列表"), - "huodongyue" : m11, + "huodongyue" : MessageLookupByLibrary.simpleMessage("活動餘額"), + "huodongyue_" : m11, "huodongzixun" : MessageLookupByLibrary.simpleMessage("活動資訊"), "huopinyisongda" : MessageLookupByLibrary.simpleMessage("貨品已送達"), "input_code" : MessageLookupByLibrary.simpleMessage("手機驗證碼"), @@ -309,10 +329,13 @@ class MessageLookup extends MessageLookupByLibrary { "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"), - "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("淨弼積分商城"), + "jifenhuanquan" : MessageLookupByLibrary.simpleMessage("積分換券"), + "jifenmingxi" : MessageLookupByLibrary.simpleMessage("積分明細"), + "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("積分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"), "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精選好文"), + "jingxuanhuodong" : MessageLookupByLibrary.simpleMessage("精選活動"), "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日會員任務"), "jinrushangdian" : MessageLookupByLibrary.simpleMessage("進入商店"), @@ -332,6 +355,7 @@ class MessageLookup extends MessageLookupByLibrary { "kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"), + "kaitonghuixianghuoququanyi" : MessageLookupByLibrary.simpleMessage("開通回鄉VIP卡獲取更多權益"), "kaitongriqi" : m16, "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可領取的卡券"), @@ -343,14 +367,20 @@ class MessageLookup extends MessageLookupByLibrary { "kongtiao" : MessageLookupByLibrary.simpleMessage("空調"), "kuaidi" : MessageLookupByLibrary.simpleMessage("快遞"), "kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快遞物流"), + "lianxikefu" : MessageLookupByLibrary.simpleMessage("聯系客服"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("聯繫手機號"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("連續簽到領取雙倍積分"), + "liaojie" : MessageLookupByLibrary.simpleMessage("瞭解"), + "liaojiejiankang" : MessageLookupByLibrary.simpleMessage("瞭解健康"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即參加"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即開通"), "lijilingqu" : MessageLookupByLibrary.simpleMessage("立即領取"), "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即簽到"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即體驗"), + "likekaitong" : MessageLookupByLibrary.simpleMessage("立刻開通"), + "likexufei" : MessageLookupByLibrary.simpleMessage("立刻續費"), + "likezhifu" : MessageLookupByLibrary.simpleMessage("立刻支付"), "lingqu" : MessageLookupByLibrary.simpleMessage("領取"), "lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("領券中心"), "lingquchenggong" : MessageLookupByLibrary.simpleMessage("領取成功"), @@ -362,22 +392,27 @@ class MessageLookup extends MessageLookupByLibrary { "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的評論吧"), "login" : MessageLookupByLibrary.simpleMessage("登錄"), "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"), - "lvbiyue" : m18, + "lvbiyue" : MessageLookupByLibrary.simpleMessage("綠幣餘額"), + "lvbiyue_" : m18, "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), + "main_menu5" : MessageLookupByLibrary.simpleMessage("回鄉VIP"), "manlijiandaijinquan" : m19, "manyuankeyong" : m20, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日簽到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("沒有更多會員卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("沒有更多數據了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), + "meizhousangengxin" : MessageLookupByLibrary.simpleMessage("每週三更新"), + "meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("每週三更新劵包"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), "menpaihao" : MessageLookupByLibrary.simpleMessage("請輸入門牌號"), "mi" : m21, "mingxi" : MessageLookupByLibrary.simpleMessage("明細"), "morenpaixu" : MessageLookupByLibrary.simpleMessage("默認排序"), + "muqianwujilu" : MessageLookupByLibrary.simpleMessage("目前暫無記錄哦"), "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暫無星店活動"), "nihaimeiyouchongzhihuoxiaofeijilu" : MessageLookupByLibrary.simpleMessage("你在這兒還沒有消費或充值紀錄喔~"), "nincunchuquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启存储权限,请点击开启"), @@ -401,7 +436,6 @@ class MessageLookup extends MessageLookupByLibrary { "pinglun_" : m23, "pingtaiyue" : MessageLookupByLibrary.simpleMessage("平臺餘額"), "pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("平臺支付密碼"), - "pingtaizongyue" : m24, "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"), "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介紹"), "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登錄既同意"), @@ -437,6 +471,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingzhuo" : MessageLookupByLibrary.simpleMessage("清桌"), "qishoupeisongzhongyujisongdashijian" : MessageLookupByLibrary.simpleMessage("騎手配送中,預計送達時間"), "qishouyijiedanquhuozhong" : MessageLookupByLibrary.simpleMessage("騎手已接單、取貨中"), + "qita" : MessageLookupByLibrary.simpleMessage("其他"), "quanbao" : MessageLookupByLibrary.simpleMessage("券包"), "quanbu" : MessageLookupByLibrary.simpleMessage("全部"), "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部訂單"), @@ -485,10 +520,12 @@ class MessageLookup extends MessageLookupByLibrary { "ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.點擊淨弼,進入首頁,點擊上方的去簽到。\n2.點擊我的,進入我的頁面,點擊上方的積分詳情,進入後即可簽到。"), "ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款,請您提前準備好訂單號/取單號,並與門店人員進行聯繫"), "saoma" : MessageLookupByLibrary.simpleMessage("掃碼"), + "saomadiancan" : MessageLookupByLibrary.simpleMessage("您即將進行掃碼點餐"), "saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("掃碼識別,關注公眾號"), "send_code" : MessageLookupByLibrary.simpleMessage("發送驗證碼"), "shanchu" : MessageLookupByLibrary.simpleMessage("刪除"), "shanchudingdan" : MessageLookupByLibrary.simpleMessage("刪除訂單"), + "shanghuruzhu" : MessageLookupByLibrary.simpleMessage("商戶入駐"), "shangjiaquan" : MessageLookupByLibrary.simpleMessage("商家券"), "shangjiaqueren" : MessageLookupByLibrary.simpleMessage("商家確認"), "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已發貨"), @@ -518,6 +555,7 @@ class MessageLookup extends MessageLookupByLibrary { "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人詳細地址"), "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("請輸入收貨人姓名"), "shoujihao" : MessageLookupByLibrary.simpleMessage("手機號"), + "shouqi" : MessageLookupByLibrary.simpleMessage("收起"), "shouye" : MessageLookupByLibrary.simpleMessage("首頁"), "shuaxin" : MessageLookupByLibrary.simpleMessage("刷新"), "shuaxinchenggong" : MessageLookupByLibrary.simpleMessage("刷新成功"), @@ -528,8 +566,11 @@ class MessageLookup extends MessageLookupByLibrary { "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"), "sui" : m31, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"), + "tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠專區"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), + "tiantiandefuli" : MessageLookupByLibrary.simpleMessage("天天得福利"), + "tiantianlingjifen" : MessageLookupByLibrary.simpleMessage("天天領積分"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停車位"), @@ -548,6 +589,7 @@ class MessageLookup extends MessageLookupByLibrary { "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), "wancheng_" : m32, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"), + "wanjiankang" : MessageLookupByLibrary.simpleMessage("玩健康"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日資訊後自動生成 "), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日資訊得專屬優惠劵 "), "weidenglu" : MessageLookupByLibrary.simpleMessage("未登錄"), @@ -588,6 +630,7 @@ class MessageLookup extends MessageLookupByLibrary { "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流狀態:"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下單時間"), "xiadanshijian_" : m33, + "xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("下單賺積分"), "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangce" : MessageLookupByLibrary.simpleMessage("相冊"), "xiangji" : MessageLookupByLibrary.simpleMessage("相機"), @@ -603,6 +646,7 @@ class MessageLookup extends MessageLookupByLibrary { "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"), "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"), "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加載完成"), + "xiedongtai" : MessageLookupByLibrary.simpleMessage("寫動態"), "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"), "xihuan_" : m34, "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"), @@ -613,15 +657,23 @@ class MessageLookup extends MessageLookupByLibrary { "xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用戶名"), "xuanguige" : MessageLookupByLibrary.simpleMessage("選規格"), "xuanji" : MessageLookupByLibrary.simpleMessage("選集"), + "xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("續費會員"), + "xuexijiankang" : MessageLookupByLibrary.simpleMessage("學習健康"), + "xufeihuixiangVIP" : MessageLookupByLibrary.simpleMessage("續費回鄉VIP"), "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("驗證碼"), + "yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀請好友"), + "yaoqinghaoyoudefen" : MessageLookupByLibrary.simpleMessage("邀請好友得分"), "yaoqingrenshoujihao_" : m35, + "yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀請完成"), "yibangfuka" : MessageLookupByLibrary.simpleMessage("已綁副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"), "yiduihuanjian" : m36, "yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"), + "yiguanzhu" : MessageLookupByLibrary.simpleMessage("已關注"), "yihuide" : MessageLookupByLibrary.simpleMessage("已獲得"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"), + "yikaitongzidongxufei" : MessageLookupByLibrary.simpleMessage("已開通自動續費"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已領取"), "yindao1" : MessageLookupByLibrary.simpleMessage("新增多項功能,海量優惠資訊實時推送"), @@ -651,6 +703,7 @@ class MessageLookup extends MessageLookupByLibrary { "yituikuan" : MessageLookupByLibrary.simpleMessage("已退款"), "yiwancheng" : MessageLookupByLibrary.simpleMessage(" 已完成 "), "yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("已完成订单"), + "yixianghuiyuanquanyi" : MessageLookupByLibrary.simpleMessage("已享會員權益"), "yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("-已顯示全部評論-"), "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心迴響"), "yiyoujifen" : MessageLookupByLibrary.simpleMessage("已有積分"), @@ -680,6 +733,7 @@ class MessageLookup extends MessageLookupByLibrary { "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暫不支持線上點餐"), "zanweijiesuo" : MessageLookupByLibrary.simpleMessage("暫未解鎖"), "zanweikaifang" : MessageLookupByLibrary.simpleMessage("暂未开放"), + "zanweikaitong" : MessageLookupByLibrary.simpleMessage("暫未開通"), "zanwupinglun" : MessageLookupByLibrary.simpleMessage("暫無評論,快去評論吧~"), "zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暫無綫上門店"), "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暫無優惠券可領取"), @@ -689,12 +743,14 @@ class MessageLookup extends MessageLookupByLibrary { "zhanghaoyuanquan" : MessageLookupByLibrary.simpleMessage("賬號與安全"), "zhanghaozhuxiaoshuoming" : MessageLookupByLibrary.simpleMessage("賬號注銷説明"), "zhanghuyue" : MessageLookupByLibrary.simpleMessage("賬戶餘額"), + "zhankai" : MessageLookupByLibrary.simpleMessage("展開"), "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫騎手"), "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加載"), "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"), "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加載中..."), "zhidianmendian" : MessageLookupByLibrary.simpleMessage("致電門店"), "zhifubao" : MessageLookupByLibrary.simpleMessage("支付寶"), + "zhifubaozhifu" : MessageLookupByLibrary.simpleMessage("支付寶支付"), "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"), "zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"), "zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊會員"), @@ -702,12 +758,15 @@ class MessageLookup extends MessageLookupByLibrary { "zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"), "zhongwenjianti" : MessageLookupByLibrary.simpleMessage("中文簡體"), "zhuanlan" : MessageLookupByLibrary.simpleMessage("專欄"), + "zhuanxiangyouhuiquan" : MessageLookupByLibrary.simpleMessage("專享優惠券"), "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:註銷帳號後不可恢復,相關資料和資訊會永久删除。"), "ziqu" : MessageLookupByLibrary.simpleMessage("自取"), "ziti" : MessageLookupByLibrary.simpleMessage("自提"), "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"), "zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型:自提兑换券"), "zitishijian" : MessageLookupByLibrary.simpleMessage("自提時間"), + "zongzichan" : MessageLookupByLibrary.simpleMessage("總資產"), + "zongzichanyuan" : MessageLookupByLibrary.simpleMessage("總資產(元)"), "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"), "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"), diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index 005db40f..f26d9de7 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/lib/generated/intl/messages_zh_TW.dart @@ -55,7 +55,7 @@ class MessageLookup extends MessageLookupByLibrary { static m17(shijian) => "領取時間 ${shijian}"; - static m18(yue) => "綠幣餘額 ${yue}"; + static m18(yue) => "綠幣 ${yue}"; static m19(man, jian) => "滿${man}元立減${jian}元代金券"; @@ -67,8 +67,6 @@ class MessageLookup extends MessageLookupByLibrary { static m23(pinglun) => "評論(${pinglun})"; - static m24(zongyue, huodongyue, lvbiyue) => "平台總餘額:${zongyue}(活動餘額${huodongyue} 綠幣餘額${lvbiyue}) "; - static m25(zhe) => "全場${zhe}折"; static m26(num) => "取單號${num}"; @@ -122,6 +120,7 @@ class MessageLookup extends MessageLookupByLibrary { "beiyaoqingdejiangli" : MessageLookupByLibrary.simpleMessage("每一位被邀請的用戶,在輸入邀請碼之後可獲得前進麥味10元代金券一張"), "beizhu" : MessageLookupByLibrary.simpleMessage("備注"), "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("備注信息"), + "benzhouquanbao" : MessageLookupByLibrary.simpleMessage("本周券包"), "bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"), "bianjigerenziliao" : MessageLookupByLibrary.simpleMessage("編輯個人資料"), "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("標為已讀"), @@ -149,8 +148,10 @@ class MessageLookup extends MessageLookupByLibrary { "chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"), "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市選擇"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成為專屬會員,享專屬權益"), + "chijiankang" : MessageLookupByLibrary.simpleMessage("吃健康"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), "chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"), + "chongzhifuliduo" : MessageLookupByLibrary.simpleMessage("充值福利多"), "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"), "chongzhizuixiaojine" : m1, "chuangjianshijian" : m2, @@ -166,6 +167,7 @@ class MessageLookup extends MessageLookupByLibrary { "daiqueren" : MessageLookupByLibrary.simpleMessage("待確認"), "daizhifu" : MessageLookupByLibrary.simpleMessage("待支付"), "daizhizuo" : MessageLookupByLibrary.simpleMessage("待製作"), + "dajiadouzaiduihuan" : MessageLookupByLibrary.simpleMessage("大家都在兌換"), "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打開定位"), "dangqianbanben" : MessageLookupByLibrary.simpleMessage("當前版本"), "dangqiandengji" : MessageLookupByLibrary.simpleMessage("當前等級"), @@ -182,6 +184,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("點單"), "dianhua" : MessageLookupByLibrary.simpleMessage("電話"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄,享受更多精彩信息"), + "dianputuijian" : MessageLookupByLibrary.simpleMessage("店鋪推薦"), "dianpuyue" : MessageLookupByLibrary.simpleMessage("店鋪餘額"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"), "dianzanxihuan_" : m3, @@ -202,6 +205,8 @@ class MessageLookup extends MessageLookupByLibrary { "dingwei" : MessageLookupByLibrary.simpleMessage("定位"), "dizhi" : MessageLookupByLibrary.simpleMessage("地址"), "dongtai" : MessageLookupByLibrary.simpleMessage("動態"), + "dongtaitishi" : MessageLookupByLibrary.simpleMessage("用戶發佈內容需要等待系統稽核,稽核通過後才會在推薦廣場展示"), + "dongtaixiangqing" : MessageLookupByLibrary.simpleMessage("動態詳情"), "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"), "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"), "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"), @@ -213,6 +218,7 @@ class MessageLookup extends MessageLookupByLibrary { "duihuanquan" : MessageLookupByLibrary.simpleMessage("兌換券"), "duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("兑换商品详情"), "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"), + "duozhongyouhui" : MessageLookupByLibrary.simpleMessage("多種優惠券等你拿"), "fabu" : MessageLookupByLibrary.simpleMessage("發佈"), "fangshier" : MessageLookupByLibrary.simpleMessage("方式二"), "fangshiyi" : MessageLookupByLibrary.simpleMessage("方式一"), @@ -232,16 +238,21 @@ class MessageLookup extends MessageLookupByLibrary { "fensi" : MessageLookupByLibrary.simpleMessage("粉絲"), "fenxiang" : MessageLookupByLibrary.simpleMessage("分享"), "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), + "fenxiangjiankang" : MessageLookupByLibrary.simpleMessage("分享健康"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接點擊右上方的分享給到你想要邀請的人。"), "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("將邀請碼分享給好友,對方在一心回鄉App登入頁輸入邀請碼,即可邀請成功。"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手機號"), + "fuliduihuan" : MessageLookupByLibrary.simpleMessage("福利兌換"), + "fulizhongxin" : MessageLookupByLibrary.simpleMessage("福利中心"), "ge" : m5, "geiwopingfen" : MessageLookupByLibrary.simpleMessage("給我評分"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"), + "gengduohaoquan" : MessageLookupByLibrary.simpleMessage("更多好券"), "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多優惠券"), "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更換背景"), "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更換頭像"), + "gengyouhui" : MessageLookupByLibrary.simpleMessage("更優惠"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("個人信息"), "gexingqianming" : MessageLookupByLibrary.simpleMessage("個性簽名"), "gong" : MessageLookupByLibrary.simpleMessage("共"), @@ -254,6 +265,8 @@ class MessageLookup extends MessageLookupByLibrary { "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("請勾選同意隱私服務和一心回鄉服務協定"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), "guanyu" : MessageLookupByLibrary.simpleMessage("關於"), + "guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("關於創始人"), + "guanyuhuixiang" : MessageLookupByLibrary.simpleMessage("關於回鄉"), "guanzhu" : MessageLookupByLibrary.simpleMessage("關注"), "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("過健康有機生活"), "haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("還沒有消息~"), @@ -262,14 +275,18 @@ class MessageLookup extends MessageLookupByLibrary { "haowu" : MessageLookupByLibrary.simpleMessage("好物"), "haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友獎勵規則"), "heji" : MessageLookupByLibrary.simpleMessage("合計:"), + "hejiankang" : MessageLookupByLibrary.simpleMessage("喝健康"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"), "huangjin" : MessageLookupByLibrary.simpleMessage("黄金"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黃金會員"), "huifu" : MessageLookupByLibrary.simpleMessage("回復"), "huifu_" : m9, + "huixiangVIPka" : MessageLookupByLibrary.simpleMessage("回鄉VIP卡"), + "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回鄉錢包"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"), "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回鄉頭條"), + "huixiangvipkazhuanxiang" : MessageLookupByLibrary.simpleMessage("回鄉VIP卡專享權益"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("會員等級説明"), "huiyuanguize" : MessageLookupByLibrary.simpleMessage("會員規則説明"), @@ -279,15 +296,18 @@ class MessageLookup extends MessageLookupByLibrary { "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"), "huiyuanka" : MessageLookupByLibrary.simpleMessage("會員卡"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("會員卡詳情"), + "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("會員權益"), "huiyuanyue" : MessageLookupByLibrary.simpleMessage("會員餘額"), "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("會員中心"), + "huiyuanzhuanxiangjiage" : MessageLookupByLibrary.simpleMessage("會員專享價格"), "huode" : MessageLookupByLibrary.simpleMessage("獲得"), "huodequanyi" : MessageLookupByLibrary.simpleMessage("獲得權益"), "huodong" : MessageLookupByLibrary.simpleMessage("活動"), "huodongjianmianpeisongfei" : m10, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活動進行中"), "huodongliebiao" : MessageLookupByLibrary.simpleMessage("活動列表"), - "huodongyue" : m11, + "huodongyue" : MessageLookupByLibrary.simpleMessage("活動餘額"), + "huodongyue_" : m11, "huodongzixun" : MessageLookupByLibrary.simpleMessage("活動資訊"), "huopinyisongda" : MessageLookupByLibrary.simpleMessage("貨品已送達"), "input_code" : MessageLookupByLibrary.simpleMessage("手機驗證碼"), @@ -311,10 +331,13 @@ class MessageLookup extends MessageLookupByLibrary { "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"), - "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("淨弼積分商城"), + "jifenhuanquan" : MessageLookupByLibrary.simpleMessage("積分換券"), + "jifenmingxi" : MessageLookupByLibrary.simpleMessage("積分明細"), + "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("積分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"), "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精選好文"), + "jingxuanhuodong" : MessageLookupByLibrary.simpleMessage("精選活動"), "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日會員任務"), "jinrushangdian" : MessageLookupByLibrary.simpleMessage("進入商店"), @@ -334,6 +357,7 @@ class MessageLookup extends MessageLookupByLibrary { "kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"), + "kaitonghuixianghuoququanyi" : MessageLookupByLibrary.simpleMessage("開通回鄉VIP卡獲取更多權益"), "kaitongriqi" : m16, "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可領取的卡券"), @@ -345,14 +369,20 @@ class MessageLookup extends MessageLookupByLibrary { "kongtiao" : MessageLookupByLibrary.simpleMessage("空調"), "kuaidi" : MessageLookupByLibrary.simpleMessage("快遞"), "kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快遞物流"), + "lianxikefu" : MessageLookupByLibrary.simpleMessage("聯系客服"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("聯繫手機號"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("連續簽到領取雙倍積分"), + "liaojie" : MessageLookupByLibrary.simpleMessage("瞭解"), + "liaojiejiankang" : MessageLookupByLibrary.simpleMessage("瞭解健康"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即參加"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即開通"), "lijilingqu" : MessageLookupByLibrary.simpleMessage("立即領取"), "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即簽到"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即體驗"), + "likekaitong" : MessageLookupByLibrary.simpleMessage("立刻開通"), + "likexufei" : MessageLookupByLibrary.simpleMessage("立刻續費"), + "likezhifu" : MessageLookupByLibrary.simpleMessage("立刻支付"), "lingqu" : MessageLookupByLibrary.simpleMessage("領取"), "lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("領券中心"), "lingquchenggong" : MessageLookupByLibrary.simpleMessage("領取成功"), @@ -364,22 +394,27 @@ class MessageLookup extends MessageLookupByLibrary { "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的評論吧"), "login" : MessageLookupByLibrary.simpleMessage("登錄"), "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"), - "lvbiyue" : m18, + "lvbiyue" : MessageLookupByLibrary.simpleMessage("綠幣餘額"), + "lvbiyue_" : m18, "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), + "main_menu5" : MessageLookupByLibrary.simpleMessage("回鄉VIP"), "manlijiandaijinquan" : m19, "manyuankeyong" : m20, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日簽到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("沒有更多會員卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("沒有更多數據了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), + "meizhousangengxin" : MessageLookupByLibrary.simpleMessage("每週三更新"), + "meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("每週三更新劵包"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), "menpaihao" : MessageLookupByLibrary.simpleMessage("請輸入門牌號"), "mi" : m21, "mingxi" : MessageLookupByLibrary.simpleMessage("明細"), "morenpaixu" : MessageLookupByLibrary.simpleMessage("默認排序"), + "muqianwujilu" : MessageLookupByLibrary.simpleMessage("目前暫無記錄哦"), "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暫無星店活動"), "nihaimeiyouchongzhihuoxiaofeijilu" : MessageLookupByLibrary.simpleMessage("你在這兒還沒有消費或充值紀錄喔~"), "nincunchuquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启存储权限,请点击开启"), @@ -403,7 +438,6 @@ class MessageLookup extends MessageLookupByLibrary { "pinglun_" : m23, "pingtaiyue" : MessageLookupByLibrary.simpleMessage("平臺餘額"), "pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("平臺支付密碼"), - "pingtaizongyue" : m24, "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"), "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介紹"), "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登錄既同意"), @@ -439,6 +473,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingzhuo" : MessageLookupByLibrary.simpleMessage("清桌"), "qishoupeisongzhongyujisongdashijian" : MessageLookupByLibrary.simpleMessage("騎手配送中,預計送達時間"), "qishouyijiedanquhuozhong" : MessageLookupByLibrary.simpleMessage("騎手已接單、取貨中"), + "qita" : MessageLookupByLibrary.simpleMessage("其他"), "quanbao" : MessageLookupByLibrary.simpleMessage("券包"), "quanbu" : MessageLookupByLibrary.simpleMessage("全部"), "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部訂單"), @@ -487,10 +522,12 @@ class MessageLookup extends MessageLookupByLibrary { "ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.點擊淨弼,進入首頁,點擊上方的去簽到。\n2.點擊我的,進入我的頁面,點擊上方的積分詳情,進入後即可簽到。"), "ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款,請您提前準備好訂單號/取單號,並與門店人員進行聯繫"), "saoma" : MessageLookupByLibrary.simpleMessage("掃碼"), + "saomadiancan" : MessageLookupByLibrary.simpleMessage("您即將進行掃碼點餐"), "saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("掃碼識別,關注公眾號"), "send_code" : MessageLookupByLibrary.simpleMessage("發送驗證碼"), "shanchu" : MessageLookupByLibrary.simpleMessage("刪除"), "shanchudingdan" : MessageLookupByLibrary.simpleMessage("刪除訂單"), + "shanghuruzhu" : MessageLookupByLibrary.simpleMessage("商戶入駐"), "shangjiaquan" : MessageLookupByLibrary.simpleMessage("商家券"), "shangjiaqueren" : MessageLookupByLibrary.simpleMessage("商家確認"), "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已發貨"), @@ -521,6 +558,7 @@ class MessageLookup extends MessageLookupByLibrary { "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人詳細地址"), "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("請輸入收貨人姓名"), "shoujihao" : MessageLookupByLibrary.simpleMessage("手機號"), + "shouqi" : MessageLookupByLibrary.simpleMessage("收起"), "shouye" : MessageLookupByLibrary.simpleMessage("首頁"), "shuaxin" : MessageLookupByLibrary.simpleMessage("刷新"), "shuaxinchenggong" : MessageLookupByLibrary.simpleMessage("刷新成功"), @@ -531,8 +569,11 @@ class MessageLookup extends MessageLookupByLibrary { "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"), "sui" : m31, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"), + "tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠專區"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), + "tiantiandefuli" : MessageLookupByLibrary.simpleMessage("天天得福利"), + "tiantianlingjifen" : MessageLookupByLibrary.simpleMessage("天天領積分"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停車位"), @@ -551,6 +592,7 @@ class MessageLookup extends MessageLookupByLibrary { "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), "wancheng_" : m32, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"), + "wanjiankang" : MessageLookupByLibrary.simpleMessage("玩健康"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日資訊後自動生成 "), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日資訊得專屬優惠劵 "), "weidenglu" : MessageLookupByLibrary.simpleMessage("未登錄"), @@ -591,6 +633,7 @@ class MessageLookup extends MessageLookupByLibrary { "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流狀態:"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下單時間"), "xiadanshijian_" : m33, + "xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("下單賺積分"), "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangce" : MessageLookupByLibrary.simpleMessage("相冊"), "xiangji" : MessageLookupByLibrary.simpleMessage("相機"), @@ -606,6 +649,7 @@ class MessageLookup extends MessageLookupByLibrary { "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"), "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"), "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加載完成"), + "xiedongtai" : MessageLookupByLibrary.simpleMessage("寫動態"), "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"), "xihuan_" : m34, "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"), @@ -616,15 +660,23 @@ class MessageLookup extends MessageLookupByLibrary { "xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用戶名"), "xuanguige" : MessageLookupByLibrary.simpleMessage("選規格"), "xuanji" : MessageLookupByLibrary.simpleMessage("選集"), + "xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("續費會員"), + "xuexijiankang" : MessageLookupByLibrary.simpleMessage("學習健康"), + "xufeihuixiangVIP" : MessageLookupByLibrary.simpleMessage("續費回鄉VIP"), "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("驗證碼"), + "yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀請好友"), + "yaoqinghaoyoudefen" : MessageLookupByLibrary.simpleMessage("邀請好友得分"), "yaoqingrenshoujihao_" : m35, + "yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀請完成"), "yibangfuka" : MessageLookupByLibrary.simpleMessage("已綁副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"), "yiduihuanjian" : m36, "yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"), + "yiguanzhu" : MessageLookupByLibrary.simpleMessage("已關注"), "yihuide" : MessageLookupByLibrary.simpleMessage("已獲得"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"), + "yikaitongzidongxufei" : MessageLookupByLibrary.simpleMessage("已開通自動續費"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已領取"), "yindao1" : MessageLookupByLibrary.simpleMessage("新增多項功能,海量優惠資訊實時推送"), @@ -654,6 +706,7 @@ class MessageLookup extends MessageLookupByLibrary { "yituikuan" : MessageLookupByLibrary.simpleMessage("已退款"), "yiwancheng" : MessageLookupByLibrary.simpleMessage(" 已完成 "), "yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("已完成订单"), + "yixianghuiyuanquanyi" : MessageLookupByLibrary.simpleMessage("已享會員權益"), "yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("-已顯示全部評論-"), "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心迴響"), "yiyoujifen" : MessageLookupByLibrary.simpleMessage("已有積分"), @@ -683,6 +736,7 @@ class MessageLookup extends MessageLookupByLibrary { "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暫不支持線上點餐"), "zanweijiesuo" : MessageLookupByLibrary.simpleMessage("暫未解鎖"), "zanweikaifang" : MessageLookupByLibrary.simpleMessage("暫未開放"), + "zanweikaitong" : MessageLookupByLibrary.simpleMessage("暫未開通"), "zanwupinglun" : MessageLookupByLibrary.simpleMessage("暫無評論,快去評論吧~"), "zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暫無綫上門店"), "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暫無優惠券可領取"), @@ -692,12 +746,14 @@ class MessageLookup extends MessageLookupByLibrary { "zhanghaoyuanquan" : MessageLookupByLibrary.simpleMessage("賬號與安全"), "zhanghaozhuxiaoshuoming" : MessageLookupByLibrary.simpleMessage("賬號注銷説明"), "zhanghuyue" : MessageLookupByLibrary.simpleMessage("賬戶餘額"), + "zhankai" : MessageLookupByLibrary.simpleMessage("展開"), "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫騎手"), "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加載"), "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"), "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加載中..."), "zhidianmendian" : MessageLookupByLibrary.simpleMessage("致電門店"), "zhifubao" : MessageLookupByLibrary.simpleMessage("支付寶"), + "zhifubaozhifu" : MessageLookupByLibrary.simpleMessage("支付寶支付"), "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"), "zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"), "zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊會員"), @@ -705,12 +761,15 @@ class MessageLookup extends MessageLookupByLibrary { "zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"), "zhongwenjianti" : MessageLookupByLibrary.simpleMessage("中文簡體"), "zhuanlan" : MessageLookupByLibrary.simpleMessage("專欄"), + "zhuanxiangyouhuiquan" : MessageLookupByLibrary.simpleMessage("專享優惠券"), "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:註銷帳號後不可恢復,相關資料和資訊會永久删除。"), "ziqu" : MessageLookupByLibrary.simpleMessage("自取"), "ziti" : MessageLookupByLibrary.simpleMessage("自提"), "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"), "zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型:自提兑换券"), "zitishijian" : MessageLookupByLibrary.simpleMessage("自提時間"), + "zongzichan" : MessageLookupByLibrary.simpleMessage("總資產"), + "zongzichanyuan" : MessageLookupByLibrary.simpleMessage("總資產(元)"), "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"), "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"), diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index 91b9c8e8..53194512 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -635,9 +635,6 @@ "xiaofeijilu": "消費記錄", "muqianwujilu": "目前暫無記錄哦", "yue__": "餘額 {yue}", - "lvbiyue": "綠幣餘額 {yue}", - "huodongyue": "活動餘額 {yue}", - "pingtaizongyue": "餘額:{zongyue}", "dongtaixiangqing":"動態詳情", "yiguanzhu":"已關注", "guanzhu":"關注", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 30950b9f..75eefc47 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -637,9 +637,6 @@ "xiaofeijilu": "消費記錄", "muqianwujilu": "目前暫無記錄哦", "yue__": "餘額 {yue}", - "lvbiyue": "綠幣餘額 {yue}", - "huodongyue": "活動餘額 {yue}", - "pingtaizongyue": "餘額:{zongyue}", "dongtaixiangqing":"動態詳情", "yiguanzhu":"已關注", "guanzhu":"關注", diff --git a/lib/main.dart b/lib/main.dart index ec654dcb..bec258fa 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: 'en', countryCode: 'US'); + locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'CH'); } return appLocale ?? locale; }, diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index e42ad44b..821a3621 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -570,7 +570,7 @@ class _MineWalletPage extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - S.of(context).huodongyue, + "活动余额", style: TextStyle( fontSize: 14.sp, fontWeight: MyFontWeight.semi_bold, @@ -601,7 +601,7 @@ class _MineWalletPage extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - S.of(context).lvbiyue, + "绿币余额", style: TextStyle( fontSize: 14.sp, fontWeight: MyFontWeight.semi_bold, diff --git a/lib/order/order_view/order_pay_selected.dart b/lib/order/order_view/order_pay_selected.dart index 2da5ef31..676da177 100644 --- a/lib/order/order_view/order_pay_selected.dart +++ b/lib/order/order_view/order_pay_selected.dart @@ -133,7 +133,7 @@ class _OrderPaySelected extends State { Expanded(child: Padding( padding: EdgeInsets.only(left: 8.w), child:Text( - S.of(context).lvbiyue, + "绿币余额", style: TextStyle( fontSize: 14.sp, color: Color(0xff353535), diff --git a/lib/settlement/settlement_view/pay_method.dart b/lib/settlement/settlement_view/pay_method.dart index 25035b2c..8877481a 100644 --- a/lib/settlement/settlement_view/pay_method.dart +++ b/lib/settlement/settlement_view/pay_method.dart @@ -206,7 +206,7 @@ class _PayMethod extends State { width: 10, ), Text( - S.of(context).lvbiyue, + "绿币余额", style: TextStyle( fontSize: 14.sp, color: Color(0xff353535), diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart index 7e67ca65..db7e523a 100644 --- a/lib/store/store_order.dart +++ b/lib/store/store_order.dart @@ -215,68 +215,58 @@ class _StoreOrderPage extends State @override Widget build(BuildContext context) { - 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, - ), - ), + 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, ), - flexibleSpace: FlexibleSpaceBar( - title: Title(controller, - storeInfo != null ? storeInfo.storeName : '', + ), + ), + flexibleSpace: FlexibleSpaceBar( + title: Title(controller, + storeInfo != null ? storeInfo.storeName : '', (alpha) { setState(() { if (alpha == 1) @@ -286,178 +276,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, - ), - 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), - ], + 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: 233.h, - bottom: 0, - left: 0, - right: 0, - ), - ], + ], + ), + top: 0, + 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, // 点击时的背景高亮颜色设置为透明 + Positioned( + child: Container( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: + BorderRadius.circular(8.w), ), - 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: ""), + 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), ], - )), - ), + ), + ), + top: 233.h, + bottom: 0, + left: 0, + right: 0, + ), + ], ), ), ), - ]; - }, - body: + 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: - ///点餐 - 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, @@ -469,110 +459,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), + ), + 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, ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - width: 45.w, - ), - 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), - ), - ]), + Text.rich( + TextSpan(children: [ + TextSpan( + text: "¥ ", + style: TextStyle( + fontSize: 12.sp, + color: Color(0xFFFFFFFF), + fontWeight: MyFontWeight.bold), ), - 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), - ), + TextSpan( + text: shopCarGoods != null + ? shopCarGoods.cartSum + : "0.0", + style: TextStyle( + fontSize: 20.sp, + fontFamily: 'JDZhengHT', + color: Color(0xFFFFFFFF), + fontWeight: MyFontWeight.medium), ), - ], + ]), ), - ), - 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/vip/vip_view/exclusive_coupon.dart b/lib/vip/vip_view/exclusive_coupon.dart index ed216d8a..d7db39f4 100644 --- a/lib/vip/vip_view/exclusive_coupon.dart +++ b/lib/vip/vip_view/exclusive_coupon.dart @@ -110,7 +110,7 @@ class _ExclusiveCoupon extends State { TextSpan( text: "6", style: TextStyle( - fontWeight: MyFontWeight.w800, + fontWeight: MyFontWeight.extra_bold, fontSize: 36.sp, fontFamily: 'JDZhengHT', color: Color(0xffFF7E12), @@ -179,7 +179,7 @@ class _ExclusiveCoupon extends State { TextSpan( text: "7", style: TextStyle( - fontWeight: MyFontWeight.w800, + fontWeight: MyFontWeight.extra_bold, fontSize: 36.sp, fontFamily: 'JDZhengHT', color: Color(0xffFF7E12), @@ -248,7 +248,7 @@ class _ExclusiveCoupon extends State { TextSpan( text: "8", style: TextStyle( - fontWeight: MyFontWeight.w800, + fontWeight: MyFontWeight.extra_bold, fontSize: 36.sp, fontFamily: 'JDZhengHT', color: Color(0xffFF7E12),