From 3cf490b0f01fdc29639d69c1096509a05e8429b1 Mon Sep 17 00:00:00 2001 From: Loki <654612@qq.com> Date: Thu, 11 Aug 2022 18:48:28 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=9C=A8flutter3.0=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E9=A1=B9=E7=9B=AE=E3=80=82=20discount=5Fzone?= =?UTF-8?q?.dart=20discountItem=E9=AB=98=E5=BA=A6=E8=B6=85=E4=BA=86=20?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=BF=98webp=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/image/2x/rechargeBtn.webp | Bin 0 -> 1240 bytes assets/image/3x/rechargeBtn.webp | Bin 0 -> 1856 bytes assets/image/rechargeBtn.webp | Bin 0 -> 828 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 assets/image/2x/rechargeBtn.webp create mode 100644 assets/image/3x/rechargeBtn.webp create mode 100644 assets/image/rechargeBtn.webp diff --git a/assets/image/2x/rechargeBtn.webp b/assets/image/2x/rechargeBtn.webp new file mode 100644 index 0000000000000000000000000000000000000000..bc34ec28785a7c34d135d46bc4a0c4a8558e3c4d GIT binary patch literal 1240 zcmWIYbaT7F!oU#j>J$(bU=hK^z`$St#A_KCq8S)Got*7*2N-ENQg5fwKy55=mQX!6ag(~U|>uE zvPIG%>GB4}|FqISi=`3JjhMc?`)6dO(&DFp(HCm;qCa&qQGQ&|iB%OyGZ_LhkGz=6m0o z8~*>ienakUvyf%g*BLd0|TSPixnp_el)Z)?r7NcOj1OK;Q(U^i_`-p z$PU%YVroxl1%|B_Dgp?=eZm6OJxD zx%KYl-P6a<%R{}0llmWTwy*NvEk=fd<2TOvzO<}LdG|=V;N+=V@tjQs)(o?K=0BC+ z;=gU*0rlYUn_+H|Rm_WX{y&=XSI*CpY5AOlsmXr=_p`FCv<*0~So;6_n-zR3C(fB^ zu<4Yj+)Awg=E)%;mwj$;J|(HA8Lc6^{!Y^5Neit$oU#p@`M&BY)9Rku>QwgicPdhC zHhnMpP_x0%TFrCP5)-{QXLls;eXZ&llyvTJ+56X*3@UnW+4`85cP2^BT@m|jCQtj< z72caaDsB`n$$wqC?*Hn3zvqv$R7IB??pzo5^~l!+pM>|$^Ee!PV%`3bxAR{4J=659 z<~&*abYSWBcCv$Fpf2quBxP6V+61T=1 zh26I~x3AuDcVgtqDQ=IBZ&`E8t7h}95G`NRWma3SIR$@BXN}mpL9UoPJK|dQm9UF*athx5{=UtP2FsZRE}Jhw+DX1={SWAPhv@0)pSJMO;u zCAg(%;k)|ykk*K`J9g@5<*f-bo@#RN;+CK_IY%Sb9@3tp<%Zmqgf Wn)>cU=+`+KYMb^|CoNhe!vFxdkc2z{ literal 0 HcmV?d00001 diff --git a/assets/image/3x/rechargeBtn.webp b/assets/image/3x/rechargeBtn.webp new file mode 100644 index 0000000000000000000000000000000000000000..32568b7ceaca756ae5073488f80f61e4c4616e71 GIT binary patch literal 1856 zcmb`Fdpy%?7{K3+T)G^zTq?Qc5G|BKjT9#ua?LHJmdli3wn=FfqLS(?ncQZMibNr| zNt8=+SC;FT6qeRdL^gDOJAL}-^EsW*Ie(nz_j{h_`#$gU{+{=Jey=0i!oo-#0M|Wc z_Ad5DZc70GdXS33KnwtAb8~wII5Y%s1)&v%rUC*<1V>9V6*u<-D#F-z!FUnz-}xsV z2EcSDfGhyaO+T6cw~(Z_577%snt+rZ~W zKk(5XIFy7ZK{@rpd@npf$bAqS2jD`4wS*$v@p7L)XD7(JL8=Idz!6viGl>6JS?p&} z1^`B%0T7`q#*QWdP#O(@LhoWsJskk4C;&>@@E8K-ug!=;7Vhf{z^5z#R=5Lzcmcpt zkMA2@T)X%${^6`D&>BVPoI%io1vuaXQ~(+T0xzHg(H7{EYz79mtbK_FlX zpxaJnHGG-9^w?5muucyTPtsxJf~Asov%VT4RA*kvh8LmZ_OadzaIBJ3A91Yd(_Pcq z%1?r)*_;Om|B*^NnfcJ#lB?@Sd;3mI*=YE%9qRLPU-sDA0hD+a$n_m-G%@@N3-3qnz|ZrfyIZRf<9udpo3`)q zo*dh=Nn$vxGfPn9Z9LgFXG^cH+blAZPHSuTpq$!@ydKEtml`3?anv>1yI(kmGRvAd z6FJ^@XPdWoxz>;q*osRg-32EV1wDK%nSDGg%QBxnZA#hftr z>G_F-o(~_38sZz@86tX`VX4;Mq!g{}LgldGr2WFJ!Cs$*hBj%|h-4lp% zt@hD@v?+i>&?*O46$P0*7fDUpLJNC2WSHsHH8Nm;LxnsU{|Gd*u4?M0kgG&e6HC%k zP5MyAPpi&OHYAYGG>YVsW5v7mhv0#4U?b01F63Mecb zhvQx;_FW<#`u`igaNguk`=HiX9xFXO5H&Dp2wyIjTAHM*UE z8`ZJf!+317Z>Ic<1DSKO)VAgM<*t`LuidN>5BWi)i-$H=L>d(D98XPrM`k}d7QD+~ zk87de1Ukm4yHdQr_)$}#V33VB;}*PY%(`f0oN)lS*Rq1)XP@4*m9;lv zzx3HuTH{pJ1gm+8PDUl$Dx%{nb;Z`qZhbiQLA%dKpxw|-J6$ueN{YavcL~PiG6|wIlKpBS#%9JFi}o5zH=3bHxyExzxYh!TnQiq*PRvtn zN;1EY>4$5sKQYWhx^q5k5Ad&%>*7vIlGjlhXHV%+3+K@lZ3`uNRK}wSpO`nL^X5A% z%4cI1>|XuK4>i9jrTAj@VrXZ`0;W!`g5!cQ)bpjSgG;`>RXAKrwG6_IuCc1Ot;QJ> L1|P`MqF{dlhqZB}5Fp!vBTmWNZp&1z%zFlJgk_-%&fhLm-I8#!KlYzQE0C7nX&~gR_#uOl1 zBpt%80I`!G>>d!iC?v=ksAd6>t&xtzPC{armlTu$)tmsSPcA3|vF`xcHn};aAiF>S z*>X8BZ zGam@k8FCm>859^i8S)sC8T5cGBVZyiWH1A!7$2ZR8T7*(xCQzR{(rXrpC#>?b@;vS z7Y9Z&ca{e&+^k6q9~~WRd{p?jSQ-x&s(AKYYQHw&Uv#(F?LW%D&L7BCcDE_J5}2FYbMJmV9++-T&}@r`y^iv8+3<+hv_ycYRiMvrGP)mAsjICvLJ}_ Date: Wed, 24 Aug 2022 13:15:30 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=9B=9E=E9=84=89=E9=8C=A2=E5=8C=85?= =?UTF-8?q?=EF=BC=8CUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/generated/intl/messages_en.dart | 135 ++++--- lib/generated/intl/messages_zh_CN.dart | 135 ++++--- lib/generated/intl/messages_zh_Hans_CN.dart | 135 ++++--- lib/generated/intl/messages_zh_Hant_CN.dart | 129 ++++--- lib/generated/intl/messages_zh_TW.dart | 129 ++++--- lib/generated/l10n.dart | 112 +++++- lib/l10n/intl_en.arb | 11 + lib/l10n/intl_zh_CN.arb | 11 + lib/l10n/intl_zh_Hans_CN.arb | 11 + lib/l10n/intl_zh_Hant_CN.arb | 13 + lib/l10n/intl_zh_TW.arb | 15 +- lib/mine/mine_view/mine_item.dart | 2 +- lib/mine/mine_wallet_page.dart | 345 ++++++++++++------ lib/retrofit/data/user_bill.dart | 253 ++++++++----- lib/retrofit/data/user_info.dart | 3 + lib/retrofit/retrofit_api.dart | 2 +- lib/view_widget/keyboard/keyboard_widget.dart | 26 +- pubspec.lock | 258 ++++++------- pubspec.yaml | 3 - 19 files changed, 1088 insertions(+), 640 deletions(-) diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 844c9ac8..61011c32 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -41,63 +41,71 @@ class MessageLookup extends MessageLookupByLibrary { static m10(yuan) => "活动减免${yuan}元配送费"; - static m11(jifen) => "+ ${jifen} 积分"; + static m11(yue) => "活动余额 ${yue}"; - static m12(jianjie) => "简介:${jianjie}"; + static m12(jifen) => "+ ${jifen} 积分"; - static m13(jifen) => "${jifen}积分"; + static m13(jianjie) => "简介:${jianjie}"; - static m14(jifen) => "${jifen}积分 到下一个等级"; + static m14(jifen) => "${jifen}积分"; - static m15(date) => "开通日期:${date}"; + static m15(jifen) => "${jifen}积分 到下一个等级"; - static m16(shijian) => "领取时间 ${shijian}"; + static m16(date) => "开通日期:${date}"; - static m17(man, jian) => "满${man}元立减${jian}元代金券"; + static m17(shijian) => "领取时间 ${shijian}"; - static m18(yuan) => "满${yuan}可用"; + static m18(yue) => "绿币余额 ${yue}"; - static m19(mi) => "${mi}米"; + static m19(man, jian) => "满${man}元立减${jian}元代金券"; - static m20(tian) => "您已连续签到${tian}天"; + static m20(yuan) => "满${yuan}可用"; - static m21(pinglun) => "评论(${pinglun})"; + static m21(mi) => "${mi}米"; - static m22(zhe) => "全场${zhe}折"; + static m22(tian) => "您已连续签到${tian}天"; - static m23(num) => "取单号${num}"; + static m23(pinglun) => "评论(${pinglun})"; - static m24(ren) => "¥${ren}/人"; + static m24(zongyue, huodongyue, lvbiyue) => "平台总余额：${zongyue}（活动余额${huodongyue} 绿币余额${lvbiyue}） "; - static m25(second) => "${second}s后重新发送"; + static m25(zhe) => "全场${zhe}折"; - static m26(jifen) => "商品积分 ${jifen}积分"; + static m26(num) => "取单号${num}"; - static m27(jifen) => "实付积分 ${jifen}积分"; + static m27(ren) => "¥${ren}/人"; - static m28(sui) => "${sui}岁"; + static m28(second) => "${second}s后重新发送"; - static m29(num) => "完成${num}"; + static m29(jifen) => "商品积分 ${jifen}积分"; - static m30(time) => "下单时间:${time}"; + static m30(jifen) => "实付积分 ${jifen}积分"; - static m31(xihuan) => "喜欢(${xihuan})"; + static m31(sui) => "${sui}岁"; - static m32(shoujihao) => "邀请人手机号:${shoujihao}"; + static m32(num) => "完成${num}"; - static m33(jian) => "已兑换${jian}件"; + static m33(time) => "下单时间:${time}"; - static m34(time) => "营业时间: ${time}"; + static m34(xihuan) => "喜欢(${xihuan})"; - static m35(date) => "有效期:${date}"; + static m35(shoujihao) => "邀请人手机号:${shoujihao}"; - static m36(date) => "有效期至${date}"; + static m36(jian) => "已兑换${jian}件"; - static m37(yuan) => "${yuan}元"; + static m37(time) => "营业时间: ${time}"; - static m38(yue) => "余额${yue}"; + static m38(date) => "有效期:${date}"; - static m39(zuozhe) => "作者:${zuozhe}"; + static m39(date) => "有效期至${date}"; + + static m40(yuan) => "${yuan}元"; + + static m41(yue) => "余额${yue}"; + + static m42(yue) => "余额 ${yue}"; + + static m43(zuozhe) => "作者:${zuozhe}"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -261,6 +269,7 @@ class MessageLookup extends MessageLookupByLibrary { "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"), "huifu" : MessageLookupByLibrary.simpleMessage("回复"), "huifu_" : m9, + "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"), "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), @@ -281,6 +290,8 @@ class MessageLookup extends MessageLookupByLibrary { "huodongjianmianpeisongfei" : m10, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"), "huodongliebiao" : MessageLookupByLibrary.simpleMessage("活动列表"), + "huodongyue" : MessageLookupByLibrary.simpleMessage("活动余额"), + "huodongyue_" : m11, "huodongzixun" : MessageLookupByLibrary.simpleMessage("活动资讯"), "huopinyisongda" : MessageLookupByLibrary.simpleMessage("货品已送达"), "input_code" : MessageLookupByLibrary.simpleMessage("手机验证码"), @@ -289,18 +300,18 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"), "invite_code_error" : MessageLookupByLibrary.simpleMessage("邀请码输入错误"), - "jiajifen" : m11, + "jiajifen" : m12, "jian" : MessageLookupByLibrary.simpleMessage("件"), "jiangli" : MessageLookupByLibrary.simpleMessage("奖励"), "jiangshi" : MessageLookupByLibrary.simpleMessage("讲师"), - "jianjie" : m12, + "jianjie" : m13, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"), "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"), "jiesuanjine" : MessageLookupByLibrary.simpleMessage("结算金额"), "jifen" : MessageLookupByLibrary.simpleMessage("积分"), - "jifen_" : m13, + "jifen_" : m14, "jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的积分不足"), - "jifendaoxiayidengji" : m14, + "jifendaoxiayidengji" : m15, "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"), @@ -327,7 +338,7 @@ class MessageLookup extends MessageLookupByLibrary { "kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"), - "kaitongriqi" : m15, + "kaitongriqi" : m16, "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"), "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"), @@ -351,27 +362,30 @@ class MessageLookup extends MessageLookupByLibrary { "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"), "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("领取到卡包"), "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"), - "lingqushijian" : m16, + "lingqushijian" : m17, "linian" : MessageLookupByLibrary.simpleMessage("理念"), "lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"), "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的评论吧"), "login" : MessageLookupByLibrary.simpleMessage("登录"), "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"), + "lvbiyue" : MessageLookupByLibrary.simpleMessage("绿币余额"), + "lvbiyue_" : m18, "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), - "manlijiandaijinquan" : m17, - "manyuankeyong" : m18, + "manlijiandaijinquan" : m19, + "manyuankeyong" : m20, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"), - "mi" : m19, + "mi" : m21, "mingxi" : MessageLookupByLibrary.simpleMessage("明细"), "morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"), + "muqianwujilu" : MessageLookupByLibrary.simpleMessage("目前暂未记录哦"), "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暂无星店活动"), "nihaimeiyouchongzhihuoxiaofeijilu" : MessageLookupByLibrary.simpleMessage("你在这儿还没有消费或充值记录哦～"), "nincunchuquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启存储权限，请点击开启"), @@ -381,7 +395,7 @@ class MessageLookup extends MessageLookupByLibrary { "ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"), "ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"), "ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功领取优惠劵，请在"), - "ninyilianxuqiandaotian" : m20, + "ninyilianxuqiandaotian" : m22, "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"), "ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"), "paizhao" : MessageLookupByLibrary.simpleMessage("拍照"), @@ -392,9 +406,10 @@ class MessageLookup extends MessageLookupByLibrary { "peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"), "phone_error" : MessageLookupByLibrary.simpleMessage("手机格式错误"), "pinglun" : MessageLookupByLibrary.simpleMessage("评论"), - "pinglun_" : m21, + "pinglun_" : m23, "pingtaiyue" : MessageLookupByLibrary.simpleMessage("平台余额"), "pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("平台支付密码"), + "pingtaizongyue" : m24, "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"), "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"), "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"), @@ -435,7 +450,7 @@ class MessageLookup extends MessageLookupByLibrary { "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"), "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兑换"), "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全场通用"), - "quanchangzhe" : m22, + "quanchangzhe" : m25, "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("权限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"), @@ -443,7 +458,7 @@ class MessageLookup extends MessageLookupByLibrary { "quanyishuoming" : MessageLookupByLibrary.simpleMessage("权益说明"), "quanyixiangqing" : MessageLookupByLibrary.simpleMessage("权益详情"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"), - "qudanhao" : m23, + "qudanhao" : m26, "qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"), "queding" : MessageLookupByLibrary.simpleMessage("确定"), "quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("确定要删除这条动态？"), @@ -466,9 +481,9 @@ class MessageLookup extends MessageLookupByLibrary { "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"), "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("热门文章视频"), "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("热门文章视频列表"), - "ren" : m24, + "ren" : m27, "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"), - "resend_in_seconds" : m25, + "resend_in_seconds" : m28, "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"), "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"), "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"), @@ -487,7 +502,7 @@ class MessageLookup extends MessageLookupByLibrary { "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"), "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"), "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"), - "shangpinjifen" : m26, + "shangpinjifen" : m29, "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"), "shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等级"), "shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娱乐"), @@ -496,7 +511,7 @@ class MessageLookup extends MessageLookupByLibrary { "shezhi" : MessageLookupByLibrary.simpleMessage("设置"), "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"), "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"), - "shifujifen" : m27, + "shifujifen" : m30, "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"), "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"), "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"), @@ -520,7 +535,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."), "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), - "sui" : m28, + "sui" : m31, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), @@ -540,7 +555,7 @@ class MessageLookup extends MessageLookupByLibrary { "waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), - "wancheng_" : m29, + "wancheng_" : m32, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"), @@ -581,7 +596,7 @@ class MessageLookup extends MessageLookupByLibrary { "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"), - "xiadanshijian_" : m30, + "xiadanshijian_" : m33, "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangce" : MessageLookupByLibrary.simpleMessage("相册"), "xiangji" : MessageLookupByLibrary.simpleMessage("相机"), @@ -593,11 +608,12 @@ class MessageLookup extends MessageLookupByLibrary { "xianxiashiyong" : MessageLookupByLibrary.simpleMessage("线下使用"), "xiaofei" : MessageLookupByLibrary.simpleMessage("消费"), "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"), + "xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消费记录"), "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"), "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"), "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"), "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"), - "xihuan_" : m31, + "xihuan_" : m34, "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"), "xingming" : MessageLookupByLibrary.simpleMessage("姓名"), "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"), @@ -608,11 +624,11 @@ class MessageLookup extends MessageLookupByLibrary { "xuanji" : MessageLookupByLibrary.simpleMessage("选集"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"), - "yaoqingrenshoujihao_" : m32, + "yaoqingrenshoujihao_" : m35, "yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀请完成"), "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), - "yiduihuanjian" : m33, + "yiduihuanjian" : m36, "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), "yihuide" : MessageLookupByLibrary.simpleMessage("已获得"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), @@ -626,7 +642,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"), "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), - "yingyeshijian" : m34, + "yingyeshijian" : m37, "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"), "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"), @@ -655,14 +671,15 @@ class MessageLookup extends MessageLookupByLibrary { "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"), "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"), "youkedenglu" : MessageLookupByLibrary.simpleMessage("游客登录"), - "youxiaoqi" : m35, + "youxiaoqi" : m38, "youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"), - "youxiaoqizhi" : m36, + "youxiaoqizhi" : m39, "yuan" : MessageLookupByLibrary.simpleMessage("元"), - "yuan_" : m37, + "yuan_" : m40, "yuanjia" : MessageLookupByLibrary.simpleMessage("原价"), "yue" : MessageLookupByLibrary.simpleMessage("余额"), - "yue_" : m38, + "yue_" : m41, + "yue__" : m42, "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"), "yuliudianhua" : MessageLookupByLibrary.simpleMessage("预留电话"), "yunfei" : MessageLookupByLibrary.simpleMessage("运费"), @@ -702,9 +719,11 @@ class MessageLookup extends MessageLookupByLibrary { "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"), "zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型：自提兑换券"), "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"), + "zongzichan" : MessageLookupByLibrary.simpleMessage("总资产"), + "zongzichanyuan" : MessageLookupByLibrary.simpleMessage("总资产(元)"), "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"), "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"), - "zuozhe" : m39 + "zuozhe" : m43 }; } diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index c76bed19..1d177d14 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -41,63 +41,71 @@ class MessageLookup extends MessageLookupByLibrary { static m10(yuan) => "活动减免${yuan}元配送费"; - static m11(jifen) => "+ ${jifen} 积分"; + static m11(yue) => "活动余额 ${yue}"; - static m12(jianjie) => "简介:${jianjie}"; + static m12(jifen) => "+ ${jifen} 积分"; - static m13(jifen) => "${jifen}积分"; + static m13(jianjie) => "简介:${jianjie}"; - static m14(jifen) => "${jifen}积分 到下一个等级"; + static m14(jifen) => "${jifen}积分"; - static m15(date) => "开通日期:${date}"; + static m15(jifen) => "${jifen}积分 到下一个等级"; - static m16(shijian) => "领取时间 ${shijian}"; + static m16(date) => "开通日期:${date}"; - static m17(man, jian) => "满${man}元立减${jian}元代金券"; + static m17(shijian) => "领取时间 ${shijian}"; - static m18(yuan) => "满${yuan}可用"; + static m18(yue) => "绿币余额 ${yue}"; - static m19(mi) => "${mi}米"; + static m19(man, jian) => "满${man}元立减${jian}元代金券"; - static m20(tian) => "您已连续签到${tian}天"; + static m20(yuan) => "满${yuan}可用"; - static m21(pinglun) => "评论(${pinglun})"; + static m21(mi) => "${mi}米"; - static m22(zhe) => "全场${zhe}折"; + static m22(tian) => "您已连续签到${tian}天"; - static m23(num) => "取单号${num}"; + static m23(pinglun) => "评论(${pinglun})"; - static m24(ren) => "¥${ren}/人"; + static m24(zongyue, huodongyue, lvbiyue) => "平台总余额：${zongyue}（活动余额${huodongyue} 绿币余额${lvbiyue}） "; - static m25(second) => "${second}s后重新发送"; + static m25(zhe) => "全场${zhe}折"; - static m26(jifen) => "商品积分 ${jifen}积分"; + static m26(num) => "取单号${num}"; - static m27(jifen) => "实付积分 ${jifen}积分"; + static m27(ren) => "¥${ren}/人"; - static m28(sui) => "${sui}岁"; + static m28(second) => "${second}s后重新发送"; - static m29(num) => "完成${num}"; + static m29(jifen) => "商品积分 ${jifen}积分"; - static m30(time) => "下单时间:${time}"; + static m30(jifen) => "实付积分 ${jifen}积分"; - static m31(xihuan) => "喜欢(${xihuan})"; + static m31(sui) => "${sui}岁"; - static m32(shoujihao) => "邀请人手机号:${shoujihao}"; + static m32(num) => "完成${num}"; - static m33(jian) => "已兑换${jian}件"; + static m33(time) => "下单时间:${time}"; - static m34(time) => "营业时间: ${time}"; + static m34(xihuan) => "喜欢(${xihuan})"; - static m35(date) => "有效期:${date}"; + static m35(shoujihao) => "邀请人手机号:${shoujihao}"; - static m36(date) => "有效期至${date}"; + static m36(jian) => "已兑换${jian}件"; - static m37(yuan) => "${yuan}元"; + static m37(time) => "营业时间: ${time}"; - static m38(yue) => "余额${yue}"; + static m38(date) => "有效期:${date}"; - static m39(zuozhe) => "作者:${zuozhe}"; + static m39(date) => "有效期至${date}"; + + static m40(yuan) => "${yuan}元"; + + static m41(yue) => "余额${yue}"; + + static m42(yue) => "余额 ${yue}"; + + static m43(zuozhe) => "作者:${zuozhe}"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -260,6 +268,7 @@ class MessageLookup extends MessageLookupByLibrary { "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"), "huifu" : MessageLookupByLibrary.simpleMessage("回复"), "huifu_" : m9, + "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"), "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), @@ -279,6 +288,8 @@ class MessageLookup extends MessageLookupByLibrary { "huodongjianmianpeisongfei" : m10, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"), "huodongliebiao" : MessageLookupByLibrary.simpleMessage("活动列表"), + "huodongyue" : MessageLookupByLibrary.simpleMessage("活动余额"), + "huodongyue_" : m11, "huodongzixun" : MessageLookupByLibrary.simpleMessage("活动资讯"), "huopinyisongda" : MessageLookupByLibrary.simpleMessage("货品已送达"), "input_code" : MessageLookupByLibrary.simpleMessage("手机验证码"), @@ -287,18 +298,18 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"), "invite_code_error" : MessageLookupByLibrary.simpleMessage("邀请码输入错误"), - "jiajifen" : m11, + "jiajifen" : m12, "jian" : MessageLookupByLibrary.simpleMessage("件"), "jiangli" : MessageLookupByLibrary.simpleMessage("奖励"), "jiangshi" : MessageLookupByLibrary.simpleMessage("讲师"), - "jianjie" : m12, + "jianjie" : m13, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"), "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"), "jiesuanjine" : MessageLookupByLibrary.simpleMessage("结算金额"), "jifen" : MessageLookupByLibrary.simpleMessage("积分"), - "jifen_" : m13, + "jifen_" : m14, "jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的积分不足"), - "jifendaoxiayidengji" : m14, + "jifendaoxiayidengji" : m15, "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"), @@ -325,7 +336,7 @@ class MessageLookup extends MessageLookupByLibrary { "kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"), - "kaitongriqi" : m15, + "kaitongriqi" : m16, "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"), "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"), @@ -349,27 +360,30 @@ class MessageLookup extends MessageLookupByLibrary { "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"), "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("领取到卡包"), "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"), - "lingqushijian" : m16, + "lingqushijian" : m17, "linian" : MessageLookupByLibrary.simpleMessage("理念"), "lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"), "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的评论吧"), "login" : MessageLookupByLibrary.simpleMessage("登录"), "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"), + "lvbiyue" : MessageLookupByLibrary.simpleMessage("绿币余额"), + "lvbiyue_" : m18, "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), - "manlijiandaijinquan" : m17, - "manyuankeyong" : m18, + "manlijiandaijinquan" : m19, + "manyuankeyong" : m20, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"), - "mi" : m19, + "mi" : m21, "mingxi" : MessageLookupByLibrary.simpleMessage("明细"), "morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"), + "muqianwujilu" : MessageLookupByLibrary.simpleMessage("目前暂未记录哦"), "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暂无星店活动"), "nihaimeiyouchongzhihuoxiaofeijilu" : MessageLookupByLibrary.simpleMessage("你在这儿还没有消费或充值记录哦～"), "nincunchuquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启存储权限，请点击开启"), @@ -379,7 +393,7 @@ class MessageLookup extends MessageLookupByLibrary { "ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"), "ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"), "ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功领取优惠劵，请在"), - "ninyilianxuqiandaotian" : m20, + "ninyilianxuqiandaotian" : m22, "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"), "ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"), "paizhao" : MessageLookupByLibrary.simpleMessage("拍照"), @@ -390,9 +404,10 @@ class MessageLookup extends MessageLookupByLibrary { "peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"), "phone_error" : MessageLookupByLibrary.simpleMessage("手机格式错误"), "pinglun" : MessageLookupByLibrary.simpleMessage("评论"), - "pinglun_" : m21, + "pinglun_" : m23, "pingtaiyue" : MessageLookupByLibrary.simpleMessage("平台余额"), "pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("平台支付密码"), + "pingtaizongyue" : m24, "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"), "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"), "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"), @@ -433,7 +448,7 @@ class MessageLookup extends MessageLookupByLibrary { "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"), "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兑换"), "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全场通用"), - "quanchangzhe" : m22, + "quanchangzhe" : m25, "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("权限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"), @@ -441,7 +456,7 @@ class MessageLookup extends MessageLookupByLibrary { "quanyishuoming" : MessageLookupByLibrary.simpleMessage("权益说明"), "quanyixiangqing" : MessageLookupByLibrary.simpleMessage("权益详情"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"), - "qudanhao" : m23, + "qudanhao" : m26, "qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"), "queding" : MessageLookupByLibrary.simpleMessage("确定"), "quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("确定要删除这条动态？"), @@ -464,9 +479,9 @@ class MessageLookup extends MessageLookupByLibrary { "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"), "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("热门文章视频"), "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("热门文章视频列表"), - "ren" : m24, + "ren" : m27, "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"), - "resend_in_seconds" : m25, + "resend_in_seconds" : m28, "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"), "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"), "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"), @@ -485,7 +500,7 @@ class MessageLookup extends MessageLookupByLibrary { "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"), "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"), "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"), - "shangpinjifen" : m26, + "shangpinjifen" : m29, "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"), "shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等级"), "shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娱乐"), @@ -494,7 +509,7 @@ class MessageLookup extends MessageLookupByLibrary { "shezhi" : MessageLookupByLibrary.simpleMessage("设置"), "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"), "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"), - "shifujifen" : m27, + "shifujifen" : m30, "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"), "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"), "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"), @@ -518,7 +533,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."), "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), - "sui" : m28, + "sui" : m31, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), @@ -538,7 +553,7 @@ class MessageLookup extends MessageLookupByLibrary { "waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), - "wancheng_" : m29, + "wancheng_" : m32, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"), @@ -579,7 +594,7 @@ class MessageLookup extends MessageLookupByLibrary { "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"), - "xiadanshijian_" : m30, + "xiadanshijian_" : m33, "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangce" : MessageLookupByLibrary.simpleMessage("相册"), "xiangji" : MessageLookupByLibrary.simpleMessage("相机"), @@ -591,11 +606,12 @@ class MessageLookup extends MessageLookupByLibrary { "xianxiashiyong" : MessageLookupByLibrary.simpleMessage("线下使用"), "xiaofei" : MessageLookupByLibrary.simpleMessage("消费"), "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"), + "xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消费记录"), "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"), "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"), "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"), "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"), - "xihuan_" : m31, + "xihuan_" : m34, "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"), "xingming" : MessageLookupByLibrary.simpleMessage("姓名"), "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"), @@ -606,10 +622,10 @@ class MessageLookup extends MessageLookupByLibrary { "xuanji" : MessageLookupByLibrary.simpleMessage("选集"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"), - "yaoqingrenshoujihao_" : m32, + "yaoqingrenshoujihao_" : m35, "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), - "yiduihuanjian" : m33, + "yiduihuanjian" : m36, "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), "yihuide" : MessageLookupByLibrary.simpleMessage("已获得"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), @@ -623,7 +639,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"), "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), - "yingyeshijian" : m34, + "yingyeshijian" : m37, "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"), "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"), @@ -652,14 +668,15 @@ class MessageLookup extends MessageLookupByLibrary { "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"), "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"), "youkedenglu" : MessageLookupByLibrary.simpleMessage("游客登录"), - "youxiaoqi" : m35, + "youxiaoqi" : m38, "youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"), - "youxiaoqizhi" : m36, + "youxiaoqizhi" : m39, "yuan" : MessageLookupByLibrary.simpleMessage("元"), - "yuan_" : m37, + "yuan_" : m40, "yuanjia" : MessageLookupByLibrary.simpleMessage("原价"), "yue" : MessageLookupByLibrary.simpleMessage("余额"), - "yue_" : m38, + "yue_" : m41, + "yue__" : m42, "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"), "yuliudianhua" : MessageLookupByLibrary.simpleMessage("预留电话"), "yunfei" : MessageLookupByLibrary.simpleMessage("运费"), @@ -697,9 +714,11 @@ class MessageLookup extends MessageLookupByLibrary { "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"), "zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型：自提兑换券"), "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"), + "zongzichan" : MessageLookupByLibrary.simpleMessage("总资产"), + "zongzichanyuan" : MessageLookupByLibrary.simpleMessage("总资产(元)"), "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"), "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"), - "zuozhe" : m39 + "zuozhe" : m43 }; } diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index e683bd84..27ce7f40 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_CN.dart @@ -41,63 +41,71 @@ class MessageLookup extends MessageLookupByLibrary { static m10(yuan) => "活动减免${yuan}元配送费"; - static m11(jifen) => "+ ${jifen} 积分"; + static m11(yue) => "活动余额 ${yue}"; - static m12(jianjie) => "简介:${jianjie}"; + static m12(jifen) => "+ ${jifen} 积分"; - static m13(jifen) => "${jifen}积分"; + static m13(jianjie) => "简介:${jianjie}"; - static m14(jifen) => "${jifen}积分 到下一个等级"; + static m14(jifen) => "${jifen}积分"; - static m15(date) => "开通日期:${date}"; + static m15(jifen) => "${jifen}积分 到下一个等级"; - static m16(shijian) => "领取时间 ${shijian}"; + static m16(date) => "开通日期:${date}"; - static m17(man, jian) => "满${man}元立减${jian}元代金券"; + static m17(shijian) => "领取时间 ${shijian}"; - static m18(yuan) => "满${yuan}可用"; + static m18(yue) => "绿币余额 ${yue}"; - static m19(mi) => "${mi}米"; + static m19(man, jian) => "满${man}元立减${jian}元代金券"; - static m20(tian) => "您已连续签到${tian}天"; + static m20(yuan) => "满${yuan}可用"; - static m21(pinglun) => "评论(${pinglun})"; + static m21(mi) => "${mi}米"; - static m22(zhe) => "全场${zhe}折"; + static m22(tian) => "您已连续签到${tian}天"; - static m23(num) => "取单号${num}"; + static m23(pinglun) => "评论(${pinglun})"; - static m24(ren) => "¥${ren}/人"; + static m24(zongyue, huodongyue, lvbiyue) => "平台总余额：${zongyue}（活动余额${huodongyue} 绿币余额${lvbiyue}） "; - static m25(second) => "${second}s后重新发送"; + static m25(zhe) => "全场${zhe}折"; - static m26(jifen) => "商品积分 ${jifen}积分"; + static m26(num) => "取单号${num}"; - static m27(jifen) => "实付积分 ${jifen}积分"; + static m27(ren) => "¥${ren}/人"; - static m28(sui) => "${sui}岁"; + static m28(second) => "${second}s后重新发送"; - static m29(num) => "完成${num}"; + static m29(jifen) => "商品积分 ${jifen}积分"; - static m30(time) => "下单时间:${time}"; + static m30(jifen) => "实付积分 ${jifen}积分"; - static m31(xihuan) => "喜欢(${xihuan})"; + static m31(sui) => "${sui}岁"; - static m32(shoujihao) => "邀请人手机号:${shoujihao}"; + static m32(num) => "完成${num}"; - static m33(jian) => "已兑换${jian}件"; + static m33(time) => "下单时间:${time}"; - static m34(time) => "营业时间: ${time}"; + static m34(xihuan) => "喜欢(${xihuan})"; - static m35(date) => "有效期:${date}"; + static m35(shoujihao) => "邀请人手机号:${shoujihao}"; - static m36(date) => "有效期至${date}"; + static m36(jian) => "已兑换${jian}件"; - static m37(yuan) => "${yuan}元"; + static m37(time) => "营业时间: ${time}"; - static m38(yue) => "余额${yue}"; + static m38(date) => "有效期:${date}"; - static m39(zuozhe) => "作者:${zuozhe}"; + static m39(date) => "有效期至${date}"; + + static m40(yuan) => "${yuan}元"; + + static m41(yue) => "余额${yue}"; + + static m42(yue) => "余额 ${yue}"; + + static m43(zuozhe) => "作者:${zuozhe}"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -260,6 +268,7 @@ class MessageLookup extends MessageLookupByLibrary { "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"), "huifu" : MessageLookupByLibrary.simpleMessage("回复"), "huifu_" : m9, + "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"), "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), @@ -279,6 +288,8 @@ class MessageLookup extends MessageLookupByLibrary { "huodongjianmianpeisongfei" : m10, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"), "huodongliebiao" : MessageLookupByLibrary.simpleMessage("活动列表"), + "huodongyue" : MessageLookupByLibrary.simpleMessage("活动余额"), + "huodongyue_" : m11, "huodongzixun" : MessageLookupByLibrary.simpleMessage("活动资讯"), "huopinyisongda" : MessageLookupByLibrary.simpleMessage("货品已送达"), "input_code" : MessageLookupByLibrary.simpleMessage("手机验证码"), @@ -287,18 +298,18 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"), "invite_code_error" : MessageLookupByLibrary.simpleMessage("邀请码输入错误"), - "jiajifen" : m11, + "jiajifen" : m12, "jian" : MessageLookupByLibrary.simpleMessage("件"), "jiangli" : MessageLookupByLibrary.simpleMessage("奖励"), "jiangshi" : MessageLookupByLibrary.simpleMessage("讲师"), - "jianjie" : m12, + "jianjie" : m13, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"), "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"), "jiesuanjine" : MessageLookupByLibrary.simpleMessage("结算金额"), "jifen" : MessageLookupByLibrary.simpleMessage("积分"), - "jifen_" : m13, + "jifen_" : m14, "jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的积分不足"), - "jifendaoxiayidengji" : m14, + "jifendaoxiayidengji" : m15, "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"), @@ -325,7 +336,7 @@ class MessageLookup extends MessageLookupByLibrary { "kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"), - "kaitongriqi" : m15, + "kaitongriqi" : m16, "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"), "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"), @@ -349,27 +360,30 @@ class MessageLookup extends MessageLookupByLibrary { "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"), "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("领取到卡包"), "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"), - "lingqushijian" : m16, + "lingqushijian" : m17, "linian" : MessageLookupByLibrary.simpleMessage("理念"), "lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"), "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的评论吧"), "login" : MessageLookupByLibrary.simpleMessage("登录"), "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"), + "lvbiyue" : MessageLookupByLibrary.simpleMessage("绿币余额"), + "lvbiyue_" : m18, "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), - "manlijiandaijinquan" : m17, - "manyuankeyong" : m18, + "manlijiandaijinquan" : m19, + "manyuankeyong" : m20, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"), - "mi" : m19, + "mi" : m21, "mingxi" : MessageLookupByLibrary.simpleMessage("明细"), "morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"), + "muqianwujilu" : MessageLookupByLibrary.simpleMessage("目前暂未记录哦"), "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暂无星店活动"), "nihaimeiyouchongzhihuoxiaofeijilu" : MessageLookupByLibrary.simpleMessage("你在这儿还没有消费或充值记录哦～"), "nincunchuquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启存储权限，请点击开启"), @@ -379,7 +393,7 @@ class MessageLookup extends MessageLookupByLibrary { "ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"), "ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"), "ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功领取优惠劵，请在"), - "ninyilianxuqiandaotian" : m20, + "ninyilianxuqiandaotian" : m22, "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"), "ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"), "paizhao" : MessageLookupByLibrary.simpleMessage("拍照"), @@ -390,9 +404,10 @@ class MessageLookup extends MessageLookupByLibrary { "peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"), "phone_error" : MessageLookupByLibrary.simpleMessage("手机格式错误"), "pinglun" : MessageLookupByLibrary.simpleMessage("评论"), - "pinglun_" : m21, + "pinglun_" : m23, "pingtaiyue" : MessageLookupByLibrary.simpleMessage("平台余额"), "pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("平台支付密码"), + "pingtaizongyue" : m24, "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"), "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"), "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"), @@ -433,7 +448,7 @@ class MessageLookup extends MessageLookupByLibrary { "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"), "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兑换"), "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全场通用"), - "quanchangzhe" : m22, + "quanchangzhe" : m25, "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("权限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"), @@ -441,7 +456,7 @@ class MessageLookup extends MessageLookupByLibrary { "quanyishuoming" : MessageLookupByLibrary.simpleMessage("权益说明"), "quanyixiangqing" : MessageLookupByLibrary.simpleMessage("权益详情"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"), - "qudanhao" : m23, + "qudanhao" : m26, "qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"), "queding" : MessageLookupByLibrary.simpleMessage("确定"), "quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("确定要删除这条动态？"), @@ -464,9 +479,9 @@ class MessageLookup extends MessageLookupByLibrary { "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"), "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("热门文章视频"), "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("热门文章视频列表"), - "ren" : m24, + "ren" : m27, "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"), - "resend_in_seconds" : m25, + "resend_in_seconds" : m28, "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"), "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"), "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"), @@ -485,7 +500,7 @@ class MessageLookup extends MessageLookupByLibrary { "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"), "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"), "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"), - "shangpinjifen" : m26, + "shangpinjifen" : m29, "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"), "shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等级"), "shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娱乐"), @@ -494,7 +509,7 @@ class MessageLookup extends MessageLookupByLibrary { "shezhi" : MessageLookupByLibrary.simpleMessage("设置"), "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"), "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"), - "shifujifen" : m27, + "shifujifen" : m30, "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"), "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"), "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"), @@ -518,7 +533,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."), "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), - "sui" : m28, + "sui" : m31, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), @@ -538,7 +553,7 @@ class MessageLookup extends MessageLookupByLibrary { "waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), - "wancheng_" : m29, + "wancheng_" : m32, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"), @@ -579,7 +594,7 @@ class MessageLookup extends MessageLookupByLibrary { "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"), - "xiadanshijian_" : m30, + "xiadanshijian_" : m33, "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangce" : MessageLookupByLibrary.simpleMessage("相册"), "xiangji" : MessageLookupByLibrary.simpleMessage("相机"), @@ -591,11 +606,12 @@ class MessageLookup extends MessageLookupByLibrary { "xianxiashiyong" : MessageLookupByLibrary.simpleMessage("线下使用"), "xiaofei" : MessageLookupByLibrary.simpleMessage("消费"), "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"), + "xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消费记录"), "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"), "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"), "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"), "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"), - "xihuan_" : m31, + "xihuan_" : m34, "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"), "xingming" : MessageLookupByLibrary.simpleMessage("姓名"), "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"), @@ -606,10 +622,10 @@ class MessageLookup extends MessageLookupByLibrary { "xuanji" : MessageLookupByLibrary.simpleMessage("选集"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"), - "yaoqingrenshoujihao_" : m32, + "yaoqingrenshoujihao_" : m35, "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), - "yiduihuanjian" : m33, + "yiduihuanjian" : m36, "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), "yihuide" : MessageLookupByLibrary.simpleMessage("已获得"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), @@ -623,7 +639,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"), "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), - "yingyeshijian" : m34, + "yingyeshijian" : m37, "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"), "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"), @@ -652,14 +668,15 @@ class MessageLookup extends MessageLookupByLibrary { "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"), "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"), "youkedenglu" : MessageLookupByLibrary.simpleMessage("游客登录"), - "youxiaoqi" : m35, + "youxiaoqi" : m38, "youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"), - "youxiaoqizhi" : m36, + "youxiaoqizhi" : m39, "yuan" : MessageLookupByLibrary.simpleMessage("元"), - "yuan_" : m37, + "yuan_" : m40, "yuanjia" : MessageLookupByLibrary.simpleMessage("原价"), "yue" : MessageLookupByLibrary.simpleMessage("余额"), - "yue_" : m38, + "yue_" : m41, + "yue__" : m42, "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"), "yuliudianhua" : MessageLookupByLibrary.simpleMessage("预留电话"), "yunfei" : MessageLookupByLibrary.simpleMessage("运费"), @@ -697,9 +714,11 @@ class MessageLookup extends MessageLookupByLibrary { "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"), "zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型：自提兑换券"), "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"), + "zongzichan" : MessageLookupByLibrary.simpleMessage("总资产"), + "zongzichanyuan" : MessageLookupByLibrary.simpleMessage("总资产(元)"), "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"), "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"), - "zuozhe" : m39 + "zuozhe" : m43 }; } diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart index b99d36ed..e4c5e904 100644 --- a/lib/generated/intl/messages_zh_Hant_CN.dart +++ b/lib/generated/intl/messages_zh_Hant_CN.dart @@ -41,63 +41,71 @@ class MessageLookup extends MessageLookupByLibrary { static m10(yuan) => "活動減免${yuan}元配送費"; - static m11(jifen) => "+ ${jifen} 積分"; + static m11(yue) => "活動餘額 ${yue}"; - static m12(jianjie) => "簡介:${jianjie}"; + static m12(jifen) => "+ ${jifen} 積分"; - static m13(jifen) => "${jifen}積分"; + static m13(jianjie) => "簡介:${jianjie}"; - static m14(jifen) => "${jifen}積分 到下一個等級"; + static m14(jifen) => "${jifen}積分"; - static m15(date) => "開通日期:${date}"; + static m15(jifen) => "${jifen}積分 到下一個等級"; - static m16(shijian) => "領取時間 ${shijian}"; + static m16(date) => "開通日期:${date}"; - static m17(man, jian) => "滿${man}元立減${jian}元代金券"; + static m17(shijian) => "領取時間 ${shijian}"; - static m18(yuan) => "滿${yuan}可用"; + static m18(yue) => "綠幣餘額 ${yue}"; - static m19(mi) => "${mi}米"; + static m19(man, jian) => "滿${man}元立減${jian}元代金券"; - static m20(tian) => "您已連續簽到${tian}天"; + static m20(yuan) => "滿${yuan}可用"; - static m21(pinglun) => "評論(${pinglun})"; + static m21(mi) => "${mi}米"; - static m22(zhe) => "全場${zhe}折"; + static m22(tian) => "您已連續簽到${tian}天"; - static m23(num) => "取單號${num}"; + static m23(pinglun) => "評論(${pinglun})"; - static m24(ren) => "¥${ren}/人"; + static m24(zongyue, huodongyue, lvbiyue) => "平台總餘額：${zongyue}（活動餘額${huodongyue} 綠幣餘額${lvbiyue}） "; - static m25(second) => "${second}s后重新發送"; + static m25(zhe) => "全場${zhe}折"; - static m26(jifen) => "商品積分 ${jifen}積分"; + static m26(num) => "取單號${num}"; - static m27(jifen) => "實付積分 ${jifen}積分"; + static m27(ren) => "¥${ren}/人"; - static m28(sui) => "${sui}嵗"; + static m28(second) => "${second}s后重新發送"; - static m29(num) => "完成${num}"; + static m29(jifen) => "商品積分 ${jifen}積分"; - static m30(time) => "下單時間:${time}"; + static m30(jifen) => "實付積分 ${jifen}積分"; - static m31(xihuan) => "喜歡(${xihuan})"; + static m31(sui) => "${sui}嵗"; - static m32(shoujihao) => "邀请人手機號:${shoujihao}"; + static m32(num) => "完成${num}"; - static m33(jian) => "已兌換${jian}件"; + static m33(time) => "下單時間:${time}"; - static m34(time) => "營業時間: ${time}"; + static m34(xihuan) => "喜歡(${xihuan})"; - static m35(date) => "有效期:${date}"; + static m35(shoujihao) => "邀请人手機號:${shoujihao}"; - static m36(date) => "有效期至${date}"; + static m36(jian) => "已兌換${jian}件"; - static m37(yuan) => "${yuan}元"; + static m37(time) => "營業時間: ${time}"; - static m38(yue) => "餘額${yue}"; + static m38(date) => "有效期:${date}"; - static m39(zuozhe) => "作者:${zuozhe}"; + static m39(date) => "有效期至${date}"; + + static m40(yuan) => "${yuan}元"; + + static m41(yue) => "餘額${yue}"; + + static m42(yue) => "餘額 ${yue}"; + + static m43(zuozhe) => "作者:${zuozhe}"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -277,6 +285,7 @@ class MessageLookup extends MessageLookupByLibrary { "huodongjianmianpeisongfei" : m10, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活動進行中"), "huodongliebiao" : MessageLookupByLibrary.simpleMessage("活動列表"), + "huodongyue" : m11, "huodongzixun" : MessageLookupByLibrary.simpleMessage("活動資訊"), "huopinyisongda" : MessageLookupByLibrary.simpleMessage("貨品已送達"), "input_code" : MessageLookupByLibrary.simpleMessage("手機驗證碼"), @@ -285,18 +294,18 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone" : MessageLookupByLibrary.simpleMessage("輸入手機號"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"), "invite_code_error" : MessageLookupByLibrary.simpleMessage("邀請碼輸入錯誤"), - "jiajifen" : m11, + "jiajifen" : m12, "jian" : MessageLookupByLibrary.simpleMessage("件"), "jiangli" : MessageLookupByLibrary.simpleMessage("獎勵"), "jiangshi" : MessageLookupByLibrary.simpleMessage("講師"), - "jianjie" : m12, + "jianjie" : m13, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加載失敗"), "jiesuan" : MessageLookupByLibrary.simpleMessage("結算"), "jiesuanjine" : MessageLookupByLibrary.simpleMessage("結算金額"), "jifen" : MessageLookupByLibrary.simpleMessage("積分"), - "jifen_" : m13, + "jifen_" : m14, "jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的積分不足"), - "jifendaoxiayidengji" : m14, + "jifendaoxiayidengji" : m15, "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"), @@ -323,7 +332,7 @@ class MessageLookup extends MessageLookupByLibrary { "kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"), - "kaitongriqi" : m15, + "kaitongriqi" : m16, "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可領取的卡券"), "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"), @@ -347,25 +356,26 @@ class MessageLookup extends MessageLookupByLibrary { "lingquchenggong" : MessageLookupByLibrary.simpleMessage("領取成功"), "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("領取到卡包"), "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"), - "lingqushijian" : m16, + "lingqushijian" : m17, "linian" : MessageLookupByLibrary.simpleMessage("理念"), "lishijilu" : MessageLookupByLibrary.simpleMessage("歷史記錄"), "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的評論吧"), "login" : MessageLookupByLibrary.simpleMessage("登錄"), "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"), + "lvbiyue" : m18, "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), - "manlijiandaijinquan" : m17, - "manyuankeyong" : m18, + "manlijiandaijinquan" : m19, + "manyuankeyong" : m20, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日簽到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("沒有更多會員卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("沒有更多數據了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), "menpaihao" : MessageLookupByLibrary.simpleMessage("請輸入門牌號"), - "mi" : m19, + "mi" : m21, "mingxi" : MessageLookupByLibrary.simpleMessage("明細"), "morenpaixu" : MessageLookupByLibrary.simpleMessage("默認排序"), "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暫無星店活動"), @@ -377,7 +387,7 @@ class MessageLookup extends MessageLookupByLibrary { "ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"), "ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"), "ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功領取優惠券，請在"), - "ninyilianxuqiandaotian" : m20, + "ninyilianxuqiandaotian" : m22, "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一個訂單需要前往門店領取"), "ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一個新訂單"), "paizhao" : MessageLookupByLibrary.simpleMessage("拍照"), @@ -388,9 +398,10 @@ class MessageLookup extends MessageLookupByLibrary { "peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"), "phone_error" : MessageLookupByLibrary.simpleMessage("手機格式錯誤"), "pinglun" : MessageLookupByLibrary.simpleMessage("評論"), - "pinglun_" : m21, + "pinglun_" : m23, "pingtaiyue" : MessageLookupByLibrary.simpleMessage("平臺餘額"), "pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("平臺支付密碼"), + "pingtaizongyue" : m24, "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"), "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介紹"), "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登錄既同意"), @@ -431,7 +442,7 @@ class MessageLookup extends MessageLookupByLibrary { "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部訂單"), "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兌換"), "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全場通用"), - "quanchangzhe" : m22, + "quanchangzhe" : m25, "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("權限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("權限設置"), @@ -439,7 +450,7 @@ class MessageLookup extends MessageLookupByLibrary { "quanyishuoming" : MessageLookupByLibrary.simpleMessage("權益説明"), "quanyixiangqing" : MessageLookupByLibrary.simpleMessage("權益詳情"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐號"), - "qudanhao" : m23, + "qudanhao" : m26, "qudenglu" : MessageLookupByLibrary.simpleMessage("去登錄"), "queding" : MessageLookupByLibrary.simpleMessage("確定"), "quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("確定要刪除這條動態？"), @@ -462,9 +473,9 @@ class MessageLookup extends MessageLookupByLibrary { "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"), "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("熱門文章視頻"), "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("熱門文章視頻清單"), - "ren" : m24, + "ren" : m27, "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任務中心"), - "resend_in_seconds" : m25, + "resend_in_seconds" : m28, "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"), "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兌換積分"), "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("點擊淨弼，進入積分商城，點擊你想兌換的領商品，進入商品詳情後點擊下方兌換，即可兌換哦~"), @@ -483,7 +494,7 @@ class MessageLookup extends MessageLookupByLibrary { "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已發貨"), "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"), "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加載"), - "shangpinjifen" : m26, + "shangpinjifen" : m29, "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品詳情"), "shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等級"), "shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娛樂"), @@ -492,7 +503,7 @@ class MessageLookup extends MessageLookupByLibrary { "shezhi" : MessageLookupByLibrary.simpleMessage("設置"), "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("釋放加載更多"), "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("釋放刷新"), - "shifujifen" : m27, + "shifujifen" : m30, "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("實名認證"), "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"), "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"), @@ -515,7 +526,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."), "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人地址"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"), - "sui" : m28, + "sui" : m31, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), @@ -535,7 +546,7 @@ class MessageLookup extends MessageLookupByLibrary { "waimaipeisong" : MessageLookupByLibrary.simpleMessage("外賣配送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), - "wancheng_" : m29, + "wancheng_" : m32, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日資訊後自動生成 "), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日資訊得專屬優惠劵 "), @@ -576,7 +587,7 @@ class MessageLookup extends MessageLookupByLibrary { "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流狀態:"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下單時間"), - "xiadanshijian_" : m30, + "xiadanshijian_" : m33, "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangce" : MessageLookupByLibrary.simpleMessage("相冊"), "xiangji" : MessageLookupByLibrary.simpleMessage("相機"), @@ -588,11 +599,12 @@ class MessageLookup extends MessageLookupByLibrary { "xianxiashiyong" : MessageLookupByLibrary.simpleMessage("線下使用"), "xiaofei" : MessageLookupByLibrary.simpleMessage("消費"), "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"), + "xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消費記錄"), "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"), "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"), "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加載完成"), "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"), - "xihuan_" : m31, + "xihuan_" : m34, "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"), "xingming" : MessageLookupByLibrary.simpleMessage("姓名"), "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系統通知"), @@ -603,10 +615,10 @@ class MessageLookup extends MessageLookupByLibrary { "xuanji" : MessageLookupByLibrary.simpleMessage("選集"), "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("驗證碼"), - "yaoqingrenshoujihao_" : m32, + "yaoqingrenshoujihao_" : m35, "yibangfuka" : MessageLookupByLibrary.simpleMessage("已綁副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"), - "yiduihuanjian" : m33, + "yiduihuanjian" : m36, "yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"), "yihuide" : MessageLookupByLibrary.simpleMessage("已獲得"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"), @@ -620,7 +632,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集團聯盟店會員點餐"), "yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"), - "yingyeshijian" : m34, + "yingyeshijian" : m37, "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("飲食"), "yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"), @@ -649,14 +661,15 @@ class MessageLookup extends MessageLookupByLibrary { "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("優惠券領取"), "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("優惠金額無法累積積分，訂單撤銷或其他原因造成的未成功支付的訂單，無法獲得對應的積分。"), "youkedenglu" : MessageLookupByLibrary.simpleMessage("遊客登錄"), - "youxiaoqi" : m35, + "youxiaoqi" : m38, "youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"), - "youxiaoqizhi" : m36, + "youxiaoqizhi" : m39, "yuan" : MessageLookupByLibrary.simpleMessage("元"), - "yuan_" : m37, + "yuan_" : m40, "yuanjia" : MessageLookupByLibrary.simpleMessage("原價"), "yue" : MessageLookupByLibrary.simpleMessage("餘額"), - "yue_" : m38, + "yue_" : m41, + "yue__" : m42, "yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"), "yuliudianhua" : MessageLookupByLibrary.simpleMessage("預留電話"), "yunfei" : MessageLookupByLibrary.simpleMessage("運費"), @@ -698,6 +711,6 @@ class MessageLookup extends MessageLookupByLibrary { "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"), "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"), - "zuozhe" : m39 + "zuozhe" : m43 }; } diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index 35853b66..005db40f 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/lib/generated/intl/messages_zh_TW.dart @@ -41,63 +41,71 @@ class MessageLookup extends MessageLookupByLibrary { static m10(yuan) => "活動減免${yuan}元配送費"; - static m11(jifen) => "+ ${jifen} 積分"; + static m11(yue) => "活動餘額 ${yue}"; - static m12(jianjie) => "簡介:${jianjie}"; + static m12(jifen) => "+ ${jifen} 積分"; - static m13(jifen) => "${jifen}積分"; + static m13(jianjie) => "簡介:${jianjie}"; - static m14(jifen) => "${jifen}積分 到下一個等級"; + static m14(jifen) => "${jifen}積分"; - static m15(date) => "開通日期:${date}"; + static m15(jifen) => "${jifen}積分 到下一個等級"; - static m16(shijian) => "領取時間 ${shijian}"; + static m16(date) => "開通日期:${date}"; - static m17(man, jian) => "滿${man}元立減${jian}元代金券"; + static m17(shijian) => "領取時間 ${shijian}"; - static m18(yuan) => "滿${yuan}可用"; + static m18(yue) => "綠幣餘額 ${yue}"; - static m19(mi) => "${mi}米"; + static m19(man, jian) => "滿${man}元立減${jian}元代金券"; - static m20(tian) => "您已連續簽到${tian}天"; + static m20(yuan) => "滿${yuan}可用"; - static m21(pinglun) => "評論(${pinglun})"; + static m21(mi) => "${mi}米"; - static m22(zhe) => "全場${zhe}折"; + static m22(tian) => "您已連續簽到${tian}天"; - static m23(num) => "取單號${num}"; + static m23(pinglun) => "評論(${pinglun})"; - static m24(ren) => "¥${ren}/人"; + static m24(zongyue, huodongyue, lvbiyue) => "平台總餘額：${zongyue}（活動餘額${huodongyue} 綠幣餘額${lvbiyue}） "; - static m25(second) => "${second}s后重新發送"; + static m25(zhe) => "全場${zhe}折"; - static m26(jifen) => "商品積分 ${jifen}積分"; + static m26(num) => "取單號${num}"; - static m27(jifen) => "實付積分 ${jifen}積分"; + static m27(ren) => "¥${ren}/人"; - static m28(sui) => "${sui}嵗"; + static m28(second) => "${second}s后重新發送"; - static m29(num) => "完成${num}"; + static m29(jifen) => "商品積分 ${jifen}積分"; - static m30(time) => "下單時間:${time}"; + static m30(jifen) => "實付積分 ${jifen}積分"; - static m31(xihuan) => "喜歡(${xihuan})"; + static m31(sui) => "${sui}嵗"; - static m32(shoujihao) => "邀请人手機號:${shoujihao}"; + static m32(num) => "完成${num}"; - static m33(jian) => "已兌換${jian}件"; + static m33(time) => "下單時間:${time}"; - static m34(time) => "營業時間: ${time}"; + static m34(xihuan) => "喜歡(${xihuan})"; - static m35(date) => "有效期:${date}"; + static m35(shoujihao) => "邀请人手機號:${shoujihao}"; - static m36(date) => "有效期至${date}"; + static m36(jian) => "已兌換${jian}件"; - static m37(yuan) => "${yuan}元"; + static m37(time) => "營業時間: ${time}"; - static m38(yue) => "餘額${yue}"; + static m38(date) => "有效期:${date}"; - static m39(zuozhe) => "作者:${zuozhe}"; + static m39(date) => "有效期至${date}"; + + static m40(yuan) => "${yuan}元"; + + static m41(yue) => "餘額${yue}"; + + static m42(yue) => "餘額 ${yue}"; + + static m43(zuozhe) => "作者:${zuozhe}"; final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { @@ -279,6 +287,7 @@ class MessageLookup extends MessageLookupByLibrary { "huodongjianmianpeisongfei" : m10, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活動進行中"), "huodongliebiao" : MessageLookupByLibrary.simpleMessage("活動列表"), + "huodongyue" : m11, "huodongzixun" : MessageLookupByLibrary.simpleMessage("活動資訊"), "huopinyisongda" : MessageLookupByLibrary.simpleMessage("貨品已送達"), "input_code" : MessageLookupByLibrary.simpleMessage("手機驗證碼"), @@ -287,18 +296,18 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone" : MessageLookupByLibrary.simpleMessage("輸入手機號"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"), "invite_code_error" : MessageLookupByLibrary.simpleMessage("邀請碼輸入錯誤"), - "jiajifen" : m11, + "jiajifen" : m12, "jian" : MessageLookupByLibrary.simpleMessage("件"), "jiangli" : MessageLookupByLibrary.simpleMessage("獎勵"), "jiangshi" : MessageLookupByLibrary.simpleMessage("講師"), - "jianjie" : m12, + "jianjie" : m13, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加載失敗"), "jiesuan" : MessageLookupByLibrary.simpleMessage("結算"), "jiesuanjine" : MessageLookupByLibrary.simpleMessage("結算金額"), "jifen" : MessageLookupByLibrary.simpleMessage("積分"), - "jifen_" : m13, + "jifen_" : m14, "jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的積分不足"), - "jifendaoxiayidengji" : m14, + "jifendaoxiayidengji" : m15, "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"), @@ -325,7 +334,7 @@ class MessageLookup extends MessageLookupByLibrary { "kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"), - "kaitongriqi" : m15, + "kaitongriqi" : m16, "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可領取的卡券"), "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"), @@ -349,25 +358,26 @@ class MessageLookup extends MessageLookupByLibrary { "lingquchenggong" : MessageLookupByLibrary.simpleMessage("領取成功"), "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("領取到卡包"), "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"), - "lingqushijian" : m16, + "lingqushijian" : m17, "linian" : MessageLookupByLibrary.simpleMessage("理念"), "lishijilu" : MessageLookupByLibrary.simpleMessage("歷史記錄"), "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的評論吧"), "login" : MessageLookupByLibrary.simpleMessage("登錄"), "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"), + "lvbiyue" : m18, "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"), "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), - "manlijiandaijinquan" : m17, - "manyuankeyong" : m18, + "manlijiandaijinquan" : m19, + "manyuankeyong" : m20, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日簽到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("沒有更多會員卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("沒有更多數據了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), "menpaihao" : MessageLookupByLibrary.simpleMessage("請輸入門牌號"), - "mi" : m19, + "mi" : m21, "mingxi" : MessageLookupByLibrary.simpleMessage("明細"), "morenpaixu" : MessageLookupByLibrary.simpleMessage("默認排序"), "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暫無星店活動"), @@ -379,7 +389,7 @@ class MessageLookup extends MessageLookupByLibrary { "ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"), "ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"), "ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功領取優惠券，請在"), - "ninyilianxuqiandaotian" : m20, + "ninyilianxuqiandaotian" : m22, "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一個訂單需要前往門店領取"), "ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一個新訂單"), "paizhao" : MessageLookupByLibrary.simpleMessage("拍照"), @@ -390,9 +400,10 @@ class MessageLookup extends MessageLookupByLibrary { "peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"), "phone_error" : MessageLookupByLibrary.simpleMessage("手機格式錯誤"), "pinglun" : MessageLookupByLibrary.simpleMessage("評論"), - "pinglun_" : m21, + "pinglun_" : m23, "pingtaiyue" : MessageLookupByLibrary.simpleMessage("平臺餘額"), "pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("平臺支付密碼"), + "pingtaizongyue" : m24, "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"), "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介紹"), "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登錄既同意"), @@ -433,7 +444,7 @@ class MessageLookup extends MessageLookupByLibrary { "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部訂單"), "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兌換"), "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全場通用"), - "quanchangzhe" : m22, + "quanchangzhe" : m25, "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("權限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("權限設置"), @@ -441,7 +452,7 @@ class MessageLookup extends MessageLookupByLibrary { "quanyishuoming" : MessageLookupByLibrary.simpleMessage("權益説明"), "quanyixiangqing" : MessageLookupByLibrary.simpleMessage("權益詳情"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐號"), - "qudanhao" : m23, + "qudanhao" : m26, "qudenglu" : MessageLookupByLibrary.simpleMessage("去登錄"), "queding" : MessageLookupByLibrary.simpleMessage("確定"), "quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("確定要刪除這條動態？"), @@ -464,9 +475,9 @@ class MessageLookup extends MessageLookupByLibrary { "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"), "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("熱門文章視頻"), "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("熱門文章視頻清單"), - "ren" : m24, + "ren" : m27, "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任務中心"), - "resend_in_seconds" : m25, + "resend_in_seconds" : m28, "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"), "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兌換積分"), "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("點擊淨弼，進入積分商城，點擊你想兌換的領商品，進入商品詳情後點擊下方兌換，即可兌換哦~"), @@ -485,7 +496,7 @@ class MessageLookup extends MessageLookupByLibrary { "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已發貨"), "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"), "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加載"), - "shangpinjifen" : m26, + "shangpinjifen" : m29, "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品詳情"), "shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等級"), "shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娛樂"), @@ -494,7 +505,7 @@ class MessageLookup extends MessageLookupByLibrary { "shezhi" : MessageLookupByLibrary.simpleMessage("設置"), "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("釋放加載更多"), "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("釋放刷新"), - "shifujifen" : m27, + "shifujifen" : m30, "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("實名認證"), "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"), "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"), @@ -518,7 +529,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."), "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人地址"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"), - "sui" : m28, + "sui" : m31, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), @@ -538,7 +549,7 @@ class MessageLookup extends MessageLookupByLibrary { "waimaipeisong" : MessageLookupByLibrary.simpleMessage("外賣配送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"), - "wancheng_" : m29, + "wancheng_" : m32, "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日資訊後自動生成 "), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日資訊得專屬優惠劵 "), @@ -579,7 +590,7 @@ class MessageLookup extends MessageLookupByLibrary { "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流狀態:"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下單時間"), - "xiadanshijian_" : m30, + "xiadanshijian_" : m33, "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xiangce" : MessageLookupByLibrary.simpleMessage("相冊"), "xiangji" : MessageLookupByLibrary.simpleMessage("相機"), @@ -591,11 +602,12 @@ class MessageLookup extends MessageLookupByLibrary { "xianxiashiyong" : MessageLookupByLibrary.simpleMessage("線下使用"), "xiaofei" : MessageLookupByLibrary.simpleMessage("消費"), "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"), + "xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消費記錄"), "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"), "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"), "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加載完成"), "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"), - "xihuan_" : m31, + "xihuan_" : m34, "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"), "xingming" : MessageLookupByLibrary.simpleMessage("姓名"), "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系統通知"), @@ -606,10 +618,10 @@ class MessageLookup extends MessageLookupByLibrary { "xuanji" : MessageLookupByLibrary.simpleMessage("選集"), "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("驗證碼"), - "yaoqingrenshoujihao_" : m32, + "yaoqingrenshoujihao_" : m35, "yibangfuka" : MessageLookupByLibrary.simpleMessage("已綁副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"), - "yiduihuanjian" : m33, + "yiduihuanjian" : m36, "yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"), "yihuide" : MessageLookupByLibrary.simpleMessage("已獲得"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"), @@ -623,7 +635,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集團聯盟店會員點餐"), "yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"), - "yingyeshijian" : m34, + "yingyeshijian" : m37, "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("飲食"), "yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"), @@ -652,14 +664,15 @@ class MessageLookup extends MessageLookupByLibrary { "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("優惠券領取"), "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("優惠金額無法累積積分，訂單撤銷或其他原因造成的未成功支付的訂單，無法獲得對應的積分。"), "youkedenglu" : MessageLookupByLibrary.simpleMessage("遊客登錄"), - "youxiaoqi" : m35, + "youxiaoqi" : m38, "youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"), - "youxiaoqizhi" : m36, + "youxiaoqizhi" : m39, "yuan" : MessageLookupByLibrary.simpleMessage("元"), - "yuan_" : m37, + "yuan_" : m40, "yuanjia" : MessageLookupByLibrary.simpleMessage("原價"), "yue" : MessageLookupByLibrary.simpleMessage("餘額"), - "yue_" : m38, + "yue_" : m41, + "yue__" : m42, "yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"), "yuliudianhua" : MessageLookupByLibrary.simpleMessage("預留電話"), "yunfei" : MessageLookupByLibrary.simpleMessage("運費"), @@ -701,6 +714,6 @@ class MessageLookup extends MessageLookupByLibrary { "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"), "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"), "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"), - "zuozhe" : m39 + "zuozhe" : m43 }; } diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 66b4a132..7cfab70b 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -5008,7 +5008,7 @@ class S { /// `平台余额` String get pingtaiyue { return Intl.message( - '回乡余额', + '平台余额', name: 'pingtaiyue', desc: '', args: [], @@ -6075,6 +6075,116 @@ class S { ); } + /// `余额 {yue}` + String yue__(Object yue) { + return Intl.message( + '余额 $yue', + name: 'yue__', + desc: '', + args: [yue], + ); + } + + /// `绿币余额 {yue}` + String lvbiyue_(Object yue) { + return Intl.message( + '绿币余额 $yue', + name: 'lvbiyue_', + desc: '', + args: [yue], + ); + } + + /// `活动余额 {yue}` + String huodongyue_(Object yue) { + return Intl.message( + '活动余额 $yue', + name: 'huodongyue_', + desc: '', + args: [yue], + ); + } + + /// `绿币余额` + String get lvbiyue { + return Intl.message( + '绿币余额', + name: 'lvbiyue', + desc: '', + args: [], + ); + } + + /// `回乡钱包` + String get huixiangqianbao { + return Intl.message( + '回乡钱包', + name: 'huixiangqianbao', + desc: '', + args: [], + ); + } + + /// `总资产` + String get zongzichan { + return Intl.message( + '总资产', + name: 'zongzichan', + desc: '', + args: [], + ); + } + + /// `总资产(元)` + String get zongzichanyuan { + return Intl.message( + '总资产(元)', + name: 'zongzichanyuan', + desc: '', + args: [], + ); + } + + /// `活动余额` + String get huodongyue { + return Intl.message( + '活动余额', + name: 'huodongyue', + desc: '', + args: [], + ); + } + + /// `消费记录` + String get xiaofeijilu { + return Intl.message( + '消费记录', + name: 'xiaofeijilu', + desc: '', + args: [], + ); + } + + /// `目前暂未记录哦` + String get muqianwujilu { + return Intl.message( + '目前暂未记录哦', + name: 'muqianwujilu', + desc: '', + args: [], + ); + } + + /// `平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ` + String pingtaizongyue(Object zongyue, Object huodongyue, Object lvbiyue) { + return Intl.message( + '平台总余额：$zongyue（活动余额$huodongyue 绿币余额$lvbiyue） ', + name: 'pingtaizongyue', + desc: '', + args: [zongyue, huodongyue, lvbiyue], + ); + } + /// `并使用本机号码登录` String get privacy_policy4 { return Intl.message( diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 3bd012b3..99449a22 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -634,6 +634,17 @@ "zhanghaoanquan": "账号安全", "pingtaizhifumima": "平台支付密码", "fasongduanxin": "发送短信", + "yue__": "余额 {yue}", + "lvbiyue_": "绿币余额 {yue}", + "huodongyue_": "活动余额 {yue}", + "lvbiyue": "绿币余额", + "huixiangqianbao": "回乡钱包", + "zongzichan": "总资产", + "zongzichanyuan": "总资产(元)", + "huodongyue": "活动余额", + "xiaofeijilu": "消费记录", + "muqianwujilu": "目前暂未记录哦", + "pingtaizongyue": "平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index ce111ab1..22d55f92 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -628,6 +628,17 @@ "zhanghaoanquan": "账号安全", "pingtaizhifumima": "平台支付密码", "fasongduanxin": "发送短信", + "yue__": "余额 {yue}", + "lvbiyue_": "绿币余额 {yue}", + "huodongyue_": "活动余额 {yue}", + "lvbiyue": "绿币余额", + "huixiangqianbao": "回乡钱包", + "zongzichan": "总资产", + "zongzichanyuan": "总资产(元)", + "huodongyue": "活动余额", + "xiaofeijilu": "消费记录", + "muqianwujilu": "目前暂未记录哦", + "pingtaizongyue": "平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 5058fd70..4a987f3b 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -628,6 +628,17 @@ "zhanghaoanquan": "账号安全", "pingtaizhifumima": "平台支付密码", "fasongduanxin": "发送短信", + "yue__": "余额 {yue}", + "lvbiyue_": "绿币余额 {yue}", + "huodongyue_": "活动余额 {yue}", + "lvbiyue": "绿币余额", + "huixiangqianbao": "回乡钱包", + "zongzichan": "总资产", + "zongzichanyuan": "总资产(元)", + "huodongyue": "活动余额", + "xiaofeijilu": "消费记录", + "muqianwujilu": "目前暂未记录哦", + "pingtaizongyue": "平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index b952aa89..a5d6b975 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -620,6 +620,19 @@ "zhanghaoanquan": "賬號安全", "pingtaizhifumima": "平臺支付密碼", "fasongduanxin": "發送短信", + "lvbiyue_": "綠幣餘額 {yue}", + "huodongyue_": "活動餘額 {yue}", + "lvbiyue": "綠幣餘額", + "huixiangqianbao": "回鄉錢包", + "zongzichan": "總資產", + "zongzichanyuan": "總資產(元)", + "huodongyue": "活動餘額", + "xiaofeijilu": "消費記錄", + "muqianwujilu": "目前暫無記錄哦", + "yue__": "餘額 {yue}", + "lvbiyue": "綠幣餘額 {yue}", + "huodongyue": "活動餘額 {yue}", + "pingtaizongyue": "平台總餘額：{zongyue}（活動餘額{huodongyue} 綠幣餘額{lvbiyue}） ", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 65bde74b..2bcfb0b0 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -622,8 +622,19 @@ "zhanghaoanquan": "賬號安全", "pingtaizhifumima": "平臺支付密碼", "fasongduanxin": "發送短信", - - + "lvbiyue_": "綠幣餘額 {yue}", + "huodongyue_": "活動餘額 {yue}", + "lvbiyue": "綠幣餘額", + "huixiangqianbao": "回鄉錢包", + "zongzichan": "總資產", + "zongzichanyuan": "總資產(元)", + "huodongyue": "活動餘額", + "xiaofeijilu": "消費記錄", + "muqianwujilu": "目前暫無記錄哦", + "yue__": "餘額 {yue}", + "lvbiyue": "綠幣餘額 {yue}", + "huodongyue": "活動餘額 {yue}", + "pingtaizongyue": "平台總餘額：{zongyue}（活動餘額{huodongyue} 綠幣餘額{lvbiyue}） ", diff --git a/lib/mine/mine_view/mine_item.dart b/lib/mine/mine_view/mine_item.dart index 4ac8e307..3bce18a5 100644 --- a/lib/mine/mine_view/mine_item.dart +++ b/lib/mine/mine_view/mine_item.dart @@ -165,7 +165,7 @@ class _MineItem extends State { }); }, child: mineItem( - S.of(context).pingtaiyue, + S.of(context).huixiangqianbao, "assets/image/platform_yue.webp", ), ),), diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index 7dcbcd4d..aeb6eca8 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -28,6 +28,8 @@ class MineWalletPage extends StatefulWidget { class _MineWalletPage extends State { dynamic mBalance = 0; dynamic mgreenMoney = 0; + dynamic tBalance = 0; + dynamic activityMoney = 0; @override void initState() { @@ -47,6 +49,8 @@ class _MineWalletPage extends State { UserInfo.fromJson(jsonDecode(sharedPreferences.getString('user'))); mBalance = double.tryParse(userInfo.money); mgreenMoney = double.tryParse(userInfo.greenMoney); + tBalance = double.tryParse(userInfo.balance ?? "0"); + activityMoney = double.tryParse(userInfo.activityMoney); if (mounted) setState(() {}); String token = sharedPreferences.getString("token"); apiService = ApiService(Dio(), context: context, token: token); @@ -105,7 +109,7 @@ class _MineWalletPage extends State { Widget build(BuildContext context) { return Scaffold( appBar: MyAppBar( - title: S.of(context).pingtaiyue, + title: S.of(context).huixiangqianbao, titleColor: Colors.black, background: Color(0xFFF7F7F7), leadingColor: Colors.black, @@ -144,22 +148,23 @@ class _MineWalletPage extends State { margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 0), padding: EdgeInsets.fromLTRB(24.w, 24.h, 24.w, 24.h), decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.all(Radius.circular(8)), - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(25), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0, - ) - ]), + color: Colors.white, + borderRadius: BorderRadius.all(Radius.circular(8)), + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(25), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ) + ], + ), child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "消费记录", + S.of(context).xiaofeijilu, style: TextStyle( fontWeight: FontWeight.bold, color: Colors.black, @@ -170,12 +175,11 @@ class _MineWalletPage extends State { height: 16.h, ), Container( - margin: EdgeInsets.only(top: 14.h), child: (userBills == null || userBills.length == 0) ? NoDataView( src: "assets/image/xiao_fei.webp", isShowBtn: false, - text: "目前暂未记录哦", + text: S.of(context).muqianwujilu, fontSize: 16.sp, margin: EdgeInsets.only(top: 120.h), ) @@ -186,7 +190,8 @@ class _MineWalletPage extends State { physics: NeverScrollableScrollPhysics(), itemBuilder: (context, position) { return historyItem(userBills[position], position); - }), + }, + ), ), ], ), @@ -196,74 +201,117 @@ class _MineWalletPage extends State { Widget historyItem(UserBill userBill, position) { return Container( margin: EdgeInsets.only(top: 10.h, bottom: 10.h), - child: Row( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Image.asset( - userBill.pm == 0 - ? "assets/image/icon_wallet_withdrawal.webp" - : "assets/image/icon_wallet_recharge.webp", - width: 34.w, - height: 34.h, - ), - SizedBox( - width: 12.w, - ), - Expanded( - flex: 1, - child: Container( - // height: 34.h, - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - userBill.name, - style: TextStyle( - color: Colors.black, - fontSize: 12.sp, - ), - ), - Text( - userBill.createTime, - style: TextStyle( - color: Color(0xFF727272), - fontSize: 10.sp, - ), - ) - ], + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + userBill.name, + style: TextStyle( + color: Colors.black, + fontSize: 12.sp, + ), ), - ), + Text( + calculateBalance(userBill, 0), + style: TextStyle( + color: Color(0xFF20662A), + fontWeight: FontWeight.bold, + fontSize: 12.sp, + ), + ), + ], ), - Container( - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.end, - children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + userBill.createTime, + style: TextStyle( + color: Color(0xFF727272), + fontSize: 10.sp, + ), + ), Text( - userBill.pm == 0 - ? "-${userBill.number}" - : "+${userBill.number}", + calculateBalance(userBill, 1), style: TextStyle( color: Color(0xFF20662A), fontWeight: FontWeight.bold, fontSize: 12.sp, ), ), - Text( - S.of(context).yue_(userBill.balance), - style: TextStyle( - color: Color(0xFF727272), - fontSize: 10.sp, - ), - ) - ], - ), - ) + ], + ), + SizedBox( + height: 4, + ), + Row( + children: [ + Expanded(flex: 1, child: Text( + S.of(context).pingtaizongyue(userBill.balance, + userBill.surplusActivityMoney, userBill.surplusGreenMoney), + style: TextStyle( + color: Color(0xFF727272), + fontSize: 10.sp, + ), + )), + Text( + calculateBalance(userBill, 2), + style: TextStyle( + color: Color(0xFF20662A), + fontWeight: FontWeight.bold, + fontSize: 12.sp, + ), + ), + ], + ), ], ), ); } + bool isZero(String money) { + if (money == null || money.isEmpty) return true; + double zero = double.tryParse(money); + return zero == 0; + } + + calculateBalance(UserBill userBill, int index) { + String greenMoney = userBill.greenMoney; + String activityMoney = userBill.activityMoney; + String number = userBill.number; + double balance = double.tryParse(number ?? "0"); + double money = double.tryParse(greenMoney ?? "0"); + double activity = double.tryParse(activityMoney ?? "0"); + if (index == 0) { + if (money > 0) { + return S.of(context).lvbiyue_("${userBill.pm == 0 ? '-' : '+'}$money"); + } + if (activity > 0) { + return S.of(context).huodongyue_("${userBill.pm == 0 ? '-' : '+'}$activity"); + } + return S.of(context).yue__("${userBill.pm == 0 ? '-' : '+'}$balance"); + } else if (index == 1) { + if (activity > 0) { + return S.of(context).huodongyue_("${userBill.pm == 0 ? '-' : '+'}$activity"); + } + if (money > 0) { + return S.of(context).yue__("${userBill.pm == 0 ? '-' : '+'}${(balance - money)}"); + } else { + return ""; + } + } else { + if (activity > 0 && money > 0) { + return S.of(context).yue__("${userBill.pm == 0 ? '-' : '+'}${(balance - money - activity)}"); + } else { + return ""; + } + } + } + //assets/image/recharge,Btn.png Widget balance() { return Container( @@ -291,8 +339,11 @@ class _MineWalletPage extends State { top: 24, ), child: Text( - "总资产(元)", - style: TextStyle(color: Colors.white, fontSize: 16), + S.of(context).zongzichanyuan, + style: TextStyle( + color: Colors.white, + fontSize: 16, + ), ), ), Expanded( @@ -314,7 +365,7 @@ class _MineWalletPage extends State { flex: 1, ), InkWell( - onTap: (){ + onTap: () { toRecharge(); }, child: SizedBox( @@ -325,24 +376,27 @@ class _MineWalletPage extends State { Positioned.fill( child: Image.asset( "assets/image/rechargeBtn.png", + height: 46.h, + width: 87.w, fit: BoxFit.fill, ), ), Positioned( - left: 14.w, - top: 0, - bottom: 0, - child: Container( - alignment: Alignment.centerLeft, - child: Text( - "充值", - style: TextStyle( - fontSize: 18, - fontWeight: MyFontWeight.semi_bold, - color: Color(0xFF32A060), - ), + left: 14.w, + top: 0, + bottom: 0, + child: Container( + alignment: Alignment.centerLeft, + child: Text( + S.of(context).chongzhi, + style: TextStyle( + fontSize: 18, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xFF32A060), ), - )), + ), + ), + ), ], ), ), @@ -351,40 +405,103 @@ class _MineWalletPage extends State { ), flex: 1, ), - if(userInfo != null && userInfo.greenMoney != null && userInfo.greenMoney.isNotEmpty && double.tryParse(userInfo.greenMoney) > 0) SizedBox( height: 22, ), - if(userInfo != null && userInfo.greenMoney != null && userInfo.greenMoney.isNotEmpty && double.tryParse(userInfo.greenMoney) > 0) - Padding( - padding: EdgeInsets.only( - left: 24, - ), - child: Text( - "绿币余额", - style: TextStyle( - fontSize: 16, - fontWeight: MyFontWeight.semi_bold, - color: Colors.white, - ), - ), - ), - if(userInfo != null && userInfo.greenMoney != null && userInfo.greenMoney.isNotEmpty && double.tryParse(userInfo.greenMoney) > 0) - SizedBox( - height: 8, - ), - if(userInfo != null && userInfo.greenMoney != null && userInfo.greenMoney.isNotEmpty && double.tryParse(userInfo.greenMoney) > 0) Padding( - padding: EdgeInsets.only( - left: 24, + padding: EdgeInsets.symmetric( + horizontal: 24, ), - child: Text( - "$mgreenMoney", - style: TextStyle( - fontSize: 24, - fontWeight: MyFontWeight.semi_bold, - color: Colors.white, - ), + child: Row( + children: [ + Expanded( + flex: 1, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + S.of(context).yue, + style: TextStyle( + fontSize: 14, + fontWeight: MyFontWeight.semi_bold, + color: Colors.white, + ), + ), + SizedBox( + height: 4, + ), + Text( + "$tBalance", + style: TextStyle( + fontSize: 18, + fontWeight: MyFontWeight.semi_bold, + color: Colors.white, + ), + ), + ], + ), + ), + SizedBox( + height: 8, + ), + Expanded( + flex: 1, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + S.of(context).huodongyue, + style: TextStyle( + fontSize: 14, + fontWeight: MyFontWeight.semi_bold, + color: Colors.white, + ), + ), + SizedBox( + height: 4, + ), + Text( + "$activityMoney", + style: TextStyle( + fontSize: 18, + fontWeight: MyFontWeight.semi_bold, + color: Colors.white, + ), + ), + ], + ), + ), + SizedBox( + height: 8, + ), + Expanded( + flex: 1, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + S.of(context).lvbiyue, + style: TextStyle( + fontSize: 14, + fontWeight: MyFontWeight.semi_bold, + color: Colors.white, + ), + ), + SizedBox( + height: 4, + ), + Text( + "$mgreenMoney", + style: TextStyle( + fontSize: 18, + fontWeight: MyFontWeight.semi_bold, + color: Colors.white, + ), + ), + ], + ), + ), + ], ), ), SizedBox( @@ -423,7 +540,7 @@ class _MineWalletPage extends State { Align( alignment: Alignment.center, child: Text( - "总资产", + S.of(context).zongzichan, style: TextStyle( fontWeight: MyFontWeight.semi_bold, color: Color(0xFF353535), diff --git a/lib/retrofit/data/user_bill.dart b/lib/retrofit/data/user_bill.dart index 56d5d34a..173de5bb 100644 --- a/lib/retrofit/data/user_bill.dart +++ b/lib/retrofit/data/user_bill.dart @@ -1,58 +1,30 @@ -/// id : "1413347011645669376" -/// createTime : "2021-07-09 11:59:21" -/// createUser : "1406879717390286848" -/// updateTime : "2021-07-09 11:59:21" -/// updateUser : "1406879717390286848" -/// mid : "1406879717390286848" -/// linkId : "0" -/// pm : 1 -/// title : "bill_title_point" -/// category : "bill_cate_point_get" -/// type : "bill_type_point_signin" -/// number : "10.00" -/// balance : "30.00" +import 'dart:convert'; +/// id : "1557965116232695808" +/// createTime : "2022-08-12 13:40:04" +/// createUser : "1333246101196636160" +/// updateTime : "2022-08-12 13:40:04" +/// updateUser : "1333246101196636160" +/// mid : "1330775037745037312" +/// linkId : "202208121339050002" +/// pm : 0 +/// title : "bill_title_balance" +/// category : "bill_cate_buy" +/// type : "bill_type_zswpay" +/// number : "0.01" +/// realNumber : "0.00" +/// activityMoney : "0.00" +/// surplusActivityMoney : "0.00" +/// greenMoney : "0.00" +/// surplusGreenMoney : "0.00" +/// balance : "218.51" /// mark : "" /// status : true /// isDeleted : false -/// name : "签到" +/// name : "平台会员余额支付" +UserBill userBillFromJson(String str) => UserBill.fromJson(json.decode(str)); +String userBillToJson(UserBill data) => json.encode(data.toJson()); class UserBill { - String _id; - String _createTime; - String _createUser; - String _updateTime; - String _updateUser; - String _mid; - String _linkId; - int _pm; - String _title; - String _category; - String _type; - String _number; - String _balance; - String _mark; - bool _status; - bool _isDeleted; - String _name; - - String get id => _id; - String get createTime => _createTime; - String get createUser => _createUser; - String get updateTime => _updateTime; - String get updateUser => _updateUser; - String get mid => _mid; - String get linkId => _linkId; - int get pm => _pm; - String get title => _title; - String get category => _category; - String get type => _type; - String get number => _number; - String get balance => _balance; - String get mark => _mark; - bool get status => _status; - bool get isDeleted => _isDeleted; - String get name => _name; - UserBill({ String id, String createTime, @@ -66,11 +38,16 @@ class UserBill { String category, String type, String number, + String realNumber, + String activityMoney, + String surplusActivityMoney, + String greenMoney, + String surplusGreenMoney, String balance, String mark, bool status, bool isDeleted, - String name}){ + String name,}){ _id = id; _createTime = createTime; _createUser = createUser; @@ -83,6 +60,11 @@ class UserBill { _category = category; _type = type; _number = number; + _realNumber = realNumber; + _activityMoney = activityMoney; + _surplusActivityMoney = surplusActivityMoney; + _greenMoney = greenMoney; + _surplusGreenMoney = surplusGreenMoney; _balance = balance; _mark = mark; _status = status; @@ -91,44 +73,143 @@ class UserBill { } UserBill.fromJson(dynamic json) { - _id = json["id"]; - _createTime = json["createTime"]; - _createUser = json["createUser"]; - _updateTime = json["updateTime"]; - _updateUser = json["updateUser"]; - _mid = json["mid"]; - _linkId = json["linkId"]; - _pm = json["pm"]; - _title = json["title"]; - _category = json["category"]; - _type = json["type"]; - _number = json["number"]; - _balance = json["balance"]; - _mark = json["mark"]; - _status = json["status"]; - _isDeleted = json["isDeleted"]; - _name = json["name"]; + _id = json['id']; + _createTime = json['createTime']; + _createUser = json['createUser']; + _updateTime = json['updateTime']; + _updateUser = json['updateUser']; + _mid = json['mid']; + _linkId = json['linkId']; + _pm = json['pm']; + _title = json['title']; + _category = json['category']; + _type = json['type']; + _number = json['number']; + _realNumber = json['realNumber']; + _activityMoney = json['activityMoney']; + _surplusActivityMoney = json['surplusActivityMoney']; + _greenMoney = json['greenMoney']; + _surplusGreenMoney = json['surplusGreenMoney']; + _balance = json['balance']; + _mark = json['mark']; + _status = json['status']; + _isDeleted = json['isDeleted']; + _name = json['name']; } + String _id; + String _createTime; + String _createUser; + String _updateTime; + String _updateUser; + String _mid; + String _linkId; + int _pm; + String _title; + String _category; + String _type; + String _number; + String _realNumber; + String _activityMoney; + String _surplusActivityMoney; + String _greenMoney; + String _surplusGreenMoney; + String _balance; + String _mark; + bool _status; + bool _isDeleted; + String _name; +UserBill copyWith({ String id, + String createTime, + String createUser, + String updateTime, + String updateUser, + String mid, + String linkId, + int pm, + String title, + String category, + String type, + String number, + String realNumber, + String activityMoney, + String surplusActivityMoney, + String greenMoney, + String surplusGreenMoney, + String balance, + String mark, + bool status, + bool isDeleted, + String name, +}) => UserBill( id: id ?? _id, + createTime: createTime ?? _createTime, + createUser: createUser ?? _createUser, + updateTime: updateTime ?? _updateTime, + updateUser: updateUser ?? _updateUser, + mid: mid ?? _mid, + linkId: linkId ?? _linkId, + pm: pm ?? _pm, + title: title ?? _title, + category: category ?? _category, + type: type ?? _type, + number: number ?? _number, + realNumber: realNumber ?? _realNumber, + activityMoney: activityMoney ?? _activityMoney, + surplusActivityMoney: surplusActivityMoney ?? _surplusActivityMoney, + greenMoney: greenMoney ?? _greenMoney, + surplusGreenMoney: surplusGreenMoney ?? _surplusGreenMoney, + balance: balance ?? _balance, + mark: mark ?? _mark, + status: status ?? _status, + isDeleted: isDeleted ?? _isDeleted, + name: name ?? _name, +); + String get id => _id; + String get createTime => _createTime; + String get createUser => _createUser; + String get updateTime => _updateTime; + String get updateUser => _updateUser; + String get mid => _mid; + String get linkId => _linkId; + int get pm => _pm; + String get title => _title; + String get category => _category; + String get type => _type; + String get number => _number; + String get realNumber => _realNumber; + String get activityMoney => _activityMoney; + String get surplusActivityMoney => _surplusActivityMoney; + String get greenMoney => _greenMoney; + String get surplusGreenMoney => _surplusGreenMoney; + String get balance => _balance; + String get mark => _mark; + bool get status => _status; + bool get isDeleted => _isDeleted; + String get name => _name; Map toJson() { - var map = {}; - map["id"] = _id; - map["createTime"] = _createTime; - map["createUser"] = _createUser; - map["updateTime"] = _updateTime; - map["updateUser"] = _updateUser; - map["mid"] = _mid; - map["linkId"] = _linkId; - map["pm"] = _pm; - map["title"] = _title; - map["category"] = _category; - map["type"] = _type; - map["number"] = _number; - map["balance"] = _balance; - map["mark"] = _mark; - map["status"] = _status; - map["isDeleted"] = _isDeleted; - map["name"] = _name; + final map = {}; + map['id'] = _id; + map['createTime'] = _createTime; + map['createUser'] = _createUser; + map['updateTime'] = _updateTime; + map['updateUser'] = _updateUser; + map['mid'] = _mid; + map['linkId'] = _linkId; + map['pm'] = _pm; + map['title'] = _title; + map['category'] = _category; + map['type'] = _type; + map['number'] = _number; + map['realNumber'] = _realNumber; + map['activityMoney'] = _activityMoney; + map['surplusActivityMoney'] = _surplusActivityMoney; + map['greenMoney'] = _greenMoney; + map['surplusGreenMoney'] = _surplusGreenMoney; + map['balance'] = _balance; + map['mark'] = _mark; + map['status'] = _status; + map['isDeleted'] = _isDeleted; + map['name'] = _name; return map; } diff --git a/lib/retrofit/data/user_info.dart b/lib/retrofit/data/user_info.dart index 9199e9ab..df218a1f 100644 --- a/lib/retrofit/data/user_info.dart +++ b/lib/retrofit/data/user_info.dart @@ -32,6 +32,7 @@ class UserInfo { String birth; dynamic balance; String money; + String activityMoney; String expendAmount; String points; String greenMoney; @@ -63,6 +64,7 @@ class UserInfo { ..birth = json['birth'] as String ..balance = json['balance'] ..money = json['money'] as String + ..activityMoney = json['activityMoney'] as String ..expendAmount = json['expendAmount'] as String ..points = json['points'] as String ..greenMoney = json['greenMoney'] as String @@ -93,6 +95,7 @@ class UserInfo { 'birth': this.birth, 'balance': this.balance, 'money': this.money, + 'activityMoney': this.activityMoney, 'expendAmount': this.expendAmount, 'points': this.points, 'greenMoney': this.greenMoney, diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index fabaf924..2bb2adca 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -71,7 +71,7 @@ part 'retrofit_api.g.dart'; // const base_url = "http://192.168.10.132:8766/app/";///詹云久 -const localBaseUrl = "http://192.168.10.236:8766/app/";///本地 +const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///本地 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 @RestApi(baseUrl: localBaseUrl) diff --git a/lib/view_widget/keyboard/keyboard_widget.dart b/lib/view_widget/keyboard/keyboard_widget.dart index 8a3f57e6..6d655456 100644 --- a/lib/view_widget/keyboard/keyboard_widget.dart +++ b/lib/view_widget/keyboard/keyboard_widget.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:huixiang/view_widget/keyboard/custom_keyboard_button.dart'; -import 'package:huixiang/view_widget/keyboard/pay_password.dart'; +import 'package:huixiang/view_widget/keyboard/pay_password.dart' as key; /// 自定义密码 键盘 class MyKeyboard extends StatefulWidget { @@ -22,52 +22,52 @@ class MyKeyboardStat extends State { var backMethod; void onCommitChange() { - widget.callback(KeyEvent("commit")); + widget.callback(key.KeyEvent("commit")); } void onOneChange(BuildContext cont) { - widget.callback(KeyEvent("1")); + widget.callback(key.KeyEvent("1")); } void onTwoChange(BuildContext cont) { - widget.callback(KeyEvent("2")); + widget.callback(key.KeyEvent("2")); } void onThreeChange(BuildContext cont) { - widget.callback(KeyEvent("3")); + widget.callback(key.KeyEvent("3")); } void onFourChange(BuildContext cont) { - widget.callback(KeyEvent("4")); + widget.callback(key.KeyEvent("4")); } void onFiveChange(BuildContext cont) { - widget.callback(KeyEvent("5")); + widget.callback(key.KeyEvent("5")); } void onSixChange(BuildContext cont) { - widget.callback(KeyEvent("6")); + widget.callback(key.KeyEvent("6")); } void onSevenChange(BuildContext cont) { - widget.callback(KeyEvent("7")); + widget.callback(key.KeyEvent("7")); } void onEightChange(BuildContext cont) { - widget.callback(KeyEvent("8")); + widget.callback(key.KeyEvent("8")); } void onNineChange(BuildContext cont) { - widget.callback(KeyEvent("9")); + widget.callback(key.KeyEvent("9")); } void onZeroChange(BuildContext cont) { - widget.callback(KeyEvent("0")); + widget.callback(key.KeyEvent("0")); } /// 点击删除 void onDeleteChange() { - widget.callback(KeyEvent("del")); + widget.callback(key.KeyEvent("del")); } @override diff --git a/pubspec.lock b/pubspec.lock index cb05bd1a..b7af35cf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,161 +5,161 @@ packages: dependency: "direct main" description: name: ai_decimal_accuracy - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" android_intent_plus: dependency: "direct main" description: name: android_intent_plus - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.8.2" barcode: dependency: transitive description: name: barcode - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.0" barcode_widget: dependency: "direct main" description: name: barcode_widget - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.0" bubble_tab_indicator: dependency: "direct main" description: name: bubble_tab_indicator - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.6" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" charcode: dependency: transitive description: name: charcode - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.1" chewie: dependency: transitive description: name: chewie - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.3" chewie_audio: dependency: "direct main" description: name: chewie_audio - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.16.0" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.5" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.17.2" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.5" dio: dependency: "direct main" description: name: dio - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.10" event_bus: dependency: "direct main" description: name: event_bus - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.0" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "6.1.2" + version: "6.1.4" flare_flutter: dependency: "direct main" description: name: flare_flutter - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.2" flutter: @@ -171,56 +171,56 @@ packages: dependency: "direct main" description: name: flutter_baidu_mapapi_base - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" flutter_baidu_mapapi_map: dependency: "direct main" description: name: flutter_baidu_mapapi_map - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" flutter_baidu_mapapi_search: dependency: "direct main" description: name: flutter_baidu_mapapi_search - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" flutter_baidu_mapapi_utils: dependency: "direct main" description: name: flutter_baidu_mapapi_utils - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" flutter_bmflocation: dependency: "direct main" description: name: flutter_bmflocation - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.4" flutter_easyloading: dependency: "direct main" description: name: flutter_easyloading - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.5" flutter_html: dependency: "direct main" description: name: flutter_html - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.1" flutter_layout_grid: dependency: transitive description: name: flutter_layout_grid - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.6" flutter_localizations: @@ -232,70 +232,70 @@ packages: dependency: transitive description: name: flutter_math_fork - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.4.2+2" flutter_page_indicator: dependency: transitive description: name: flutter_page_indicator - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.0.3" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.11" flutter_screenutil: dependency: "direct main" description: name: flutter_screenutil - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "5.5.3+2" flutter_slidable: dependency: "direct main" description: name: flutter_slidable - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.2" flutter_smart_dialog: dependency: "direct main" description: name: flutter_smart_dialog - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.3.8" flutter_spinkit: dependency: "direct main" description: name: flutter_spinkit - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "5.1.0" flutter_staggered_grid_view: dependency: "direct main" description: name: flutter_staggered_grid_view - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.4.1" flutter_svg: dependency: "direct main" description: name: flutter_svg - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.22.0" flutter_swiper: dependency: "direct main" description: name: flutter_swiper - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.6" flutter_test: @@ -312,378 +312,378 @@ packages: dependency: "direct main" description: name: fluwx - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.9.1" font_awesome_flutter: dependency: "direct main" description: name: font_awesome_flutter - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "9.2.0" gradient_widgets: dependency: "direct main" description: name: gradient_widgets - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.6.0" graphs: dependency: transitive description: name: graphs - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.0" html: dependency: transitive description: name: html - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.15.0" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.4" image_pickers: dependency: "direct main" description: name: image_pickers - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0+2" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.17.0" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.6.4" json_annotation: dependency: "direct main" description: name: json_annotation - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.1" keframe: dependency: "direct main" description: name: keframe - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.0" like_button: dependency: "direct main" description: name: like_button - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.4" logger: dependency: "direct main" description: name: logger - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.12.11" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.4" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.7.0" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.0" network_to_file_image: dependency: "direct main" description: name: network_to_file_image - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "4.0.1" numerus: dependency: transitive description: name: numerus - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.1" package_info: dependency: "direct main" description: name: package_info - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.2" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.8.1" path_drawing: dependency: transitive description: name: path_drawing - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.5.1+1" path_parsing: dependency: transitive description: name: path_parsing - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.1" path_provider: dependency: "direct main" description: name: path_provider - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.7" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.2" permission_handler: dependency: "direct main" description: name: permission_handler - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "5.1.0+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.2" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "5.0.0" photo_view: dependency: "direct main" description: name: photo_view - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.13.0" pin_input_text_field: dependency: "direct main" description: name: pin_input_text_field - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "4.1.2" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.3" process: dependency: transitive description: name: process - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "4.2.4" provider: dependency: transitive description: name: provider - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "6.0.3" pull_to_refresh: dependency: "direct main" description: name: pull_to_refresh - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" qr: dependency: transitive description: name: qr - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.0" qr_flutter: dependency: "direct main" description: name: qr_flutter - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "4.0.0" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.0" retrofit: dependency: "direct main" description: name: retrofit - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.4+1" rive: dependency: "direct main" description: name: rive - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.6.8" rxdart: dependency: "direct main" description: name: rxdart - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.26.0" scan: dependency: "direct main" description: name: scan - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.6.0" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.15" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.12" shared_preferences_ios: dependency: transitive description: name: shared_preferences_ios - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.4" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.4" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" sharesdk_plugin: dependency: "direct main" description: name: sharesdk_plugin - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.4" simple_gesture_detector: dependency: transitive description: name: simple_gesture_detector - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.6" sky_engine: @@ -695,56 +695,56 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.8.2" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" table_calendar: dependency: "direct main" description: name: table_calendar - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.3.3" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.4.9" thumbnails: dependency: "direct main" description: name: thumbnails - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.1" tpns_flutter_plugin: @@ -760,175 +760,175 @@ packages: dependency: transitive description: name: transformer_page_view - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.6" tuple: dependency: transitive description: name: tuple - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.1" url_launcher: dependency: "direct main" description: name: url_launcher - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "5.7.10" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.0.1+4" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.0.1+9" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.9" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.5+3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.0.1+3" uuid: dependency: transitive description: name: uuid - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.2" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.2" video_player: dependency: "direct main" description: name: video_player - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.19" video_player_android: dependency: transitive description: name: video_player_android - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.3.4" video_player_avfoundation: dependency: transitive description: name: video_player_avfoundation - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.3.5" video_player_platform_interface: dependency: transitive description: name: video_player_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "4.2.0" video_player_web: dependency: transitive description: name: video_player_web - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.12" wakelock: dependency: transitive description: name: wakelock - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.6.2" wakelock_macos: dependency: transitive description: name: wakelock_macos - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.4.0" wakelock_platform_interface: dependency: transitive description: name: wakelock_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.3.0" wakelock_web: dependency: transitive description: name: wakelock_web - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.4.0" wakelock_windows: dependency: transitive description: name: wakelock_windows - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.0" webview_flutter: dependency: transitive description: name: webview_flutter - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.14" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.7.0" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.0+1" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "5.4.1" sdks: diff --git a/pubspec.yaml b/pubspec.yaml index 3f0dea1f..d30ce0e3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -97,9 +97,6 @@ dependencies: flutter_slidable: ^1.3.0 - - - dev_dependencies: flutter_test: sdk: flutter From 7aada77339c0ce9e4e81593c044a8dca675f3ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= Date: Wed, 24 Aug 2022 16:07:31 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=9B=9E=E9=84=89=E9=8C=A2=E5=8C=85?= =?UTF-8?q?=EF=BC=8CUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mine/mine_wallet_page.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index aeb6eca8..1d8e0351 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -60,6 +60,7 @@ class _MineWalletPage extends State { _onRefresh() { current = 1; loadBillInfo(); + queryUserBalance(); } queryUserBalance() async { @@ -68,6 +69,9 @@ class _MineWalletPage extends State { if (baseData != null && baseData.isSuccess) { userInfo = baseData.data; mBalance = double.tryParse(userInfo.money); + mgreenMoney = double.tryParse(userInfo.greenMoney); + tBalance = double.tryParse(userInfo.balance ?? "0"); + activityMoney = double.tryParse(userInfo.activityMoney); if (mounted) setState(() {}); } } From eb78e9048706cd08b86f23acb8300d0ef4f3123b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= Date: Wed, 24 Aug 2022 16:07:51 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=9B=9E=E9=84=89=E9=8C=A2=E5=8C=85?= =?UTF-8?q?=EF=BC=8CUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mine/mine_wallet_page.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index 1d8e0351..aecccfbe 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -60,7 +60,6 @@ class _MineWalletPage extends State { _onRefresh() { current = 1; loadBillInfo(); - queryUserBalance(); } queryUserBalance() async { From 6738e0e2ac066a2a1dc02e3911c5ee092d804bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= Date: Thu, 25 Aug 2022 10:53:59 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=9B=9E=E9=84=89=E9=8C=A2=E5=8C=85?= =?UTF-8?q?=EF=BC=8CUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/retrofit/retrofit_api.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 2bb2adca..fabaf924 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -71,7 +71,7 @@ part 'retrofit_api.g.dart'; // const base_url = "http://192.168.10.132:8766/app/";///詹云久 -const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///本地 +const localBaseUrl = "http://192.168.10.236:8766/app/";///本地 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 @RestApi(baseUrl: localBaseUrl) From d4e4e155a67550e820942d02a1ece57525c79b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= Date: Thu, 25 Aug 2022 15:23:14 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E5=9B=9E=E9=84=89=E9=8C=A2=E5=8C=85?= =?UTF-8?q?=EF=BC=8CUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mine/mine_wallet_page.dart | 213 +++++++++++++++++++++++++-------- 1 file changed, 160 insertions(+), 53 deletions(-) diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index aecccfbe..1adc710a 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:dio/dio.dart'; +import 'package:flare_flutter/base/actor_ellipse.dart'; import 'package:flutter/material.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; @@ -49,8 +50,8 @@ class _MineWalletPage extends State { UserInfo.fromJson(jsonDecode(sharedPreferences.getString('user'))); mBalance = double.tryParse(userInfo.money); mgreenMoney = double.tryParse(userInfo.greenMoney); - tBalance = double.tryParse(userInfo.balance ?? "0"); activityMoney = double.tryParse(userInfo.activityMoney); + tBalance = mBalance - (mgreenMoney ?? 0) - (activityMoney ?? 0); if (mounted) setState(() {}); String token = sharedPreferences.getString("token"); apiService = ApiService(Dio(), context: context, token: token); @@ -67,10 +68,10 @@ class _MineWalletPage extends State { await apiService.queryInfo().catchError((onError) {}); if (baseData != null && baseData.isSuccess) { userInfo = baseData.data; - mBalance = double.tryParse(userInfo.money); mgreenMoney = double.tryParse(userInfo.greenMoney); - tBalance = double.tryParse(userInfo.balance ?? "0"); activityMoney = double.tryParse(userInfo.activityMoney); + mBalance = double.tryParse(userInfo.money); + tBalance = mBalance - (mgreenMoney ?? 0) - (activityMoney ?? 0); if (mounted) setState(() {}); } } @@ -211,19 +212,46 @@ class _MineWalletPage extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text( - userBill.name, - style: TextStyle( - color: Colors.black, - fontSize: 12.sp, - ), - ), - Text( - calculateBalance(userBill, 0), - style: TextStyle( - color: Color(0xFF20662A), - fontWeight: FontWeight.bold, - fontSize: 12.sp, + Expanded( + flex: 7, + child: Text( + userBill.name, + style: TextStyle( + color: Colors.black, + fontSize: 12.sp, + ), + )), + Expanded( + flex: 4, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: calculateBalance(userBill, 0) + .map( + (e) => e == S.of(context).yue + ? Container( + width: e == S.of(context).yue + ? (12.sp * 4) + : double.infinity, + alignment: Alignment.centerRight, + child: Text( + e, + style: TextStyle( + color: Color(0xFF20662A), + fontWeight: FontWeight.bold, + fontSize: 12.sp, + ), + ), + ) + : Text( + e, + style: TextStyle( + color: Color(0xFF20662A), + fontWeight: FontWeight.bold, + fontSize: 12.sp, + ), + ), + ) + .toList(), ), ), ], @@ -231,19 +259,48 @@ class _MineWalletPage extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text( - userBill.createTime, - style: TextStyle( - color: Color(0xFF727272), - fontSize: 10.sp, + Expanded( + flex: 7, + child: Text( + userBill.createTime, + style: TextStyle( + color: Color(0xFF727272), + fontSize: 10.sp, + ), ), ), - Text( - calculateBalance(userBill, 1), - style: TextStyle( - color: Color(0xFF20662A), - fontWeight: FontWeight.bold, - fontSize: 12.sp, + if (calculateBalance(userBill, 1).isNotEmpty) + Expanded( + flex: 4, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: calculateBalance(userBill, 1) + .map( + (e) => e == S.of(context).yue + ? Container( + width: e == S.of(context).yue + ? (12.sp * 4) + : double.infinity, + alignment: Alignment.centerRight, + child: Text( + e, + style: TextStyle( + color: Color(0xFF20662A), + fontWeight: FontWeight.bold, + fontSize: 12.sp, + ), + ), + ) + : Text( + e, + style: TextStyle( + color: Color(0xFF20662A), + fontWeight: FontWeight.bold, + fontSize: 12.sp, + ), + ), + ) + .toList(), ), ), ], @@ -253,22 +310,52 @@ class _MineWalletPage extends State { ), Row( children: [ - Expanded(flex: 1, child: Text( - S.of(context).pingtaizongyue(userBill.balance, - userBill.surplusActivityMoney, userBill.surplusGreenMoney), - style: TextStyle( - color: Color(0xFF727272), - fontSize: 10.sp, - ), - )), - Text( - calculateBalance(userBill, 2), - style: TextStyle( - color: Color(0xFF20662A), - fontWeight: FontWeight.bold, - fontSize: 12.sp, + Expanded( + flex: 7, + child: Text( + S.of(context).pingtaizongyue( + userBill.balance, + userBill.surplusActivityMoney, + userBill.surplusGreenMoney), + style: TextStyle( + color: Color(0xFF727272), + fontSize: 10.sp, + ), + )), + if (calculateBalance(userBill, 2).isNotEmpty) + Expanded( + flex: 4, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: calculateBalance(userBill, 2) + .map( + (e) => e == S.of(context).yue + ? Container( + width: e == S.of(context).yue + ? (12.sp * 4) + : double.infinity, + alignment: Alignment.centerRight, + child: Text( + e, + style: TextStyle( + color: Color(0xFF20662A), + fontWeight: FontWeight.bold, + fontSize: 12.sp, + ), + ), + ) + : Text( + e, + style: TextStyle( + color: Color(0xFF20662A), + fontWeight: FontWeight.bold, + fontSize: 12.sp, + ), + ), + ) + .toList(), + ), ), - ), ], ), ], @@ -282,35 +369,55 @@ class _MineWalletPage extends State { return zero == 0; } - calculateBalance(UserBill userBill, int index) { + List calculateBalance(UserBill userBill, int index) { + double tbalance = double.tryParse(userBill.balance ?? "0");/// 总余额 + String surplusGreenMoney = userBill.surplusGreenMoney; + String surplusActivityMoney = userBill.surplusActivityMoney; + double surplusMoney = double.tryParse(surplusGreenMoney ?? "0"); + double surplusActivity = double.tryParse(surplusActivityMoney ?? "0"); + + double balance = tbalance - (surplusMoney ?? 0) - (surplusActivity ?? 0); String greenMoney = userBill.greenMoney; String activityMoney = userBill.activityMoney; - String number = userBill.number; - double balance = double.tryParse(number ?? "0"); + double money = double.tryParse(greenMoney ?? "0"); double activity = double.tryParse(activityMoney ?? "0"); if (index == 0) { if (money > 0) { - return S.of(context).lvbiyue_("${userBill.pm == 0 ? '-' : '+'}$money"); + return [S.of(context).lvbiyue, "${userBill.pm == 0 ? '-' : '+'}$money"]; } if (activity > 0) { - return S.of(context).huodongyue_("${userBill.pm == 0 ? '-' : '+'}$activity"); + return [ + S.of(context).huodongyue, + "${userBill.pm == 0 ? '-' : '+'}$activity" + ]; + } + if (balance > 0) { + return [S.of(context).yue, "${userBill.pm == 0 ? '-' : '+'}$balance"]; } - return S.of(context).yue__("${userBill.pm == 0 ? '-' : '+'}$balance"); } else if (index == 1) { if (activity > 0) { - return S.of(context).huodongyue_("${userBill.pm == 0 ? '-' : '+'}$activity"); + return [ + S.of(context).huodongyue, + "${userBill.pm == 0 ? '-' : '+'}$activity" + ]; } if (money > 0) { - return S.of(context).yue__("${userBill.pm == 0 ? '-' : '+'}${(balance - money)}"); + return [ + S.of(context).yue, + "${userBill.pm == 0 ? '-' : '+'}${(balance - money)}" + ]; } else { - return ""; + return []; } } else { if (activity > 0 && money > 0) { - return S.of(context).yue__("${userBill.pm == 0 ? '-' : '+'}${(balance - money - activity)}"); + return [ + S.of(context).yue, + "${userBill.pm == 0 ? '-' : '+'}${(balance - money - activity)}" + ]; } else { - return ""; + return []; } } } From 262b6425a6a9c0289a15ca4cf338b8d94c38e07b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= Date: Thu, 25 Aug 2022 16:04:59 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E5=9B=9E=E9=84=89=E9=8C=A2=E5=8C=85?= =?UTF-8?q?=EF=BC=8CUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mine/mine_wallet_page.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index 1adc710a..04226422 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -370,7 +370,7 @@ class _MineWalletPage extends State { } List calculateBalance(UserBill userBill, int index) { - double tbalance = double.tryParse(userBill.balance ?? "0");/// 总余额 + double tbalance = double.tryParse(userBill.number ?? "0");/// 总余额 String surplusGreenMoney = userBill.surplusGreenMoney; String surplusActivityMoney = userBill.surplusActivityMoney; double surplusMoney = double.tryParse(surplusGreenMoney ?? "0"); @@ -402,7 +402,7 @@ class _MineWalletPage extends State { "${userBill.pm == 0 ? '-' : '+'}$activity" ]; } - if (money > 0) { + if (money > 0 && (balance - money) > 0) { return [ S.of(context).yue, "${userBill.pm == 0 ? '-' : '+'}${(balance - money)}" From 3c641425400fef0cc8eec7e4576d12380277e22d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= Date: Thu, 25 Aug 2022 16:18:11 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E5=9B=9E=E9=84=89=E9=8C=A2=E5=8C=85?= =?UTF-8?q?=EF=BC=8CUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mine/mine_wallet_page.dart | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index 04226422..34ec633c 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -311,17 +311,18 @@ class _MineWalletPage extends State { Row( children: [ Expanded( - flex: 7, - child: Text( - S.of(context).pingtaizongyue( - userBill.balance, - userBill.surplusActivityMoney, - userBill.surplusGreenMoney), - style: TextStyle( - color: Color(0xFF727272), - fontSize: 10.sp, - ), - )), + flex: 7, + child: Text( + S.of(context).pingtaizongyue( + userBill.balance, + userBill.surplusActivityMoney, + userBill.surplusGreenMoney), + style: TextStyle( + color: Color(0xFF727272), + fontSize: 10.sp, + ), + ), + ), if (calculateBalance(userBill, 2).isNotEmpty) Expanded( flex: 4, @@ -370,7 +371,9 @@ class _MineWalletPage extends State { } List calculateBalance(UserBill userBill, int index) { - double tbalance = double.tryParse(userBill.number ?? "0");/// 总余额 + double tbalance = double.tryParse(userBill.number ?? "0"); + + /// 总余额 String surplusGreenMoney = userBill.surplusGreenMoney; String surplusActivityMoney = userBill.surplusActivityMoney; double surplusMoney = double.tryParse(surplusGreenMoney ?? "0"); From 0c04133b4c741b5fec183ebbd7522b0c9be876ce Mon Sep 17 00:00:00 2001 From: fmk Date: Thu, 25 Aug 2022 17:06:36 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=80=E4=B8=AAlink?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile.lock | 30 ++++++++++++++++------------ ios/Runner.xcodeproj/project.pbxproj | 15 ++++++-------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a1097af4..d6ae8a59 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -143,6 +143,9 @@ PODS: - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.0): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/WeWork (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) - mob_sharesdk/ShareSDKPlatforms/WhatsApp (4.4.0): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) @@ -171,7 +174,7 @@ PODS: - SDWebImage (5.12.1): - SDWebImage/Core (= 5.12.1) - SDWebImage/Core (5.12.1) - - shared_preferences (0.0.1): + - shared_preferences_ios (0.0.1): - Flutter - sharesdk_plugin (1.1.2): - Flutter @@ -206,6 +209,7 @@ PODS: - mob_sharesdk/ShareSDKPlatforms/VKontakte - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite + - mob_sharesdk/ShareSDKPlatforms/WeWork - mob_sharesdk/ShareSDKPlatforms/WhatsApp - mob_sharesdk/ShareSDKPlatforms/Yixin - mob_sharesdk/ShareSDKPlatforms/YouDaoNote @@ -220,7 +224,7 @@ PODS: - TPNS-iOS (= 1.3.4.1) - url_launcher (0.0.1): - Flutter - - video_player (0.0.1): + - video_player_avfoundation (0.0.1): - Flutter - wakelock (0.0.1): - Flutter @@ -242,13 +246,13 @@ DEPENDENCIES: - path_provider (from `.symlinks/plugins/path_provider/ios`) - permission_handler (from `.symlinks/plugins/permission_handler/ios`) - scan (from `.symlinks/plugins/scan/ios`) - - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) + - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) - sharesdk_plugin (from `.symlinks/plugins/sharesdk_plugin/ios`) - SSZipArchive (~> 2.4.2) - thumbnails (from `.symlinks/plugins/thumbnails/ios`) - tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`) - url_launcher (from `.symlinks/plugins/url_launcher/ios`) - - video_player (from `.symlinks/plugins/video_player/ios`) + - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`) - wakelock (from `.symlinks/plugins/wakelock/ios`) - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`) @@ -290,8 +294,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/permission_handler/ios" scan: :path: ".symlinks/plugins/scan/ios" - shared_preferences: - :path: ".symlinks/plugins/shared_preferences/ios" + shared_preferences_ios: + :path: ".symlinks/plugins/shared_preferences_ios/ios" sharesdk_plugin: :path: ".symlinks/plugins/sharesdk_plugin/ios" thumbnails: @@ -300,8 +304,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/tpns_flutter_plugin/ios" url_launcher: :path: ".symlinks/plugins/url_launcher/ios" - video_player: - :path: ".symlinks/plugins/video_player/ios" + video_player_avfoundation: + :path: ".symlinks/plugins/video_player_avfoundation/ios" wakelock: :path: ".symlinks/plugins/wakelock/ios" webview_flutter: @@ -311,7 +315,7 @@ SPEC CHECKSUMS: AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce BaiduMapKit: 907c6d9b74f66c3ff4741fc4b568ae0b339917f8 BMKLocationKit: 097814ef672b1e57e86e6c1968d7892fb78002bf - Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c + Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a flutter_baidu_mapapi_base: 90fddba11ec4435406a7211d6ee905b4311c31db flutter_baidu_mapapi_map: 771bf00671832b1fcddb17733518cd631529df16 flutter_baidu_mapapi_search: 4cffaa74e739a4114595c4f82f790e1783bb612d @@ -327,16 +331,16 @@ SPEC CHECKSUMS: permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86 SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b - shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d - sharesdk_plugin: 5a59e49d2d5e55c8e8f67cc9ddf05172c2494a6b + shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad + sharesdk_plugin: dbe766efb15fdb2605133084da7a9144a1410d71 SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2 thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff tpns_flutter_plugin: ed7fae92efde473d5cb9fd33ac92caa2d64530a2 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef - video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e + video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f - webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b + webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232 ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736 PODFILE CHECKSUM: 77c662d4cd560e96445691f5bf7f29e2b140072c diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 944de1ed..b362226b 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -616,7 +616,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 36; + CURRENT_PROJECT_VERSION = 39; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -666,7 +666,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.36; + MARKETING_VERSION = 2.0.39; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -681,7 +681,6 @@ "-l\"flutter_baidu_mapapi_base\"", "-l\"permission_handler\"", "-l\"sqlite3\"", - "-l\"video_player\"", "-l\"wakelock\"", "-l\"webview_flutter\"", "-l\"z\"", @@ -816,7 +815,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 36; + CURRENT_PROJECT_VERSION = 39; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -866,7 +865,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.36; + MARKETING_VERSION = 2.0.39; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -881,7 +880,6 @@ "-l\"flutter_baidu_mapapi_base\"", "-l\"permission_handler\"", "-l\"sqlite3\"", - "-l\"video_player\"", "-l\"wakelock\"", "-l\"webview_flutter\"", "-l\"z\"", @@ -907,7 +905,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 36; + CURRENT_PROJECT_VERSION = 39; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -957,7 +955,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.36; + MARKETING_VERSION = 2.0.39; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -972,7 +970,6 @@ "-l\"flutter_baidu_mapapi_base\"", "-l\"permission_handler\"", "-l\"sqlite3\"", - "-l\"video_player\"", "-l\"wakelock\"", "-l\"webview_flutter\"", "-l\"z\"", From 6f721d3e15b546d474fc49297ea3875b58ff78d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= Date: Thu, 25 Aug 2022 18:20:56 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=9B=9E=E9=84=89=E9=8C=A2=E5=8C=85?= =?UTF-8?q?=EF=BC=8CUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mine/mine_wallet_page.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index 34ec633c..44e9f5bf 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -398,6 +398,7 @@ class _MineWalletPage extends State { if (balance > 0) { return [S.of(context).yue, "${userBill.pm == 0 ? '-' : '+'}$balance"]; } + return []; } else if (index == 1) { if (activity > 0) { return [ From 381b40b572f14b5d2597dd68121a723b0a553388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= Date: Mon, 5 Sep 2022 13:27:10 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E5=9B=9E=E9=84=89=E9=8C=A2=E5=8C=85?= =?UTF-8?q?=EF=BC=8CUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/generated/intl/messages_en.dart | 2 +- lib/generated/intl/messages_zh_CN.dart | 2 +- lib/generated/intl/messages_zh_Hans_CN.dart | 2 +- lib/generated/l10n.dart | 8 +- lib/l10n/intl_en.arb | 2 +- lib/l10n/intl_zh_CN.arb | 2 +- lib/l10n/intl_zh_Hans_CN.arb | 2 +- lib/l10n/intl_zh_Hant_CN.arb | 2 +- lib/l10n/intl_zh_TW.arb | 2 +- lib/login/login_page.dart | 113 +++++----- lib/mine/mine_wallet_page.dart | 227 ++++++++++---------- 11 files changed, 181 insertions(+), 183 deletions(-) diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 61011c32..4d50286f 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -67,7 +67,7 @@ class MessageLookup extends MessageLookupByLibrary { static m23(pinglun) => "评论(${pinglun})"; - static m24(zongyue, huodongyue, lvbiyue) => "平台总余额：${zongyue}（活动余额${huodongyue} 绿币余额${lvbiyue}） "; + static m24(zongyue) => "余额：${zongyue}"; static m25(zhe) => "全场${zhe}折"; diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index 1d177d14..e8208e62 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -67,7 +67,7 @@ class MessageLookup extends MessageLookupByLibrary { static m23(pinglun) => "评论(${pinglun})"; - static m24(zongyue, huodongyue, lvbiyue) => "平台总余额：${zongyue}（活动余额${huodongyue} 绿币余额${lvbiyue}） "; + static m24(zongyue) => "余额：${zongyue}"; static m25(zhe) => "全场${zhe}折"; diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index 27ce7f40..00f69c72 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_CN.dart @@ -67,7 +67,7 @@ class MessageLookup extends MessageLookupByLibrary { static m23(pinglun) => "评论(${pinglun})"; - static m24(zongyue, huodongyue, lvbiyue) => "平台总余额：${zongyue}（活动余额${huodongyue} 绿币余额${lvbiyue}） "; + static m24(zongyue) => "余额：${zongyue}"; static m25(zhe) => "全场${zhe}折"; diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 7cfab70b..a85ed92f 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -6175,13 +6175,13 @@ class S { ); } - /// `平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ` - String pingtaizongyue(Object zongyue, Object huodongyue, Object lvbiyue) { + /// `余额：{zongyue}` + String pingtaizongyue(Object zongyue) { return Intl.message( - '平台总余额：$zongyue（活动余额$huodongyue 绿币余额$lvbiyue） ', + '余额：$zongyue', name: 'pingtaizongyue', desc: '', - args: [zongyue, huodongyue, lvbiyue], + args: [zongyue], ); } diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 99449a22..da5ebf82 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -644,7 +644,7 @@ "huodongyue": "活动余额", "xiaofeijilu": "消费记录", "muqianwujilu": "目前暂未记录哦", - "pingtaizongyue": "平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ", + "pingtaizongyue": "余额：{zongyue}", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 22d55f92..05f07bc5 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -638,7 +638,7 @@ "huodongyue": "活动余额", "xiaofeijilu": "消费记录", "muqianwujilu": "目前暂未记录哦", - "pingtaizongyue": "平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ", + "pingtaizongyue": "余额：{zongyue}", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 4a987f3b..35998a3f 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -638,7 +638,7 @@ "huodongyue": "活动余额", "xiaofeijilu": "消费记录", "muqianwujilu": "目前暂未记录哦", - "pingtaizongyue": "平台总余额：{zongyue}（活动余额{huodongyue} 绿币余额{lvbiyue}） ", + "pingtaizongyue": "余额：{zongyue}", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index a5d6b975..f06bde5e 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -632,7 +632,7 @@ "yue__": "餘額 {yue}", "lvbiyue": "綠幣餘額 {yue}", "huodongyue": "活動餘額 {yue}", - "pingtaizongyue": "平台總餘額：{zongyue}（活動餘額{huodongyue} 綠幣餘額{lvbiyue}） ", + "pingtaizongyue": "餘額：{zongyue}", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 2bcfb0b0..e2d26d86 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -634,7 +634,7 @@ "yue__": "餘額 {yue}", "lvbiyue": "綠幣餘額 {yue}", "huodongyue": "活動餘額 {yue}", - "pingtaizongyue": "平台總餘額：{zongyue}（活動餘額{huodongyue} 綠幣餘額{lvbiyue}） ", + "pingtaizongyue": "餘額：{zongyue}", diff --git a/lib/login/login_page.dart b/lib/login/login_page.dart index f1112d07..67bcc0ee 100644 --- a/lib/login/login_page.dart +++ b/lib/login/login_page.dart @@ -1078,69 +1078,70 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { Stack( alignment: Alignment.bottomCenter, children: [ - Container( - alignment: Alignment.center, - width: double.infinity, - height: MediaQuery.of(context).size.width >= 650 ? 410.h :305.h, - padding: EdgeInsets.only(left: 16.w, right: 16.w), - decoration: new BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - ), - child: Column( - children: [ - Padding( - padding: EdgeInsets.only(top: 24.h, bottom: 10.h), - child: Text( - S.of(context).xieyitanchuang, - style: TextStyle( - color: Color(0xff4D4D4D), - fontSize: 18.sp, - fontWeight: FontWeight.bold, - ), - ), - ), - Text.rich( - TextSpan(children: [ - TextSpan( - text: S.of(context).yinsizhengce1, + IntrinsicHeight( + child: Container( + alignment: Alignment.center, + width: double.infinity, + padding: EdgeInsets.only(left: 16.w, right: 16.w), + decoration: new BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + ), + child: Column( + children: [ + Padding( + padding: EdgeInsets.only(top: 24.h, bottom: 10.h), + child: Text( + S.of(context).xieyitanchuang, style: TextStyle( - fontWeight: MyFontWeight.medium, - fontSize: 14.sp, - height: 1.2.h, - color: Color(0xff727272), + color: Color(0xff4D4D4D), + fontSize: 18.sp, + fontWeight: FontWeight.bold, ), ), - TextSpan( - text: S.of(context).yinsixieyi, - style: TextStyle( + ), + Text.rich( + TextSpan(children: [ + TextSpan( + text: S.of(context).yinsizhengce1, + style: TextStyle( fontWeight: MyFontWeight.medium, fontSize: 14.sp, - color: Color(0xff32A060)), - recognizer: TapGestureRecognizer() - ..onTap = () { - Navigator.of(context) - .popAndPushNamed('/router/treaty_page'); - }, + height: 1.2.h, + color: Color(0xff727272), + ), + ), + TextSpan( + text: S.of(context).yinsixieyi, + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 14.sp, + color: Color(0xff32A060)), + recognizer: TapGestureRecognizer() + ..onTap = () { + Navigator.of(context) + .popAndPushNamed('/router/treaty_page'); + }, + ), + ]), + ), + SizedBox( + height: 5.h, + ), + Text( + S.of(context).yinsizhengce2, + style: TextStyle( + color: Color(0xff727272), + fontSize: 14.sp, + height: 1.2.h, + fontWeight: MyFontWeight.medium, ), - ]), - ), - SizedBox( - height: 5.h, - ), - Text( - S.of(context).yinsizhengce2, - style: TextStyle( - color: Color(0xff727272), - fontSize: 14.sp, - height: 1.2.h, - fontWeight: MyFontWeight.medium, ), - ), - SizedBox( - height: 16.h, - ), - ], + SizedBox( + height: 16.h, + ), + ], + ), ), ), Row( diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index 44e9f5bf..7746e40a 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -27,9 +27,9 @@ class MineWalletPage extends StatefulWidget { } class _MineWalletPage extends State { - dynamic mBalance = 0; + dynamic pBalance = 0; //平台总余额 + dynamic mBalance = 0; // 余额 dynamic mgreenMoney = 0; - dynamic tBalance = 0; dynamic activityMoney = 0; @override @@ -48,10 +48,10 @@ class _MineWalletPage extends State { SharedPreferences sharedPreferences = await SharedPreferences.getInstance(); userInfo = UserInfo.fromJson(jsonDecode(sharedPreferences.getString('user'))); - mBalance = double.tryParse(userInfo.money); mgreenMoney = double.tryParse(userInfo.greenMoney); + mBalance = double.tryParse(userInfo.money); + pBalance = mgreenMoney + mBalance; activityMoney = double.tryParse(userInfo.activityMoney); - tBalance = mBalance - (mgreenMoney ?? 0) - (activityMoney ?? 0); if (mounted) setState(() {}); String token = sharedPreferences.getString("token"); apiService = ApiService(Dio(), context: context, token: token); @@ -70,8 +70,8 @@ class _MineWalletPage extends State { userInfo = baseData.data; mgreenMoney = double.tryParse(userInfo.greenMoney); activityMoney = double.tryParse(userInfo.activityMoney); - mBalance = double.tryParse(userInfo.money); - tBalance = mBalance - (mgreenMoney ?? 0) - (activityMoney ?? 0); + mBalance = double.tryParse(userInfo.money) + mgreenMoney; + pBalance = mBalance + mgreenMoney; if (mounted) setState(() {}); } } @@ -313,10 +313,7 @@ class _MineWalletPage extends State { Expanded( flex: 7, child: Text( - S.of(context).pingtaizongyue( - userBill.balance, - userBill.surplusActivityMoney, - userBill.surplusGreenMoney), + S.of(context).pingtaizongyue(userBill.balance), style: TextStyle( color: Color(0xFF727272), fontSize: 10.sp, @@ -468,7 +465,7 @@ class _MineWalletPage extends State { width: 24, ), Text( - "$mBalance", + "$pBalance", style: TextStyle( fontWeight: MyFontWeight.semi_bold, fontSize: 50, @@ -545,7 +542,7 @@ class _MineWalletPage extends State { height: 4, ), Text( - "$tBalance", + "$mBalance", style: TextStyle( fontSize: 18, fontWeight: MyFontWeight.semi_bold, @@ -627,109 +624,109 @@ class _MineWalletPage extends State { ); } - Widget balance1() { - return Container( - width: double.infinity, - margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 8.h), - padding: EdgeInsets.fromLTRB(24.w, 24.h, 24.w, 24.h), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(25), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0, - ), - ], - ), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Stack( - alignment: Alignment.center, - children: [ - Align( - alignment: Alignment.center, - child: Text( - S.of(context).zongzichan, - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - color: Color(0xFF353535), - fontSize: 16.sp, - ), - ), - ), - // GestureDetector( - // onTap: () { - // queryUserBalance(); - // }, - // child: Row( - // mainAxisAlignment: MainAxisAlignment.end, - // children: [ - // Icon( - // Icons.refresh, - // size: 20, - // color: Color(0xFF8A8A8A), - // ), - // Text( - // S.of(context).shuaxin, - // style: TextStyle( - // color: Color(0xFF353535), - // fontSize: 12.sp, - // ), - // ), - // ], - // ), - // ), - ], - ), - SizedBox( - height: 16.h, - ), - Text( - "$mBalance", - style: TextStyle( - fontWeight: MyFontWeight.medium, - color: Color(0xFF353535), - fontSize: 50.sp, - ), - ), - // SizedBox( - // height: 4.h, - // ), - // Text( - // S.of(context).keyongyue, - // style: TextStyle( - // color: Color(0xFF20662A), - // fontSize: 16.sp, - // fontWeight: MyFontWeight.regular - // ), - // ), - SizedBox( - height: 24.h, - ), - InkWell( - onTap: () { - toRecharge(); - }, - child: RoundButton( - width: 104.w, - text: S.of(context).lijichongzhi, - textColor: Colors.white, - fontWeight: MyFontWeight.semi_bold, - radius: 15, - backgroup: Color(0xFF32A060), - fontSize: 14.sp, - padding: EdgeInsets.symmetric(vertical: 5.h), - ), - ), - ], - ), - ); - } + // Widget balance1() { + // return Container( + // width: double.infinity, + // margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 8.h), + // padding: EdgeInsets.fromLTRB(24.w, 24.h, 24.w, 24.h), + // decoration: BoxDecoration( + // color: Colors.white, + // borderRadius: BorderRadius.circular(8), + // boxShadow: [ + // BoxShadow( + // color: Colors.black.withAlpha(25), + // offset: Offset(0, 3), + // blurRadius: 14, + // spreadRadius: 0, + // ), + // ], + // ), + // child: Column( + // mainAxisAlignment: MainAxisAlignment.center, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // Stack( + // alignment: Alignment.center, + // children: [ + // Align( + // alignment: Alignment.center, + // child: Text( + // S.of(context).zongzichan, + // style: TextStyle( + // fontWeight: MyFontWeight.semi_bold, + // color: Color(0xFF353535), + // fontSize: 16.sp, + // ), + // ), + // ), + // // GestureDetector( + // // onTap: () { + // // queryUserBalance(); + // // }, + // // child: Row( + // // mainAxisAlignment: MainAxisAlignment.end, + // // children: [ + // // Icon( + // // Icons.refresh, + // // size: 20, + // // color: Color(0xFF8A8A8A), + // // ), + // // Text( + // // S.of(context).shuaxin, + // // style: TextStyle( + // // color: Color(0xFF353535), + // // fontSize: 12.sp, + // // ), + // // ), + // // ], + // // ), + // // ), + // ], + // ), + // SizedBox( + // height: 16.h, + // ), + // Text( + // "$mBalance", + // style: TextStyle( + // fontWeight: MyFontWeight.medium, + // color: Color(0xFF353535), + // fontSize: 50.sp, + // ), + // ), + // // SizedBox( + // // height: 4.h, + // // ), + // // Text( + // // S.of(context).keyongyue, + // // style: TextStyle( + // // color: Color(0xFF20662A), + // // fontSize: 16.sp, + // // fontWeight: MyFontWeight.regular + // // ), + // // ), + // SizedBox( + // height: 24.h, + // ), + // InkWell( + // onTap: () { + // toRecharge(); + // }, + // child: RoundButton( + // width: 104.w, + // text: S.of(context).lijichongzhi, + // textColor: Colors.white, + // fontWeight: MyFontWeight.semi_bold, + // radius: 15, + // backgroup: Color(0xFF32A060), + // fontSize: 14.sp, + // padding: EdgeInsets.symmetric(vertical: 5.h), + // ), + // ), + // ], + // ), + // ); + // } toRecharge() async { await Navigator.of(context).pushNamed('/router/recharge_page'); From 93cee0cc9708b1e130a754b6ca8785f694e3076b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= Date: Mon, 5 Sep 2022 13:33:37 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E5=9B=9E=E9=84=89=E9=8C=A2=E5=8C=85?= =?UTF-8?q?=EF=BC=8CUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/l10n/intl_en.arb | 2 +- lib/l10n/intl_zh_CN.arb | 2 +- lib/l10n/intl_zh_Hans_CN.arb | 2 +- lib/l10n/intl_zh_Hant_CN.arb | 2 +- lib/l10n/intl_zh_TW.arb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index da5ebf82..de5383d1 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -635,7 +635,7 @@ "pingtaizhifumima": "平台支付密码", "fasongduanxin": "发送短信", "yue__": "余额 {yue}", - "lvbiyue_": "绿币余额 {yue}", + "lvbiyue_": "绿币 {yue}", "huodongyue_": "活动余额 {yue}", "lvbiyue": "绿币余额", "huixiangqianbao": "回乡钱包", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 05f07bc5..8cb96b83 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -629,7 +629,7 @@ "pingtaizhifumima": "平台支付密码", "fasongduanxin": "发送短信", "yue__": "余额 {yue}", - "lvbiyue_": "绿币余额 {yue}", + "lvbiyue_": "绿币 {yue}", "huodongyue_": "活动余额 {yue}", "lvbiyue": "绿币余额", "huixiangqianbao": "回乡钱包", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 35998a3f..75a43ba3 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -629,7 +629,7 @@ "pingtaizhifumima": "平台支付密码", "fasongduanxin": "发送短信", "yue__": "余额 {yue}", - "lvbiyue_": "绿币余额 {yue}", + "lvbiyue_": "绿币 {yue}", "huodongyue_": "活动余额 {yue}", "lvbiyue": "绿币余额", "huixiangqianbao": "回乡钱包", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index f06bde5e..90af200c 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -620,7 +620,7 @@ "zhanghaoanquan": "賬號安全", "pingtaizhifumima": "平臺支付密碼", "fasongduanxin": "發送短信", - "lvbiyue_": "綠幣餘額 {yue}", + "lvbiyue_": "綠幣 {yue}", "huodongyue_": "活動餘額 {yue}", "lvbiyue": "綠幣餘額", "huixiangqianbao": "回鄉錢包", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index e2d26d86..6421858e 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -622,7 +622,7 @@ "zhanghaoanquan": "賬號安全", "pingtaizhifumima": "平臺支付密碼", "fasongduanxin": "發送短信", - "lvbiyue_": "綠幣餘額 {yue}", + "lvbiyue_": "綠幣 {yue}", "huodongyue_": "活動餘額 {yue}", "lvbiyue": "綠幣餘額", "huixiangqianbao": "回鄉錢包", From 7379a54ef7ab92b21dcfac6f10e5dbb898da8b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= Date: Mon, 5 Sep 2022 13:42:41 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E5=9B=9E=E9=84=89=E9=8C=A2=E5=8C=85?= =?UTF-8?q?=EF=BC=8CUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/generated/intl/messages_en.dart | 2 +- lib/generated/intl/messages_zh_CN.dart | 2 +- lib/generated/intl/messages_zh_Hans_CN.dart | 2 +- lib/generated/l10n.dart | 4 ++-- lib/mine/mine_wallet_page.dart | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 4d50286f..12fc844b 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.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}元代金券"; diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index e8208e62..04986e59 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_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}元代金券"; diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index 00f69c72..1376019c 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_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}元代金券"; diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index a85ed92f..5b9554c1 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -6085,10 +6085,10 @@ class S { ); } - /// `绿币余额 {yue}` + /// `绿币 {yue}` String lvbiyue_(Object yue) { return Intl.message( - '绿币余额 $yue', + '绿币 $yue', name: 'lvbiyue_', desc: '', args: [yue], diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index 7746e40a..2bd5475c 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -70,7 +70,7 @@ class _MineWalletPage extends State { userInfo = baseData.data; mgreenMoney = double.tryParse(userInfo.greenMoney); activityMoney = double.tryParse(userInfo.activityMoney); - mBalance = double.tryParse(userInfo.money) + mgreenMoney; + mBalance = double.tryParse(userInfo.money); pBalance = mBalance + mgreenMoney; if (mounted) setState(() {}); } From 04996ccda692eb48eecf1f7f789d208f03ba236c Mon Sep 17 00:00:00 2001 From: Loki <654612@qq.com> Date: Mon, 5 Sep 2022 13:45:59 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/retrofit/min_api.dart | 14 ++------------ lib/retrofit/retrofit_api.dart | 13 ++----------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index f37552cb..1f2a6374 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -26,18 +26,8 @@ import 'data/shopping_home_config.dart'; part 'min_api.g.dart'; -// const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式 - -// const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222 - -// const base_url = "http://192.168.10.132:8765/app/";///詹云久 - - -// const base_url = "http://192.168.10.236:8765/app/"; ///费韬 - -// const base_url = "http://192.168.10.37:8765/app/"; - -const localBaseUrl = "http://192.168.10.236:8765/app/";///本地 +// const localBaseUrl = "http://192.168.10.129:8765/app/";///本地 +const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上 diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index fabaf924..8f74e4cc 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -61,17 +61,8 @@ import 'data/wx_pay.dart'; part 'retrofit_api.g.dart'; -// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式 - -// const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222 - -// const base_url = "http://192.168.10.236:8766/app/"; ///费韬 - -// const base_url = "http://192.168.10.37:8766/app/"; - -// const base_url = "http://192.168.10.132:8766/app/";///詹云久 - -const localBaseUrl = "http://192.168.10.236:8766/app/";///本地 +// const localBaseUrl = "http://192.168.10.129:8765/app/";///本地 +const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 @RestApi(baseUrl: localBaseUrl) From 4d7d64cbbdbcf2b09caeb872af8d30a1da5297fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= Date: Mon, 5 Sep 2022 14:27:22 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E5=9B=9E=E9=84=89=E9=8C=A2=E5=8C=85?= =?UTF-8?q?=EF=BC=8CUI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mine/mine_wallet_page.dart | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index 2bd5475c..c05015f3 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -376,7 +376,7 @@ class _MineWalletPage extends State { double surplusMoney = double.tryParse(surplusGreenMoney ?? "0"); double surplusActivity = double.tryParse(surplusActivityMoney ?? "0"); - double balance = tbalance - (surplusMoney ?? 0) - (surplusActivity ?? 0); + // double balance = tbalance - (surplusMoney ?? 0) - (surplusActivity ?? 0); String greenMoney = userBill.greenMoney; String activityMoney = userBill.activityMoney; @@ -392,21 +392,21 @@ class _MineWalletPage extends State { "${userBill.pm == 0 ? '-' : '+'}$activity" ]; } - if (balance > 0) { - return [S.of(context).yue, "${userBill.pm == 0 ? '-' : '+'}$balance"]; + if (tbalance > 0) { + return [S.of(context).yue, "${userBill.pm == 0 ? '-' : '+'}$tbalance"]; } return []; } else if (index == 1) { - if (activity > 0) { + if (money > 0 && activity > 0) { return [ S.of(context).huodongyue, "${userBill.pm == 0 ? '-' : '+'}$activity" ]; } - if (money > 0 && (balance - money) > 0) { + if (money > 0 && (tbalance - money) > 0) { return [ S.of(context).yue, - "${userBill.pm == 0 ? '-' : '+'}${(balance - money)}" + "${userBill.pm == 0 ? '-' : '+'}${(tbalance - money)}" ]; } else { return []; @@ -415,7 +415,7 @@ class _MineWalletPage extends State { if (activity > 0 && money > 0) { return [ S.of(context).yue, - "${userBill.pm == 0 ? '-' : '+'}${(balance - money - activity)}" + "${userBill.pm == 0 ? '-' : '+'}${(tbalance - money - activity)}" ]; } else { return []; From b9ee7d225218635f26bf86e9786be10f4ca0f0b2 Mon Sep 17 00:00:00 2001 From: fmk Date: Thu, 8 Sep 2022 14:03:30 +0800 Subject: [PATCH 16/16] ios --- ios/Runner.xcodeproj/project.pbxproj | 27 ++++++++++++++++++--------- ios/Runner/Info.plist | 9 +++++++++ ios/Runner/Runner.entitlements | 16 ++++++++++++++++ 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index b362226b..59b6b6a6 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -18,8 +18,8 @@ 6EE8F35C2695819500237A5E /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F35A2695819500237A5E /* CoreMedia.framework */; }; 6EE8F35F269581A300237A5E /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F35D269581A300237A5E /* AVFoundation.framework */; }; 6EE8F360269581A300237A5E /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F35E269581A300237A5E /* AVKit.framework */; }; - 6EE8F362269581AF00237A5E /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F361269581AF00237A5E /* GLKit.framework */; }; - 6EE8F364269581B600237A5E /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F363269581B600237A5E /* OpenGLES.framework */; }; + 6EE8F362269581AF00237A5E /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F361269581AF00237A5E /* GLKit.framework */; platformFilter = ios; }; + 6EE8F364269581B600237A5E /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F363269581B600237A5E /* OpenGLES.framework */; platformFilter = ios; }; 6EE8F366269581BC00237A5E /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F365269581BC00237A5E /* CoreText.framework */; }; 6EE8F368269581C300237A5E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F367269581C300237A5E /* QuartzCore.framework */; }; 6EE8F36A269581CC00237A5E /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F369269581CC00237A5E /* CoreGraphics.framework */; }; @@ -611,12 +611,13 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; BUILD_LIBRARY_FOR_DISTRIBUTION = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 39; + CURRENT_PROJECT_VERSION = 42; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -666,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.39; + MARKETING_VERSION = 2.0.42; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -690,8 +691,10 @@ PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SUPPORTS_MACCATALYST = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Profile; @@ -810,12 +813,13 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; BUILD_LIBRARY_FOR_DISTRIBUTION = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 39; + CURRENT_PROJECT_VERSION = 42; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -865,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.39; + MARKETING_VERSION = 2.0.42; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -888,9 +892,11 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTS_MACCATALYST = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -900,12 +906,13 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; BUILD_LIBRARY_FOR_DISTRIBUTION = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 39; + CURRENT_PROJECT_VERSION = 42; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -955,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.39; + MARKETING_VERSION = 2.0.42; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -979,8 +986,10 @@ PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SUPPORTS_MACCATALYST = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 1d5c98d9..f3eea2d8 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -126,6 +126,11 @@ 打开相册 NSSpeechRecognitionUsageDescription 是否允许语音识别 + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UIBackgroundModes remote-notification @@ -134,6 +139,10 @@ LaunchScreen UIMainStoryboardFile Main + UIRequiresFullScreen + + UIStatusBarHidden + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements index 2d6a8024..b61074f5 100644 --- a/ios/Runner/Runner.entitlements +++ b/ios/Runner/Runner.entitlements @@ -10,5 +10,21 @@ applinks:hx.lotus-wallet.com applinks:huixiang.lotus-wallet.com + com.apple.security.app-sandbox + + com.apple.security.device.audio-input + + com.apple.security.device.camera + + com.apple.security.network.client + + com.apple.security.personal-information.addressbook + + com.apple.security.personal-information.calendars + + com.apple.security.personal-information.location + + com.apple.security.personal-information.photos-library +