diff --git a/assets/image/2x/attainment_bj.png b/assets/image/2x/attainment_bj.png new file mode 100644 index 00000000..bfbd8007 Binary files /dev/null and b/assets/image/2x/attainment_bj.png differ diff --git a/assets/image/2x/badge_img.png b/assets/image/2x/badge_img.png new file mode 100644 index 00000000..a7aafcb4 Binary files /dev/null and b/assets/image/2x/badge_img.png differ diff --git a/assets/image/2x/bj_badge.png b/assets/image/2x/bj_badge.png new file mode 100644 index 00000000..81f31315 Binary files /dev/null and b/assets/image/2x/bj_badge.png differ diff --git a/assets/image/2x/by_badge.png b/assets/image/2x/by_badge.png new file mode 100644 index 00000000..0002b4c7 Binary files /dev/null and b/assets/image/2x/by_badge.png differ diff --git a/assets/image/2x/fuka_j.png b/assets/image/2x/fuka_j.png new file mode 100644 index 00000000..4e795416 Binary files /dev/null and b/assets/image/2x/fuka_j.png differ diff --git a/assets/image/2x/fuka_zj.png b/assets/image/2x/fuka_zj.png new file mode 100644 index 00000000..e4834cc7 Binary files /dev/null and b/assets/image/2x/fuka_zj.png differ diff --git a/assets/image/2x/hj_badge.png b/assets/image/2x/hj_badge.png new file mode 100644 index 00000000..a09e0bbf Binary files /dev/null and b/assets/image/2x/hj_badge.png differ diff --git a/assets/image/2x/jian_j.png b/assets/image/2x/jian_j.png new file mode 100644 index 00000000..84e6fce4 Binary files /dev/null and b/assets/image/2x/jian_j.png differ diff --git a/assets/image/2x/qt_badge.png b/assets/image/2x/qt_badge.png new file mode 100644 index 00000000..6933d52e Binary files /dev/null and b/assets/image/2x/qt_badge.png differ diff --git a/assets/image/2x/vip_contrastive_table.png b/assets/image/2x/vip_contrastive_table.png new file mode 100644 index 00000000..a4d0d82e Binary files /dev/null and b/assets/image/2x/vip_contrastive_table.png differ diff --git a/assets/image/2x/vip_gc.png b/assets/image/2x/vip_gc.png new file mode 100644 index 00000000..9b43195f Binary files /dev/null and b/assets/image/2x/vip_gc.png differ diff --git a/assets/image/2x/vip_jk.png b/assets/image/2x/vip_jk.png new file mode 100644 index 00000000..e0cb11a1 Binary files /dev/null and b/assets/image/2x/vip_jk.png differ diff --git a/assets/image/2x/vip_qy.png b/assets/image/2x/vip_qy.png new file mode 100644 index 00000000..c11c562c Binary files /dev/null and b/assets/image/2x/vip_qy.png differ diff --git a/assets/image/2x/vip_yk.png b/assets/image/2x/vip_yk.png new file mode 100644 index 00000000..718741dd Binary files /dev/null and b/assets/image/2x/vip_yk.png differ diff --git a/assets/image/3x/attainment_bj.png b/assets/image/3x/attainment_bj.png new file mode 100644 index 00000000..296bd261 Binary files /dev/null and b/assets/image/3x/attainment_bj.png differ diff --git a/assets/image/3x/badge_img.png b/assets/image/3x/badge_img.png new file mode 100644 index 00000000..5cdc2d2d Binary files /dev/null and b/assets/image/3x/badge_img.png differ diff --git a/assets/image/3x/bj_badge.png b/assets/image/3x/bj_badge.png new file mode 100644 index 00000000..fec30b19 Binary files /dev/null and b/assets/image/3x/bj_badge.png differ diff --git a/assets/image/3x/by_badge.png b/assets/image/3x/by_badge.png new file mode 100644 index 00000000..f4951941 Binary files /dev/null and b/assets/image/3x/by_badge.png differ diff --git a/assets/image/3x/fuka_j.png b/assets/image/3x/fuka_j.png new file mode 100644 index 00000000..71b541da Binary files /dev/null and b/assets/image/3x/fuka_j.png differ diff --git a/assets/image/3x/fuka_zj.png b/assets/image/3x/fuka_zj.png new file mode 100644 index 00000000..8def7e52 Binary files /dev/null and b/assets/image/3x/fuka_zj.png differ diff --git a/assets/image/3x/hj_badge.png b/assets/image/3x/hj_badge.png new file mode 100644 index 00000000..7ed2cfc3 Binary files /dev/null and b/assets/image/3x/hj_badge.png differ diff --git a/assets/image/3x/jian_j.png b/assets/image/3x/jian_j.png new file mode 100644 index 00000000..d5bbe20a Binary files /dev/null and b/assets/image/3x/jian_j.png differ diff --git a/assets/image/3x/qt_badge.png b/assets/image/3x/qt_badge.png new file mode 100644 index 00000000..c1cc7464 Binary files /dev/null and b/assets/image/3x/qt_badge.png differ diff --git a/assets/image/3x/vip_contrastive_table.png b/assets/image/3x/vip_contrastive_table.png new file mode 100644 index 00000000..45453ff7 Binary files /dev/null and b/assets/image/3x/vip_contrastive_table.png differ diff --git a/assets/image/3x/vip_gc.png b/assets/image/3x/vip_gc.png new file mode 100644 index 00000000..b5020646 Binary files /dev/null and b/assets/image/3x/vip_gc.png differ diff --git a/assets/image/3x/vip_jk.png b/assets/image/3x/vip_jk.png new file mode 100644 index 00000000..c4c72089 Binary files /dev/null and b/assets/image/3x/vip_jk.png differ diff --git a/assets/image/3x/vip_qy.png b/assets/image/3x/vip_qy.png new file mode 100644 index 00000000..32cd870d Binary files /dev/null and b/assets/image/3x/vip_qy.png differ diff --git a/assets/image/3x/vip_yk.png b/assets/image/3x/vip_yk.png new file mode 100644 index 00000000..0ba57b61 Binary files /dev/null and b/assets/image/3x/vip_yk.png differ diff --git a/assets/image/attainment_bj.png b/assets/image/attainment_bj.png new file mode 100644 index 00000000..ebef994d Binary files /dev/null and b/assets/image/attainment_bj.png differ diff --git a/assets/image/badge_img.png b/assets/image/badge_img.png new file mode 100644 index 00000000..31c966ca Binary files /dev/null and b/assets/image/badge_img.png differ diff --git a/assets/image/bj_badge.png b/assets/image/bj_badge.png new file mode 100644 index 00000000..14af253c Binary files /dev/null and b/assets/image/bj_badge.png differ diff --git a/assets/image/by_badge.png b/assets/image/by_badge.png new file mode 100644 index 00000000..c021b622 Binary files /dev/null and b/assets/image/by_badge.png differ diff --git a/assets/image/fuka_j.png b/assets/image/fuka_j.png new file mode 100644 index 00000000..da848593 Binary files /dev/null and b/assets/image/fuka_j.png differ diff --git a/assets/image/fuka_zj.png b/assets/image/fuka_zj.png new file mode 100644 index 00000000..63726792 Binary files /dev/null and b/assets/image/fuka_zj.png differ diff --git a/assets/image/hj_badge.png b/assets/image/hj_badge.png new file mode 100644 index 00000000..a7ba57cd Binary files /dev/null and b/assets/image/hj_badge.png differ diff --git a/assets/image/jian_j.png b/assets/image/jian_j.png new file mode 100644 index 00000000..b4597601 Binary files /dev/null and b/assets/image/jian_j.png differ diff --git a/assets/image/qt_badge.png b/assets/image/qt_badge.png new file mode 100644 index 00000000..5ebcbf45 Binary files /dev/null and b/assets/image/qt_badge.png differ diff --git a/assets/image/vip_contrastive_table.png b/assets/image/vip_contrastive_table.png new file mode 100644 index 00000000..8e1a77b4 Binary files /dev/null and b/assets/image/vip_contrastive_table.png differ diff --git a/assets/image/vip_gc.png b/assets/image/vip_gc.png new file mode 100644 index 00000000..1d84e5bf Binary files /dev/null and b/assets/image/vip_gc.png differ diff --git a/assets/image/vip_jk.png b/assets/image/vip_jk.png new file mode 100644 index 00000000..c33527d3 Binary files /dev/null and b/assets/image/vip_jk.png differ diff --git a/assets/image/vip_qy.png b/assets/image/vip_qy.png new file mode 100644 index 00000000..6ccfc4ee Binary files /dev/null and b/assets/image/vip_qy.png differ diff --git a/assets/image/vip_yk.png b/assets/image/vip_yk.png new file mode 100644 index 00000000..7e629c29 Binary files /dev/null and b/assets/image/vip_yk.png differ diff --git a/assets/svg/lianmeng.svg b/assets/svg/lianmeng.svg index 4792864c..29d4ed9d 100644 --- a/assets/svg/lianmeng.svg +++ b/assets/svg/lianmeng.svg @@ -1,19 +1,13 @@ - 编组 7 + 编组 5 - - - - - - - - - - - - + + + + + + diff --git a/lib/community/community_view/class_details_video.dart b/lib/community/community_view/class_details_video.dart index a0aab6b4..5bfc37a8 100644 --- a/lib/community/community_view/class_details_video.dart +++ b/lib/community/community_view/class_details_video.dart @@ -58,6 +58,10 @@ class ClassDetailsVideoState extends State { } initVideo(videoUrl) async { + if (videoPlayerController != null) { + videoPlayerController.pause(); + videoPlayerController.dispose(); + } videoPlayerController = VideoPlayerController.network( videoUrl, )..initialize().then((value) { @@ -110,6 +114,7 @@ class ClassDetailsVideoState extends State { videoPlayerController.pause(); videoPlayerController.dispose(); } + } Widget videoWidget(double width, double height, src) { @@ -148,7 +153,11 @@ class ClassDetailsVideoState extends State { color: Colors.black, child: Stack( children: [ - Center( + Positioned( + left: 0.0, + top: 0.0, + right: 0.0, + bottom: 0.0, child: MImage( src, fit: BoxFit.cover, diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 9e25969c..f352397c 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -102,8 +102,10 @@ class MessageLookup extends MessageLookupByLibrary { final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "bainianchuanjiao" : MessageLookupByLibrary.simpleMessage("百年川椒"), + "baiyin" : MessageLookupByLibrary.simpleMessage("白银"), "baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白银会员"), "banben" : m0, + "bangdingfuka" : MessageLookupByLibrary.simpleMessage("绑定副卡"), "bangong" : MessageLookupByLibrary.simpleMessage("办公"), "bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("帮助与反馈"), "baocun" : MessageLookupByLibrary.simpleMessage("保存"), @@ -114,10 +116,12 @@ class MessageLookup extends MessageLookupByLibrary { "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"), "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"), "bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"), + "bojin" : MessageLookupByLibrary.simpleMessage("铂金"), "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"), "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持开票"), "chakan" : MessageLookupByLibrary.simpleMessage("查看"), "chakangengduo" : MessageLookupByLibrary.simpleMessage("查看更多"), + "chakanquanyi" : MessageLookupByLibrary.simpleMessage("查看权益"), "chakanshixiaoquan" : MessageLookupByLibrary.simpleMessage("查看失效券"), "chakanwodekabao" : MessageLookupByLibrary.simpleMessage("查看我的卡包"), "chakanwodekaquan" : MessageLookupByLibrary.simpleMessage("查看我的卡券"), @@ -128,6 +132,8 @@ class MessageLookup extends MessageLookupByLibrary { "chaojiyouhuiquan" : MessageLookupByLibrary.simpleMessage("超值优惠券"), "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("创始人故事"), "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"), + "chengjiu" : MessageLookupByLibrary.simpleMessage("成就"), + "chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"), "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员，享专属权益"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), @@ -136,6 +142,7 @@ class MessageLookup extends MessageLookupByLibrary { "chuangjianshijian" : m2, "chuangshirendegushi" : MessageLookupByLibrary.simpleMessage("创始人的故事-"), "chuangshirendegushi1" : MessageLookupByLibrary.simpleMessage("创始人的故事"), + "chuzhiyouhui" : MessageLookupByLibrary.simpleMessage("储值优惠"), "code_error" : MessageLookupByLibrary.simpleMessage("验证码输入错误"), "cunchu" : MessageLookupByLibrary.simpleMessage("存储"), "cunchutishixinxi" : MessageLookupByLibrary.simpleMessage("为了获得照片使用、缓存等功能，推荐您在使用期间打开存储权限"), @@ -204,6 +211,7 @@ class MessageLookup extends MessageLookupByLibrary { "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), + "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"), "ge" : m5, "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"), @@ -211,9 +219,11 @@ class MessageLookup extends MessageLookupByLibrary { "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"), "gong" : MessageLookupByLibrary.simpleMessage("共"), + "gongchuanghuiyuan" : MessageLookupByLibrary.simpleMessage("共创会员"), "gongjijian" : m6, "gongjijianshangpin" : m7, "gongli" : m8, + "gongxinchengwei" : MessageLookupByLibrary.simpleMessage("恭喜您成为"), "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成为本店的会员，快去享受超多会员权益吧。"), "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), @@ -228,6 +238,7 @@ class MessageLookup extends MessageLookupByLibrary { "heji" : MessageLookupByLibrary.simpleMessage("合计:"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"), + "huangjin" : MessageLookupByLibrary.simpleMessage("黄金"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"), "huifu" : MessageLookupByLibrary.simpleMessage("回复"), "huifu_" : m9, @@ -235,12 +246,18 @@ class MessageLookup extends MessageLookupByLibrary { "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"), + "huiyuanguize" : MessageLookupByLibrary.simpleMessage("会员规则说明"), + "huiyuanhuodejifen" : MessageLookupByLibrary.simpleMessage("会员如何获得积分"), "huiyuanjia" : MessageLookupByLibrary.simpleMessage("会员价"), + "huiyuanjibieduizhao" : MessageLookupByLibrary.simpleMessage("会员级别对照表"), "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"), "huiyuanka" : MessageLookupByLibrary.simpleMessage("会员卡"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"), + "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("会员权益"), "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"), + "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"), "huode" : MessageLookupByLibrary.simpleMessage("获得"), + "huodequanyi" : MessageLookupByLibrary.simpleMessage("获得权益"), "huodong" : MessageLookupByLibrary.simpleMessage("活动"), "huodongjianmianpeisongfei" : m10, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"), @@ -253,6 +270,7 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"), "jiajifen" : m11, "jian" : MessageLookupByLibrary.simpleMessage("件"), + "jiangli" : MessageLookupByLibrary.simpleMessage("奖励"), "jianjie" : m12, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"), "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"), @@ -267,8 +285,10 @@ class MessageLookup extends MessageLookupByLibrary { "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), + "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"), "jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"), + "jinxingbangdingfuka" : MessageLookupByLibrary.simpleMessage("进行绑定副卡"), "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"), "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"), "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集团创始人"), @@ -293,6 +313,7 @@ class MessageLookup extends MessageLookupByLibrary { "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), + "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即开通"), "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"), "lingqu" : MessageLookupByLibrary.simpleMessage("领取"), @@ -365,6 +386,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"), "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("请填写收件人姓名"), + "qingtong" : MessageLookupByLibrary.simpleMessage("青铜"), "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青铜会员"), "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("请选择使用门店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("请选择收货地址"), @@ -384,11 +406,15 @@ class MessageLookup extends MessageLookupByLibrary { "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("权限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"), + "quanyijishao" : MessageLookupByLibrary.simpleMessage("权益介绍"), + "quanyishuoming" : MessageLookupByLibrary.simpleMessage("权益说明"), + "quanyixiangqing" : MessageLookupByLibrary.simpleMessage("权益详情"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"), "qudanhao" : m23, "qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"), "queding" : MessageLookupByLibrary.simpleMessage("确定"), "queren" : MessageLookupByLibrary.simpleMessage("确认"), + "querenbangding" : MessageLookupByLibrary.simpleMessage("确认绑定"), "querenchongzhi" : MessageLookupByLibrary.simpleMessage("确认充值"), "querenduihuan" : MessageLookupByLibrary.simpleMessage("确认兑换"), "querenshouhuo" : MessageLookupByLibrary.simpleMessage("确认收货"), @@ -459,6 +485,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), "sui" : m28, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), + "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), "tixian" : MessageLookupByLibrary.simpleMessage("提现"), @@ -493,6 +520,7 @@ class MessageLookup extends MessageLookupByLibrary { "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"), "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章详情"), "weulingqu" : MessageLookupByLibrary.simpleMessage("未领取"), + "wodechengjiu" : MessageLookupByLibrary.simpleMessage("我的成就"), "wodedongtai" : MessageLookupByLibrary.simpleMessage("我的动态"), "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"), "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的会员等级"), @@ -532,9 +560,11 @@ class MessageLookup extends MessageLookupByLibrary { "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yaoqingrenshoujihao_" : m32, + "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), "yiduihuanjian" : m33, "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), + "yihuide" : MessageLookupByLibrary.simpleMessage("已获得"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"), @@ -547,6 +577,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), "yingyeshijian" : m34, + "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"), "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"), "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隐私协议》"), @@ -590,6 +621,7 @@ class MessageLookup extends MessageLookupByLibrary { "zaituzhong" : MessageLookupByLibrary.simpleMessage("运输中"), "zaixiankefu" : MessageLookupByLibrary.simpleMessage("在线客服"), "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暂不支持线上点餐"), + "zanweikaitong" : MessageLookupByLibrary.simpleMessage("暂未开通"), "zanwupinglun" : MessageLookupByLibrary.simpleMessage("暂无评论，快来评论吧"), "zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暂无线上门店"), "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暂无优惠券可领取"), diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index cfbea28d..826a71ca 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -102,8 +102,10 @@ class MessageLookup extends MessageLookupByLibrary { final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "bainianchuanjiao" : MessageLookupByLibrary.simpleMessage("百年川椒"), + "baiyin" : MessageLookupByLibrary.simpleMessage("白银"), "baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白银会员"), "banben" : m0, + "bangdingfuka" : MessageLookupByLibrary.simpleMessage("绑定副卡"), "bangong" : MessageLookupByLibrary.simpleMessage("办公"), "bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("帮助与反馈"), "baocun" : MessageLookupByLibrary.simpleMessage("保存"), @@ -114,10 +116,12 @@ class MessageLookup extends MessageLookupByLibrary { "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"), "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"), "bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"), + "bojin" : MessageLookupByLibrary.simpleMessage("铂金"), "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"), "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持开票"), "chakan" : MessageLookupByLibrary.simpleMessage("查看"), "chakangengduo" : MessageLookupByLibrary.simpleMessage("查看更多"), + "chakanquanyi" : MessageLookupByLibrary.simpleMessage("查看权益"), "chakanshixiaoquan" : MessageLookupByLibrary.simpleMessage("查看失效券"), "chakanwodekabao" : MessageLookupByLibrary.simpleMessage("查看我的卡包"), "chakanwodekaquan" : MessageLookupByLibrary.simpleMessage("查看我的卡券"), @@ -128,6 +132,8 @@ class MessageLookup extends MessageLookupByLibrary { "chaojiyouhuiquan" : MessageLookupByLibrary.simpleMessage("超值优惠券"), "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("创始人故事"), "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"), + "chengjiu" : MessageLookupByLibrary.simpleMessage("成就"), + "chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"), "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员，享专属权益"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), @@ -136,6 +142,7 @@ class MessageLookup extends MessageLookupByLibrary { "chuangjianshijian" : m2, "chuangshirendegushi" : MessageLookupByLibrary.simpleMessage("创始人的故事-"), "chuangshirendegushi1" : MessageLookupByLibrary.simpleMessage("创始人的故事"), + "chuzhiyouhui" : MessageLookupByLibrary.simpleMessage("储值优惠"), "code_error" : MessageLookupByLibrary.simpleMessage("验证码输入错误"), "cunchu" : MessageLookupByLibrary.simpleMessage("存储"), "cunchutishixinxi" : MessageLookupByLibrary.simpleMessage("为了获得照片使用、缓存等功能，推荐您在使用期间打开存储权限"), @@ -204,6 +211,7 @@ class MessageLookup extends MessageLookupByLibrary { "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), + "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"), "ge" : m5, "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"), @@ -211,9 +219,11 @@ class MessageLookup extends MessageLookupByLibrary { "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"), "gong" : MessageLookupByLibrary.simpleMessage("共"), + "gongchuanghuiyuan" : MessageLookupByLibrary.simpleMessage("共创会员"), "gongjijian" : m6, "gongjijianshangpin" : m7, "gongli" : m8, + "gongxinchengwei" : MessageLookupByLibrary.simpleMessage("恭喜您成为"), "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成为本店的会员，快去享受超多会员权益吧。"), "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), @@ -227,6 +237,7 @@ class MessageLookup extends MessageLookupByLibrary { "heji" : MessageLookupByLibrary.simpleMessage("合计:"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"), + "huangjin" : MessageLookupByLibrary.simpleMessage("黄金"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"), "huifu" : MessageLookupByLibrary.simpleMessage("回复"), "huifu_" : m9, @@ -234,12 +245,17 @@ class MessageLookup extends MessageLookupByLibrary { "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"), + "huiyuanguize" : MessageLookupByLibrary.simpleMessage("会员规则说明"), + "huiyuanhuodejifen" : MessageLookupByLibrary.simpleMessage("会员如何获得积分"), "huiyuanjia" : MessageLookupByLibrary.simpleMessage("会员价"), + "huiyuanjibieduizhao" : MessageLookupByLibrary.simpleMessage("会员级别对照表"), "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"), "huiyuanka" : MessageLookupByLibrary.simpleMessage("会员卡"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"), "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"), + "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"), "huode" : MessageLookupByLibrary.simpleMessage("获得"), + "huodequanyi" : MessageLookupByLibrary.simpleMessage("获得权益"), "huodong" : MessageLookupByLibrary.simpleMessage("活动"), "huodongjianmianpeisongfei" : m10, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"), @@ -252,6 +268,7 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"), "jiajifen" : m11, "jian" : MessageLookupByLibrary.simpleMessage("件"), + "jiangli" : MessageLookupByLibrary.simpleMessage("奖励"), "jianjie" : m12, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"), "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"), @@ -266,8 +283,10 @@ class MessageLookup extends MessageLookupByLibrary { "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), + "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"), "jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"), + "jinxingbangdingfuka" : MessageLookupByLibrary.simpleMessage("进行绑定副卡"), "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"), "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage(" 集团创办人"), "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集团创始人"), @@ -292,6 +311,7 @@ class MessageLookup extends MessageLookupByLibrary { "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), + "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即开通"), "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"), "lingqu" : MessageLookupByLibrary.simpleMessage("领取"), @@ -364,6 +384,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"), "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("请填写收件人姓名"), + "qingtong" : MessageLookupByLibrary.simpleMessage("青铜"), "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青铜会员"), "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("请选择使用门店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("请选择收货地址"), @@ -383,11 +404,15 @@ class MessageLookup extends MessageLookupByLibrary { "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("权限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"), + "quanyijishao" : MessageLookupByLibrary.simpleMessage("权益介绍"), + "quanyishuoming" : MessageLookupByLibrary.simpleMessage("权益说明"), + "quanyixiangqing" : MessageLookupByLibrary.simpleMessage("权益详情"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"), "qudanhao" : m23, "qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"), "queding" : MessageLookupByLibrary.simpleMessage("确定"), "queren" : MessageLookupByLibrary.simpleMessage("确认"), + "querenbangding" : MessageLookupByLibrary.simpleMessage("确认绑定"), "querenchongzhi" : MessageLookupByLibrary.simpleMessage("确认充值"), "querenduihuan" : MessageLookupByLibrary.simpleMessage("确认兑换"), "querenshouhuo" : MessageLookupByLibrary.simpleMessage("确认收货"), @@ -458,6 +483,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), "sui" : m28, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), + "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), "tixian" : MessageLookupByLibrary.simpleMessage("提现"), @@ -492,6 +518,7 @@ class MessageLookup extends MessageLookupByLibrary { "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"), "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章详情"), "weulingqu" : MessageLookupByLibrary.simpleMessage("未领取"), + "wodechengjiu" : MessageLookupByLibrary.simpleMessage("我的成就"), "wodedongtai" : MessageLookupByLibrary.simpleMessage("我的动态"), "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"), "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的会员等级"), @@ -531,9 +558,11 @@ class MessageLookup extends MessageLookupByLibrary { "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yaoqingrenshoujihao_" : m32, + "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), "yiduihuanjian" : m33, "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), + "yihuide" : MessageLookupByLibrary.simpleMessage("已获得"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"), @@ -546,6 +575,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), "yingyeshijian" : m34, + "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"), "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"), "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隐私协议》"), diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index 98b6753f..701ba896 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_CN.dart @@ -102,8 +102,10 @@ class MessageLookup extends MessageLookupByLibrary { final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "bainianchuanjiao" : MessageLookupByLibrary.simpleMessage("百年川椒"), + "baiyin" : MessageLookupByLibrary.simpleMessage("白银"), "baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白银会员"), "banben" : m0, + "bangdingfuka" : MessageLookupByLibrary.simpleMessage("绑定副卡"), "bangong" : MessageLookupByLibrary.simpleMessage("办公"), "bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("帮助与反馈"), "baocun" : MessageLookupByLibrary.simpleMessage("保存"), @@ -114,10 +116,12 @@ class MessageLookup extends MessageLookupByLibrary { "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"), "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"), "bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"), + "bojin" : MessageLookupByLibrary.simpleMessage("铂金"), "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"), "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持开票"), "chakan" : MessageLookupByLibrary.simpleMessage("查看"), "chakangengduo" : MessageLookupByLibrary.simpleMessage("查看更多"), + "chakanquanyi" : MessageLookupByLibrary.simpleMessage("查看权益"), "chakanshixiaoquan" : MessageLookupByLibrary.simpleMessage("查看失效券"), "chakanwodekabao" : MessageLookupByLibrary.simpleMessage("查看我的卡包"), "chakanwodekaquan" : MessageLookupByLibrary.simpleMessage("查看我的卡券"), @@ -128,6 +132,8 @@ class MessageLookup extends MessageLookupByLibrary { "chaojiyouhuiquan" : MessageLookupByLibrary.simpleMessage("超值优惠券"), "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("创始人故事"), "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"), + "chengjiu" : MessageLookupByLibrary.simpleMessage("成就"), + "chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"), "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员，享专属权益"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), @@ -136,6 +142,7 @@ class MessageLookup extends MessageLookupByLibrary { "chuangjianshijian" : m2, "chuangshirendegushi" : MessageLookupByLibrary.simpleMessage("创始人的故事-"), "chuangshirendegushi1" : MessageLookupByLibrary.simpleMessage("创始人的故事"), + "chuzhiyouhui" : MessageLookupByLibrary.simpleMessage("储值优惠"), "code_error" : MessageLookupByLibrary.simpleMessage("验证码输入错误"), "cunchu" : MessageLookupByLibrary.simpleMessage("存储"), "cunchutishixinxi" : MessageLookupByLibrary.simpleMessage("为了获得照片使用、缓存等功能，推荐您在使用期间打开存储权限"), @@ -204,6 +211,7 @@ class MessageLookup extends MessageLookupByLibrary { "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), + "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"), "ge" : m5, "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"), @@ -211,9 +219,11 @@ class MessageLookup extends MessageLookupByLibrary { "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"), "gong" : MessageLookupByLibrary.simpleMessage("共"), + "gongchuanghuiyuan" : MessageLookupByLibrary.simpleMessage("共创会员"), "gongjijian" : m6, "gongjijianshangpin" : m7, "gongli" : m8, + "gongxinchengwei" : MessageLookupByLibrary.simpleMessage("恭喜您成为"), "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成为本店的会员，快去享受超多会员权益吧。"), "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), @@ -227,6 +237,7 @@ class MessageLookup extends MessageLookupByLibrary { "heji" : MessageLookupByLibrary.simpleMessage("合计:"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"), + "huangjin" : MessageLookupByLibrary.simpleMessage("黄金"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"), "huifu" : MessageLookupByLibrary.simpleMessage("回复"), "huifu_" : m9, @@ -234,12 +245,17 @@ class MessageLookup extends MessageLookupByLibrary { "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"), + "huiyuanguize" : MessageLookupByLibrary.simpleMessage("会员规则说明"), + "huiyuanhuodejifen" : MessageLookupByLibrary.simpleMessage("会员如何获得积分"), "huiyuanjia" : MessageLookupByLibrary.simpleMessage("会员价"), + "huiyuanjibieduizhao" : MessageLookupByLibrary.simpleMessage("会员级别对照表"), "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"), "huiyuanka" : MessageLookupByLibrary.simpleMessage("会员卡"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"), "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"), + "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"), "huode" : MessageLookupByLibrary.simpleMessage("获得"), + "huodequanyi" : MessageLookupByLibrary.simpleMessage("获得权益"), "huodong" : MessageLookupByLibrary.simpleMessage("活动"), "huodongjianmianpeisongfei" : m10, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"), @@ -252,6 +268,7 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"), "jiajifen" : m11, "jian" : MessageLookupByLibrary.simpleMessage("件"), + "jiangli" : MessageLookupByLibrary.simpleMessage("奖励"), "jianjie" : m12, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"), "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"), @@ -266,8 +283,10 @@ class MessageLookup extends MessageLookupByLibrary { "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), + "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"), "jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"), + "jinxingbangdingfuka" : MessageLookupByLibrary.simpleMessage("进行绑定副卡"), "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"), "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage(" 集团创办人"), "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集团创始人"), @@ -292,6 +311,7 @@ class MessageLookup extends MessageLookupByLibrary { "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), + "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即开通"), "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"), "lingqu" : MessageLookupByLibrary.simpleMessage("领取"), @@ -364,6 +384,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"), "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("请填写收件人姓名"), + "qingtong" : MessageLookupByLibrary.simpleMessage("青铜"), "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青铜会员"), "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("请选择使用门店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("请选择收货地址"), @@ -383,11 +404,15 @@ class MessageLookup extends MessageLookupByLibrary { "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("权限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"), + "quanyijishao" : MessageLookupByLibrary.simpleMessage("权益介绍"), + "quanyishuoming" : MessageLookupByLibrary.simpleMessage("权益说明"), + "quanyixiangqing" : MessageLookupByLibrary.simpleMessage("权益详情"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"), "qudanhao" : m23, "qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"), "queding" : MessageLookupByLibrary.simpleMessage("确定"), "queren" : MessageLookupByLibrary.simpleMessage("确认"), + "querenbangding" : MessageLookupByLibrary.simpleMessage("确认绑定"), "querenchongzhi" : MessageLookupByLibrary.simpleMessage("确认充值"), "querenduihuan" : MessageLookupByLibrary.simpleMessage("确认兑换"), "querenshouhuo" : MessageLookupByLibrary.simpleMessage("确认收货"), @@ -458,6 +483,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), "sui" : m28, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), + "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), "tixian" : MessageLookupByLibrary.simpleMessage("提现"), @@ -492,6 +518,7 @@ class MessageLookup extends MessageLookupByLibrary { "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"), "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章详情"), "weulingqu" : MessageLookupByLibrary.simpleMessage("未领取"), + "wodechengjiu" : MessageLookupByLibrary.simpleMessage("我的成就"), "wodedongtai" : MessageLookupByLibrary.simpleMessage("我的动态"), "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"), "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的会员等级"), @@ -531,9 +558,11 @@ class MessageLookup extends MessageLookupByLibrary { "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yaoqingrenshoujihao_" : m32, + "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), "yiduihuanjian" : m33, "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), + "yihuide" : MessageLookupByLibrary.simpleMessage("已获得"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"), @@ -546,6 +575,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), "yingyeshijian" : m34, + "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"), "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"), "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隐私协议》"), diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart index cfe6b504..99980c81 100644 --- a/lib/generated/intl/messages_zh_Hant_CN.dart +++ b/lib/generated/intl/messages_zh_Hant_CN.dart @@ -102,8 +102,10 @@ class MessageLookup extends MessageLookupByLibrary { final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "bainianchuanjiao" : MessageLookupByLibrary.simpleMessage("百年川椒"), + "baiyin" : MessageLookupByLibrary.simpleMessage("白银"), "baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白銀會員"), "banben" : m0, + "bangdingfuka" : MessageLookupByLibrary.simpleMessage("綁定副卡"), "bangong" : MessageLookupByLibrary.simpleMessage("辦公"), "bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("幫助與反饋"), "baocun" : MessageLookupByLibrary.simpleMessage("保存"), @@ -114,10 +116,12 @@ class MessageLookup extends MessageLookupByLibrary { "bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"), "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("標為已讀"), "bodadianhua" : MessageLookupByLibrary.simpleMessage("撥打電話"), + "bojin" : MessageLookupByLibrary.simpleMessage("铂金"), "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回鄉"), "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持開票"), "chakan" : MessageLookupByLibrary.simpleMessage("查看"), "chakangengduo" : MessageLookupByLibrary.simpleMessage("查看更多"), + "chakanquanyi" : MessageLookupByLibrary.simpleMessage("查看權益"), "chakanshixiaoquan" : MessageLookupByLibrary.simpleMessage("查看失效券"), "chakanwodekabao" : MessageLookupByLibrary.simpleMessage("查看我的卡包"), "chakanwodekaquan" : MessageLookupByLibrary.simpleMessage("查看我的卡券"), @@ -128,6 +132,8 @@ class MessageLookup extends MessageLookupByLibrary { "chaojiyouhuiquan" : MessageLookupByLibrary.simpleMessage("超值优惠券"), "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("創始人故事"), "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"), + "chengjiu" : MessageLookupByLibrary.simpleMessage("成就"), + "chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"), "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市選擇"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成為專屬會員，享專屬權益"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), @@ -136,6 +142,7 @@ class MessageLookup extends MessageLookupByLibrary { "chuangjianshijian" : m2, "chuangshirendegushi" : MessageLookupByLibrary.simpleMessage("創始人的故事-"), "chuangshirendegushi1" : MessageLookupByLibrary.simpleMessage("創始人的故事"), + "chuzhiyouhui" : MessageLookupByLibrary.simpleMessage("儲值優惠"), "code_error" : MessageLookupByLibrary.simpleMessage("驗證碼輸入錯誤"), "cunchu" : MessageLookupByLibrary.simpleMessage("存儲"), "cunchutishixinxi" : MessageLookupByLibrary.simpleMessage("為了獲得照片使用、緩存等功能，推薦您使用期間打開存儲權限"), @@ -204,6 +211,7 @@ class MessageLookup extends MessageLookupByLibrary { "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接點擊右上方的分享給到你想要邀請的人。"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), + "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手機號"), "ge" : m5, "geiwopingfen" : MessageLookupByLibrary.simpleMessage("給我評分"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"), @@ -211,9 +219,11 @@ class MessageLookup extends MessageLookupByLibrary { "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("個人信息"), "gong" : MessageLookupByLibrary.simpleMessage("共"), + "gongchuanghuiyuan" : MessageLookupByLibrary.simpleMessage("共创会员"), "gongjijian" : m6, "gongjijianshangpin" : m7, "gongli" : m8, + "gongxinchengwei" : MessageLookupByLibrary.simpleMessage("恭喜您成爲"), "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成為本店會員，快去享受超多的會員權益吧。"), "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("請勾選同意隱私服務和一心回鄉服務協定"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), @@ -227,6 +237,7 @@ class MessageLookup extends MessageLookupByLibrary { "heji" : MessageLookupByLibrary.simpleMessage("合計:"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"), + "huangjin" : MessageLookupByLibrary.simpleMessage("黄金"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黃金會員"), "huifu" : MessageLookupByLibrary.simpleMessage("回復"), "huifu_" : m9, @@ -234,12 +245,17 @@ class MessageLookup extends MessageLookupByLibrary { "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回鄉頭條"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("會員等級説明"), + "huiyuanguize" : MessageLookupByLibrary.simpleMessage("會員規則説明"), + "huiyuanhuodejifen" : MessageLookupByLibrary.simpleMessage("會員如何獲得積分"), "huiyuanjia" : MessageLookupByLibrary.simpleMessage("會員價"), + "huiyuanjibieduizhao" : MessageLookupByLibrary.simpleMessage("會員級別對照表"), "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"), "huiyuanka" : MessageLookupByLibrary.simpleMessage("會員卡"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("會員卡詳情"), "huiyuanyue" : MessageLookupByLibrary.simpleMessage("會員餘額"), + "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("會員中心"), "huode" : MessageLookupByLibrary.simpleMessage("獲得"), + "huodequanyi" : MessageLookupByLibrary.simpleMessage("獲得權益"), "huodong" : MessageLookupByLibrary.simpleMessage("活動"), "huodongjianmianpeisongfei" : m10, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活動進行中"), @@ -252,6 +268,7 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"), "jiajifen" : m11, "jian" : MessageLookupByLibrary.simpleMessage("件"), + "jiangli" : MessageLookupByLibrary.simpleMessage("獎勵"), "jianjie" : m12, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加載失敗"), "jiesuan" : MessageLookupByLibrary.simpleMessage("結算"), @@ -266,8 +283,10 @@ class MessageLookup extends MessageLookupByLibrary { "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("積分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"), + "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日會員任務"), "jinrushangdian" : MessageLookupByLibrary.simpleMessage("進入商店"), + "jinxingbangdingfuka" : MessageLookupByLibrary.simpleMessage("進行綁定副卡"), "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("進行中的訂單"), "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"), "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集團創始人"), @@ -292,6 +311,7 @@ class MessageLookup extends MessageLookupByLibrary { "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("連續簽到領取雙倍積分"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即參加"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), + "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即開通"), "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即簽到"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即體驗"), "lingqu" : MessageLookupByLibrary.simpleMessage("領取"), @@ -364,6 +384,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("請輸入支付密碼"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("請填寫收件人手機號"), "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("請填寫收件人姓名"), + "qingtong" : MessageLookupByLibrary.simpleMessage("青铜"), "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青銅會員"), "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("請選擇使用門店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("請選擇收貨地址"), @@ -383,11 +404,15 @@ class MessageLookup extends MessageLookupByLibrary { "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("權限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("權限設置"), + "quanyijishao" : MessageLookupByLibrary.simpleMessage("權益介紹"), + "quanyishuoming" : MessageLookupByLibrary.simpleMessage("權益説明"), + "quanyixiangqing" : MessageLookupByLibrary.simpleMessage("權益詳情"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐號"), "qudanhao" : m23, "qudenglu" : MessageLookupByLibrary.simpleMessage("去登錄"), "queding" : MessageLookupByLibrary.simpleMessage("確定"), "queren" : MessageLookupByLibrary.simpleMessage("确认"), + "querenbangding" : MessageLookupByLibrary.simpleMessage("確認綁定"), "querenchongzhi" : MessageLookupByLibrary.simpleMessage("確認充值"), "querenduihuan" : MessageLookupByLibrary.simpleMessage("确认兑换"), "querenshouhuo" : MessageLookupByLibrary.simpleMessage("確認收貨"), @@ -458,6 +483,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"), "sui" : m28, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"), + "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停車位"), "tixian" : MessageLookupByLibrary.simpleMessage("提現"), @@ -492,6 +518,7 @@ class MessageLookup extends MessageLookupByLibrary { "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"), "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章詳情"), "weulingqu" : MessageLookupByLibrary.simpleMessage("未領取"), + "wodechengjiu" : MessageLookupByLibrary.simpleMessage("我的成就"), "wodedongtai" : MessageLookupByLibrary.simpleMessage("我的動態"), "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"), "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的會員等級"), @@ -531,9 +558,11 @@ class MessageLookup extends MessageLookupByLibrary { "xuanguige" : MessageLookupByLibrary.simpleMessage("選規格"), "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"), "yaoqingrenshoujihao_" : m32, + "yibangfuka" : MessageLookupByLibrary.simpleMessage("已綁副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"), "yiduihuanjian" : m33, "yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"), + "yihuide" : MessageLookupByLibrary.simpleMessage("已獲得"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已領取"), @@ -546,6 +575,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"), "yingyeshijian" : m34, + "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("飲食"), "yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"), "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隱私協議》"), diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index 3c39e71d..c2f45ed6 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/lib/generated/intl/messages_zh_TW.dart @@ -102,8 +102,10 @@ class MessageLookup extends MessageLookupByLibrary { final messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "bainianchuanjiao" : MessageLookupByLibrary.simpleMessage("百年川椒"), + "baiyin" : MessageLookupByLibrary.simpleMessage("白银"), "baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("白銀會員"), "banben" : m0, + "bangdingfuka" : MessageLookupByLibrary.simpleMessage("綁定副卡"), "bangong" : MessageLookupByLibrary.simpleMessage("辦公"), "bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("幫助與反饋"), "baocun" : MessageLookupByLibrary.simpleMessage("保存"), @@ -114,10 +116,12 @@ class MessageLookup extends MessageLookupByLibrary { "bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"), "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("標為已讀"), "bodadianhua" : MessageLookupByLibrary.simpleMessage("撥打電話"), + "bojin" : MessageLookupByLibrary.simpleMessage("铂金"), "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回鄉"), "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持開票"), "chakan" : MessageLookupByLibrary.simpleMessage("查看"), "chakangengduo" : MessageLookupByLibrary.simpleMessage("查看更多"), + "chakanquanyi" : MessageLookupByLibrary.simpleMessage("查看權益"), "chakanshixiaoquan" : MessageLookupByLibrary.simpleMessage("查看失效券"), "chakanwodekabao" : MessageLookupByLibrary.simpleMessage("查看我的卡包"), "chakanwodekaquan" : MessageLookupByLibrary.simpleMessage("查看我的卡券"), @@ -128,6 +132,8 @@ class MessageLookup extends MessageLookupByLibrary { "chaojiyouhuiquan" : MessageLookupByLibrary.simpleMessage("超值优惠券"), "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("創始人故事"), "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"), + "chengjiu" : MessageLookupByLibrary.simpleMessage("成就"), + "chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"), "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市選擇"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成為專屬會員，享專屬權益"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), @@ -136,6 +142,7 @@ class MessageLookup extends MessageLookupByLibrary { "chuangjianshijian" : m2, "chuangshirendegushi" : MessageLookupByLibrary.simpleMessage("創始人的故事-"), "chuangshirendegushi1" : MessageLookupByLibrary.simpleMessage("創始人的故事"), + "chuzhiyouhui" : MessageLookupByLibrary.simpleMessage("儲值優惠"), "code_error" : MessageLookupByLibrary.simpleMessage("驗證碼輸入錯誤"), "cunchu" : MessageLookupByLibrary.simpleMessage("存儲"), "cunchutishixinxi" : MessageLookupByLibrary.simpleMessage("為了獲得照片使用、緩存等功能，推薦您使用期間打開存儲權限"), @@ -204,6 +211,7 @@ class MessageLookup extends MessageLookupByLibrary { "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接點擊右上方的分享給到你想要邀請的人。"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), + "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手機號"), "ge" : m5, "geiwopingfen" : MessageLookupByLibrary.simpleMessage("給我評分"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"), @@ -211,9 +219,11 @@ class MessageLookup extends MessageLookupByLibrary { "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更換頭像"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("個人信息"), "gong" : MessageLookupByLibrary.simpleMessage("共"), + "gongchuanghuiyuan" : MessageLookupByLibrary.simpleMessage("共创会员"), "gongjijian" : m6, "gongjijianshangpin" : m7, "gongli" : m8, + "gongxinchengwei" : MessageLookupByLibrary.simpleMessage("恭喜您成爲"), "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成為本店會員，快去享受超多的會員權益吧。"), "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("請勾選同意隱私服務和一心回鄉服務協定"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), @@ -227,6 +237,7 @@ class MessageLookup extends MessageLookupByLibrary { "heji" : MessageLookupByLibrary.simpleMessage("合計:"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"), + "huangjin" : MessageLookupByLibrary.simpleMessage("黄金"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黃金會員"), "huifu" : MessageLookupByLibrary.simpleMessage("回復"), "huifu_" : m9, @@ -234,12 +245,17 @@ class MessageLookup extends MessageLookupByLibrary { "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回鄉頭條"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("會員等級説明"), + "huiyuanguize" : MessageLookupByLibrary.simpleMessage("會員規則説明"), + "huiyuanhuodejifen" : MessageLookupByLibrary.simpleMessage("會員如何獲得積分"), "huiyuanjia" : MessageLookupByLibrary.simpleMessage("會員價"), + "huiyuanjibieduizhao" : MessageLookupByLibrary.simpleMessage("會員級別對照表"), "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"), "huiyuanka" : MessageLookupByLibrary.simpleMessage("會員卡"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("會員卡詳情"), "huiyuanyue" : MessageLookupByLibrary.simpleMessage("會員餘額"), + "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("會員中心"), "huode" : MessageLookupByLibrary.simpleMessage("獲得"), + "huodequanyi" : MessageLookupByLibrary.simpleMessage("獲得權益"), "huodong" : MessageLookupByLibrary.simpleMessage("活動"), "huodongjianmianpeisongfei" : m10, "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活動進行中"), @@ -252,6 +268,7 @@ class MessageLookup extends MessageLookupByLibrary { "input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"), "jiajifen" : m11, "jian" : MessageLookupByLibrary.simpleMessage("件"), + "jiangli" : MessageLookupByLibrary.simpleMessage("獎勵"), "jianjie" : m12, "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加載失敗"), "jiesuan" : MessageLookupByLibrary.simpleMessage("結算"), @@ -266,8 +283,10 @@ class MessageLookup extends MessageLookupByLibrary { "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("積分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"), + "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日會員任務"), "jinrushangdian" : MessageLookupByLibrary.simpleMessage("進入商店"), + "jinxingbangdingfuka" : MessageLookupByLibrary.simpleMessage("進行綁定副卡"), "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("進行中的訂單"), "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"), "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集團創始人"), @@ -292,6 +311,7 @@ class MessageLookup extends MessageLookupByLibrary { "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("連續簽到領取雙倍積分"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即參加"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), + "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即開通"), "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即簽到"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即體驗"), "lingqu" : MessageLookupByLibrary.simpleMessage("領取"), @@ -364,6 +384,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("請輸入支付密碼"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("請填寫收件人手機號"), "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("請填寫收件人姓名"), + "qingtong" : MessageLookupByLibrary.simpleMessage("青铜"), "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青銅會員"), "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("請選擇使用門店"), "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("請選擇收貨地址"), @@ -383,11 +404,15 @@ class MessageLookup extends MessageLookupByLibrary { "quantian" : MessageLookupByLibrary.simpleMessage("全天"), "quanxian" : MessageLookupByLibrary.simpleMessage("權限"), "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("權限設置"), + "quanyijishao" : MessageLookupByLibrary.simpleMessage("權益介紹"), + "quanyishuoming" : MessageLookupByLibrary.simpleMessage("權益説明"), + "quanyixiangqing" : MessageLookupByLibrary.simpleMessage("權益詳情"), "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐號"), "qudanhao" : m23, "qudenglu" : MessageLookupByLibrary.simpleMessage("去登錄"), "queding" : MessageLookupByLibrary.simpleMessage("確定"), "queren" : MessageLookupByLibrary.simpleMessage("确认"), + "querenbangding" : MessageLookupByLibrary.simpleMessage("確認綁定"), "querenchongzhi" : MessageLookupByLibrary.simpleMessage("確認充值"), "querenduihuan" : MessageLookupByLibrary.simpleMessage("确认兑换"), "querenshouhuo" : MessageLookupByLibrary.simpleMessage("確認收貨"), @@ -458,6 +483,7 @@ class MessageLookup extends MessageLookupByLibrary { "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"), "sui" : m28, "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"), + "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停車位"), "tixian" : MessageLookupByLibrary.simpleMessage("提現"), @@ -492,6 +518,7 @@ class MessageLookup extends MessageLookupByLibrary { "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"), "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章詳情"), "weulingqu" : MessageLookupByLibrary.simpleMessage("未領取"), + "wodechengjiu" : MessageLookupByLibrary.simpleMessage("我的成就"), "wodedongtai" : MessageLookupByLibrary.simpleMessage("我的動態"), "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"), "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的會員等級"), @@ -531,9 +558,11 @@ class MessageLookup extends MessageLookupByLibrary { "xuanguige" : MessageLookupByLibrary.simpleMessage("選規格"), "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"), "yaoqingrenshoujihao_" : m32, + "yibangfuka" : MessageLookupByLibrary.simpleMessage("已綁副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"), "yiduihuanjian" : m33, "yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"), + "yihuide" : MessageLookupByLibrary.simpleMessage("已獲得"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已領取"), @@ -546,6 +575,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"), "yingyeshijian" : m34, + "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("飲食"), "yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"), "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隱私協議》"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 5587fa8a..b1e01442 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -5175,6 +5175,326 @@ class S { ); } + /// `银卡会员` + String get yinkahuiyuan { + return Intl.message( + '银卡会员', + name: 'yinkahuiyuan', + desc: '', + args: [], + ); + } + + /// `金卡会员` + String get jinkahuiyuan { + return Intl.message( + '金卡会员', + name: 'jinkahuiyuan', + desc: '', + args: [], + ); + } + + /// `共创会员` + String get gongchuanghuiyuan { + return Intl.message( + '共创会员', + name: 'gongchuanghuiyuan', + desc: '', + args: [], + ); + } + + /// `青铜` + String get qingtong { + return Intl.message( + '青铜', + name: 'qingtong', + desc: '', + args: [], + ); + } + + /// `黄金` + String get huangjin { + return Intl.message( + '黄金', + name: 'huangjin', + desc: '', + args: [], + ); + } + + /// `白银` + String get baiyin { + return Intl.message( + '白银', + name: 'baiyin', + desc: '', + args: [], + ); + } + + /// `铂金` + String get bojin { + return Intl.message( + '铂金', + name: 'bojin', + desc: '', + args: [], + ); + } + + /// `我的成就` + String get wodechengjiu { + return Intl.message( + '我的成就', + name: 'wodechengjiu', + desc: '', + args: [], + ); + } + + /// `成就徽章` + String get chengjiuhuizhang { + return Intl.message( + '成就徽章', + name: 'chengjiuhuizhang', + desc: '', + args: [], + ); + } + + /// `成就` + String get chengjiu { + return Intl.message( + '成就', + name: 'chengjiu', + desc: '', + args: [], + ); + } + + /// `奖励` + String get jiangli { + return Intl.message( + '奖励', + name: 'jiangli', + desc: '', + args: [], + ); + } + + /// `已获得` + String get yihuide { + return Intl.message( + '已获得', + name: 'yihuide', + desc: '', + args: [], + ); + } + + /// `会员中心` + String get huiyuanzhongxin { + return Intl.message( + '会员中心', + name: 'huiyuanzhongxin', + desc: '', + args: [], + ); + } + + /// `会员规则说明` + String get huiyuanguize { + return Intl.message( + '会员规则说明', + name: 'huiyuanguize', + desc: '', + args: [], + ); + } + + /// `会员级别对照表` + String get huiyuanjibieduizhao { + return Intl.message( + '会员级别对照表', + name: 'huiyuanjibieduizhao', + desc: '', + args: [], + ); + } + + /// `会员如何获得积分` + String get huiyuanhuodejifen { + return Intl.message( + '会员如何获得积分', + name: 'huiyuanhuodejifen', + desc: '', + args: [], + ); + } + + /// `立即开通` + String get lijikaitong { + return Intl.message( + '立即开通', + name: 'lijikaitong', + desc: '', + args: [], + ); + } + + /// `恭喜您成为` + String get gongxinchengwei { + return Intl.message( + '恭喜您成为', + name: 'gongxinchengwei', + desc: '', + args: [], + ); + } + + /// `获得权益` + String get huodequanyi { + return Intl.message( + '获得权益', + name: 'huodequanyi', + desc: '', + args: [], + ); + } + + /// `查看权益` + String get chakanquanyi { + return Intl.message( + '查看权益', + name: 'chakanquanyi', + desc: '', + args: [], + ); + } + + /// `储值优惠` + String get chuzhiyouhui { + return Intl.message( + '储值优惠', + name: 'chuzhiyouhui', + desc: '', + args: [], + ); + } + + /// `权益详情` + String get quanyixiangqing { + return Intl.message( + '权益详情', + name: 'quanyixiangqing', + desc: '', + args: [], + ); + } + + /// `权益介绍` + String get quanyijishao { + return Intl.message( + '权益介绍', + name: 'quanyijishao', + desc: '', + args: [], + ); + } + + /// `权益说明` + String get quanyishuoming { + return Intl.message( + '权益说明', + name: 'quanyishuoming', + desc: '', + args: [], + ); + } + + /// `已绑副卡` + String get yibangfuka { + return Intl.message( + '已绑副卡', + name: 'yibangfuka', + desc: '', + args: [], + ); + } + + /// `添加新副卡` + String get tianjifuka { + return Intl.message( + '添加新副卡', + name: 'tianjifuka', + desc: '', + args: [], + ); + } + + /// `绑定副卡` + String get bangdingfuka { + return Intl.message( + '绑定副卡', + name: 'bangdingfuka', + desc: '', + args: [], + ); + } + + /// `进行绑定副卡` + String get jinxingbangdingfuka { + return Intl.message( + '进行绑定副卡', + name: 'jinxingbangdingfuka', + desc: '', + args: [], + ); + } + + /// `副卡手机号` + String get fukashoujihao { + return Intl.message( + '副卡手机号', + name: 'fukashoujihao', + desc: '', + args: [], + ); + } + + /// `确认绑定` + String get querenbangding { + return Intl.message( + '确认绑定', + name: 'querenbangding', + desc: '', + args: [], + ); + } + + /// `暂未开通` + String get zanweikaitong { + return Intl.message( + '暂未开通', + name: 'zanweikaitong', + desc: '', + args: [], + ); + } + + /// `会员权益` + String get huiyuanquanyi { + return Intl.message( + '会员权益', + name: 'huiyuanquanyi', + desc: '', + args: [], + ); + } + /// `并使用本机号码登录` String get privacy_policy4 { return Intl.message( diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index 257d70a9..e5e45460 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -5,7 +5,6 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:huixiang/generated/l10n.dart'; -import 'package:huixiang/home/home_view/coupon.dart'; import 'package:huixiang/home/home_view/featured_acticvity.dart'; import 'package:huixiang/home/home_view/home_banner.dart'; import 'package:huixiang/home/home_view/home_integral_store.dart'; @@ -329,6 +328,7 @@ class _HomePage extends State with AutomaticKeepAliveClientMixin { ); } + ///扫码 toScan() async { if (await Permission.camera.isPermanentlyDenied) { showCupertinoDialog( diff --git a/lib/home/points_mall_view/points_goods_view.dart b/lib/home/points_mall_view/points_goods_view.dart index aaabe68d..6859aa03 100644 --- a/lib/home/points_mall_view/points_goods_view.dart +++ b/lib/home/points_mall_view/points_goods_view.dart @@ -111,7 +111,7 @@ class _PointGoods extends State { height: 5.h, ), Text( - S.of(context).jifen_(goods.price), + (goods?.price == null || goods.price == "0"?"":S.of(context).jifen_(goods.price)) + (goods?.money == null|| goods.money == "0.00" ?"":" + ${goods.money}元"), style: TextStyle( color: Color(0xFF32A060), fontSize: 14.sp, diff --git a/lib/integral_store/integral_store_details_page.dart b/lib/integral_store/integral_store_details_page.dart index 3612cc6b..89d4afaa 100644 --- a/lib/integral_store/integral_store_details_page.dart +++ b/lib/integral_store/integral_store_details_page.dart @@ -4,6 +4,7 @@ import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_html/image_render.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; @@ -22,17 +23,14 @@ class IntegralStoreDetailsPage extends StatefulWidget { @override State createState() { - return _IntegralStoreDetailsPage(this.arguments); + return _IntegralStoreDetailsPage(); } } -class _IntegralStoreDetailsPage extends State { +class _IntegralStoreDetailsPage extends State { ApiService apiService; - String points; - final Map arguments; - - _IntegralStoreDetailsPage(this.arguments); + int payType = 0; @override void initState() { @@ -50,12 +48,24 @@ class _IntegralStoreDetailsPage extends State { Goods goods; + ///查询积分商品详情 queryGoodsById() async { - BaseData baseData = - await apiService.creditGoodsById(arguments["goodsId"]).catchError((onError) {}); + BaseData baseData = await apiService + .creditGoodsById(widget.arguments["goodsId"]) + .catchError((onError) {}); if (baseData != null && baseData.isSuccess) { setState(() { goods = baseData.data; + if(goods != null && points != null && double.tryParse(goods.onePrice) + != 0 && double.tryParse(goods.onePrice) <= double.tryParse(points)){ + payType = 1; + } else if (goods != null && points != null && double.tryParse(goods.price) + <= double.tryParse(points)){ + payType = 2; + } else if (goods != null && points != null + && double.tryParse(goods.oneMoney) != 0){ + payType = 3; + } }); } } @@ -63,13 +73,6 @@ class _IntegralStoreDetailsPage extends State { @override Widget build(BuildContext context) { return Scaffold( - // appBar: MyAppBar( - // background: Color(0xFFFFFFFF), - // leadingColor: Colors.black, - // title: S.of(context).shangpinxiangqing, - // titleColor: Colors.black, - // titleSize: 16.sp, - // ), body: Container( child: Column( children: [ @@ -92,13 +95,12 @@ class _IntegralStoreDetailsPage extends State { ), ), ), - if (goods != null && - goods.detail != null && + if (goods?.detail != null && goods.detail != "") Container( color: Colors.white, child: Html( - data: goods != null ? goods.detail : "", + data: goods?.detail??"", customImageRenders: { networkSourceMatcher(): networkImageRender( loadingWidget: () { @@ -115,34 +117,29 @@ class _IntegralStoreDetailsPage extends State { ), GestureDetector( onTap: () { - // if (goods != null && - // points != null && - // int.tryParse(goods.price) < int.tryParse(points)) { - // toExchangeOrder(); - // } + if(payType > 0){ + toExchangeOrder(); + }else{ + SmartDialog.showToast("您的积分不足!", alignment: Alignment.center); + return; + } }, child: Container( padding: EdgeInsets.only(top: 16.h, bottom: 16.h), decoration: BoxDecoration( - color: - // (goods != null && - // points != null && - // int.tryParse(goods.price) < int.tryParse(points)) - // ? Color(0xFF32A060) - // : - Color(0xFFD8D8D8), + color: (payType > 0) + ? Color(0xFF32A060) + : Color(0xFFD8D8D8), borderRadius: BorderRadius.vertical( top: Radius.circular(4), ), ), alignment: Alignment.center, child: Text( - // (goods != null && - // points != null && - // int.tryParse(goods.price) < int.tryParse(points)) - // ? S.of(context).duihuan - // : S.of(context).jifenbuzu, - "兑换功能暂未开放", + (payType > 0) + ? S.of(context).duihuan + : S.of(context).jifenbuzu, + // "兑换功能暂未开放", style: TextStyle( fontSize: 16.sp, color: Color(0xFFFFFFFF), @@ -163,8 +160,12 @@ class _IntegralStoreDetailsPage extends State { .pushNamed('/router/exchange_order_page', arguments: { "goodsId": goods.id, "name": goods.name, + "money": goods.money, + "onePrice":goods.onePrice, + "oneMoney":goods.oneMoney, "price": goods.price, "image": goods.mainImgPath, + "payType":payType, "useTyped": goods.canPick ? 1 : goods.canDelivery @@ -204,29 +205,36 @@ class _IntegralStoreDetailsPage extends State { mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Text( - goods == null ? "" : S.of(context).jifen_(goods.price), - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - fontSize: 18.sp, - color: Color(0xFF32A060), - ), + Text( + (goods?.price == null || goods.price == "0" + ? "" + : S.of(context).jifen_(goods.price)) + + (goods?.money == null || goods.money == "0.00" + ? "" + : " + ${goods.money}元"), + style: TextStyle( + fontWeight: MyFontWeight.semi_bold, + fontSize: 18.sp, + color: Color(0xFF32A060), ), + ), SizedBox( width: 10.w, ), - Expanded(child: Text( - S.of(context).yuan_(goods?.worth??goods?.worth??""), - style: TextStyle( - color: Color(0xFF585858), - decoration: TextDecoration.lineThrough, - decorationColor: Color(0xFF585858), - fontWeight: MyFontWeight.regular, - fontSize: 14.sp, + Expanded( + child: Text( + S.of(context).yuan_(goods?.worth ?? goods?.worth ?? ""), + style: TextStyle( + color: Color(0xFF585858), + decoration: TextDecoration.lineThrough, + decorationColor: Color(0xFF585858), + fontWeight: MyFontWeight.regular, + fontSize: 14.sp, + ), ), - ),), + ), Text( - "库存:${goods?.stock ?? goods?.stock ??""}份", + "库存:${goods?.stock ?? goods?.stock ?? ""}份", style: TextStyle( color: Color(0xFF585858), decorationColor: Color(0xFF353535), @@ -288,22 +296,22 @@ class _IntegralStoreDetailsPage extends State { return goods == null ? Container() : Image.network( - goods.viceImgPaths.elementAt(position), - fit: BoxFit.cover, - ); + goods.viceImgPaths.elementAt(position), + fit: BoxFit.cover, + ); }, itemCount: (goods == null || goods.viceImgPaths == null) ? 1 : goods.viceImgPaths.length, ), GestureDetector( - onTap: (){ + onTap: () { Navigator.of(context).pop(); }, - child: Container( - margin: EdgeInsets.only(left: 16,top: 52), - padding:EdgeInsets.all(5), - child:Image.asset( + child: Container( + margin: EdgeInsets.only(left: 16, top: 52), + padding: EdgeInsets.all(5), + child: Image.asset( "assets/image/integral_return.png", // alignment: Alignment.center, width: 24, diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 75915aeb..4652dae0 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -537,6 +537,40 @@ "fensi": "粉丝", "guanzhu": "关注", "wodedongtai": "我的动态", + "yinkahuiyuan": "银卡会员", + "jinkahuiyuan": "金卡会员", + "gongchuanghuiyuan": "共创会员", + "qingtong": "青铜", + "huangjin": "黄金", + "baiyin": "白银", + "bojin": "铂金", + "wodechengjiu": "我的成就", + "chengjiuhuizhang": "成就徽章", + "chengjiu": "成就", + "jiangli": "奖励", + "yihuide": "已获得", + "huiyuanzhongxin": "会员中心", + "huiyuanguize": "会员规则说明", + "huiyuanjibieduizhao": "会员级别对照表", + "huiyuanhuodejifen": "会员如何获得积分", + "lijikaitong": "立即开通", + "gongxinchengwei": "恭喜您成为", + "huodequanyi": "获得权益", + "chakanquanyi": "查看权益", + "chuzhiyouhui": "储值优惠", + "quanyixiangqing": "权益详情", + "quanyijishao": "权益介绍", + "quanyishuoming": "权益说明", + "yibangfuka": "已绑副卡", + "tianjifuka": "添加新副卡", + "bangdingfuka": "绑定副卡", + "jinxingbangdingfuka": "进行绑定副卡", + "fukashoujihao": "副卡手机号", + "querenbangding": "确认绑定", + "zanweikaitong": "暂未开通", + "huiyuanquanyi": "会员权益", + + diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 86a5a1b9..1217861b 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -537,6 +537,36 @@ "fensi": "粉丝", "guanzhu": "关注", "wodedongtai": "我的动态", + "yinkahuiyuan": "银卡会员", + "jinkahuiyuan": "金卡会员", + "gongchuanghuiyuan": "共创会员", + "qingtong": "青铜", + "huangjin": "黄金", + "baiyin": "白银", + "bojin": "铂金", + "wodechengjiu": "我的成就", + "chengjiuhuizhang": "成就徽章", + "chengjiu": "成就", + "jiangli": "奖励", + "yihuide": "已获得", + "huiyuanzhongxin": "会员中心", + "huiyuanguize": "会员规则说明", + "huiyuanjibieduizhao": "会员级别对照表", + "huiyuanhuodejifen": "会员如何获得积分", + "lijikaitong": "立即开通", + "gongxinchengwei": "恭喜您成为", + "huodequanyi": "获得权益", + "chakanquanyi": "查看权益", + "chuzhiyouhui": "储值优惠", + "quanyixiangqing": "权益详情", + "quanyijishao": "权益介绍", + "quanyishuoming": "权益说明", + "yibangfuka": "已绑副卡", + "tianjifuka": "添加新副卡", + "bangdingfuka": "绑定副卡", + "jinxingbangdingfuka": "进行绑定副卡", + "fukashoujihao": "副卡手机号", + "querenbangding": "确认绑定", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 2dac914a..d62c16dc 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -537,6 +537,36 @@ "fensi": "粉丝", "guanzhu": "关注", "wodedongtai": "我的动态", + "yinkahuiyuan": "银卡会员", + "jinkahuiyuan": "金卡会员", + "gongchuanghuiyuan": "共创会员", + "qingtong": "青铜", + "huangjin": "黄金", + "baiyin": "白银", + "bojin": "铂金", + "wodechengjiu": "我的成就", + "chengjiuhuizhang": "成就徽章", + "chengjiu": "成就", + "jiangli": "奖励", + "yihuide": "已获得", + "huiyuanzhongxin": "会员中心", + "huiyuanguize": "会员规则说明", + "huiyuanjibieduizhao": "会员级别对照表", + "huiyuanhuodejifen": "会员如何获得积分", + "lijikaitong": "立即开通", + "gongxinchengwei": "恭喜您成为", + "huodequanyi": "获得权益", + "chakanquanyi": "查看权益", + "chuzhiyouhui": "储值优惠", + "quanyixiangqing": "权益详情", + "quanyijishao": "权益介绍", + "quanyishuoming": "权益说明", + "yibangfuka": "已绑副卡", + "tianjifuka": "添加新副卡", + "bangdingfuka": "绑定副卡", + "jinxingbangdingfuka": "进行绑定副卡", + "fukashoujihao": "副卡手机号", + "querenbangding": "确认绑定", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index 92d3ef37..f8bb068e 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -532,6 +532,37 @@ "fensi": "粉絲", "guanzhu": "關注", "wodedongtai": "我的動態", + "yinkahuiyuan": "银卡会员", + "jinkahuiyuan": "金卡会员", + "gongchuanghuiyuan": "共创会员", + "qingtong": "青铜", + "huangjin": "黄金", + "baiyin": "白银", + "bojin": "铂金", + "wodechengjiu": "我的成就", + "chengjiuhuizhang": "成就徽章", + "chengjiu": "成就", + "jiangli": "獎勵", + "yihuide": "已獲得", + "huiyuanzhongxin": "會員中心", + "huiyuanguize": "會員規則説明", + "huiyuanjibieduizhao": "會員級別對照表", + "huiyuanhuodejifen": "會員如何獲得積分", + "lijikaitong": "立即開通", + "gongxinchengwei": "恭喜您成爲", + "huodequanyi": "獲得權益", + "chakanquanyi": "查看權益", + "chuzhiyouhui": "儲值優惠", + "quanyixiangqing": "權益詳情", + "quanyijishao": "權益介紹", + "quanyishuoming": "權益説明", + "yibangfuka": "已綁副卡", + "tianjifuka": "添加新副卡", + "bangdingfuka": "綁定副卡", + "jinxingbangdingfuka": "進行綁定副卡", + "fukashoujihao": "副卡手機號", + "querenbangding": "確認綁定", + diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 3996d39d..1d500a8d 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -531,6 +531,36 @@ "fensi": "粉絲", "guanzhu": "關注", "wodedongtai": "我的動態", + "yinkahuiyuan": "银卡会员", + "jinkahuiyuan": "金卡会员", + "gongchuanghuiyuan": "共创会员", + "qingtong": "青铜", + "huangjin": "黄金", + "baiyin": "白银", + "bojin": "铂金", + "wodechengjiu": "我的成就", + "chengjiuhuizhang": "成就徽章", + "chengjiu": "成就", + "jiangli": "獎勵", + "yihuide": "已獲得", + "huiyuanzhongxin": "會員中心", + "huiyuanguize": "會員規則説明", + "huiyuanjibieduizhao": "會員級別對照表", + "huiyuanhuodejifen": "會員如何獲得積分", + "lijikaitong": "立即開通", + "gongxinchengwei": "恭喜您成爲", + "huodequanyi": "獲得權益", + "chakanquanyi": "查看權益", + "chuzhiyouhui": "儲值優惠", + "quanyixiangqing": "權益詳情", + "quanyijishao": "權益介紹", + "quanyishuoming": "權益説明", + "yibangfuka": "已綁副卡", + "tianjifuka": "添加新副卡", + "bangdingfuka": "綁定副卡", + "jinxingbangdingfuka": "進行綁定副卡", + "fukashoujihao": "副卡手機號", + "querenbangding": "確認綁定", diff --git a/lib/main.dart b/lib/main.dart index 5f02f6b1..91276bd3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -78,6 +78,11 @@ import 'mine/fans_page.dart'; import 'mine/follow_page.dart'; import 'mine/manage_address_page.dart'; import 'mine/mine_view/community_follow.dart'; +import 'mine/mine_vip/binding_assistant_card.dart'; +import 'mine/mine_vip/legal_right_details.dart'; +import 'mine/mine_vip/mine_attainment_page.dart'; +import 'mine/mine_vip/mine_vip_core.dart'; +import 'view_widget/vip_dialog.dart'; import 'mine/release_page.dart'; import 'mine/roll_center_page.dart'; @@ -238,8 +243,14 @@ Map routers = { ManageAddressPage(arguments: arguments), '/router/exchange_order_page': (context, {arguments}) => ExchangeOrderPage(arguments: arguments), - '/router/mine_vip_level_page': (context, {arguments}) => - MineVipLevelPage(arguments: arguments), + // '/router/mine_vip_level_page': (context, {arguments}) => + // MineVipLevelPage(arguments: arguments), + '/router/mine_vip_core': (context, {arguments}) => + MineVipCore(arguments: arguments), + '/router/legal_right_details': (context, {arguments}) => + LegalRightDetails(), + '/router/binding_assistant_card': (context, {arguments}) => + BindingAssistantCard(), '/router/order_history_page': (context, {arguments}) => OrderHistoryPage(arguments: arguments), '/router/union_detail_page': (context, {arguments}) => @@ -309,4 +320,5 @@ Map routers = { '/router/releasePage': (context, {arguments}) => ReleasePage(), '/router/activity_list': (context, {arguments}) => ActivityList(), '/router/class_details': (context, {arguments}) => ClassDetails(arguments: arguments), + '/router/mine_attainment_page': (context, {arguments}) => MineAttainmentPage(arguments: arguments), }; diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart index 5c6380ae..3050b5ff 100644 --- a/lib/mine/mine_page.dart +++ b/lib/mine/mine_page.dart @@ -320,45 +320,95 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { mainAxisAlignment: MainAxisAlignment.spaceAround, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Row( - children: [ - Text( - S.of(context).guanzhu, - style: TextStyle( - color: Color(0xFF000000), - fontSize: 14.sp, - fontWeight: MyFontWeight.regular, + GestureDetector( + onTap:(){ + Navigator.of(context).pushNamed( + '/router/communityFollow', + arguments: {}, + ); + }, + child: + Row( + children: [ + Text( + S.of(context).guanzhu, + style: TextStyle( + color: Color(0xFF000000), + fontSize: 14.sp, + fontWeight: MyFontWeight.regular, + ), + ), + SizedBox(width: 5,), + Text( + infoNumber != null ?infoNumber.follow.toString() :"0", + style: TextStyle( + color: Color(0xFF000000), + fontSize: 15.sp, + fontWeight: MyFontWeight.medium, + ), + ), + ], ), - ), - Text( - "(" + (infoNumber != null ?infoNumber.follow.toString() :"0") +")", - style: TextStyle( - color: Color(0xFF000000), - fontSize: 15.sp, - fontWeight: MyFontWeight.medium, + ), + GestureDetector( + onTap:(){ + Navigator.of(context).pushNamed( + '/router/communityFollow', + arguments: {}, + ); + }, + child: + Row( + children: [ + Text( + S.of(context).fensi, + style: TextStyle( + color: Color(0xFF000000), + fontSize: 14.sp, + fontWeight: MyFontWeight.regular, + ), ), - ), - ], + SizedBox(width: 5,), + Text( + infoNumber != null ?infoNumber.fans.toString() :"0", + style: TextStyle( + color: Color(0xFF000000), + fontSize: 15.sp, + fontWeight: MyFontWeight.medium, + ), + ), + ], + ), ), - Row( - children: [ - Text( - S.of(context).fensi, - style: TextStyle( - color: Color(0xFF000000), - fontSize: 14.sp, - fontWeight: MyFontWeight.regular, + GestureDetector( + onTap:(){ + Navigator.of(context).pushNamed( + '/router/mine_attainment_page', + arguments: {"userInfo":userInfo}, + ); + }, + child: + Row( + children: [ + Text( + "成就", + style: TextStyle( + color: Color(0xFF000000), + fontSize: 14.sp, + fontWeight: MyFontWeight.regular, + ), ), - ), - Text( - "(" + (infoNumber != null ?infoNumber.fans.toString() :"0") +")", - style: TextStyle( - color: Color(0xFF000000), - fontSize: 15.sp, - fontWeight: MyFontWeight.medium, + SizedBox(width: 5,), + Text( + "1", + style: TextStyle( + color: Color(0xFF000000), + fontSize: 15.sp, + fontWeight: MyFontWeight.medium, + ), ), - ), - ], + ], + ), ), ], ), diff --git a/lib/mine/mine_vip/binding_assistant_card.dart b/lib/mine/mine_vip/binding_assistant_card.dart new file mode 100644 index 00000000..0c9c8115 --- /dev/null +++ b/lib/mine/mine_vip/binding_assistant_card.dart @@ -0,0 +1,199 @@ +import 'package:dio/dio.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/retrofit/data/address.dart'; +import 'package:huixiang/retrofit/data/base_data.dart'; +import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:huixiang/utils/font_weight.dart'; +import 'package:huixiang/view_widget/my_appbar.dart'; +import 'package:shared_preferences/shared_preferences.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +class BindingAssistantCard extends StatefulWidget { + @override + State createState() { + return _BindingAssistantCard(); + } +} + +class _BindingAssistantCard extends State { + TextEditingController nameController = TextEditingController(); + TextEditingController mobileController = TextEditingController(); + TextEditingController addressController = TextEditingController(); + TextEditingController houseNumberController = TextEditingController(); + + ApiService apiService; + + @override + void initState() { + super.initState(); + + SharedPreferences.getInstance().then((value) => { + apiService = ApiService(Dio(), + context: context, token: value.getString('token')), + }); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: MyAppBar( + title: S.of(context).bangdingfuka, + titleColor: Colors.black, + leadingColor: Colors.black, + background: Colors.transparent, + ), + body: Stack( + children: [ + Expanded( + child: Column( + children: [ + Container( + margin: EdgeInsets.only(bottom: 26.h), + padding: EdgeInsets.only(top: 16.h, bottom: 16.h), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.only(left: 16, right: 16), + child: Text( + "进行副卡绑定", + style: TextStyle( + color: Colors.black, + fontWeight: MyFontWeight.medium, + fontSize: 21.sp, + ), + ), + ), + Padding( + padding: EdgeInsets.only( + left: 16, right: 16, top: 8, bottom: 32), + child: Text( + "主卡最多只能绑定5位副卡，只能解绑3次", + style: TextStyle( + color: Color(0xFFFF7A1A), + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + ), + ), + ), + editItem( + S.of(context).fukashoujihao, + "", + S.of(context).qingshurushoujihao, + mobileController, + false), + Container( + margin: + EdgeInsets.symmetric(horizontal: 16, vertical: 5), + width: double.infinity, + height: 1, + color: Color(0xFFF4F4F4), + ), + Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Expanded( + child: InkWell( + onTap: () {}, + child: editItem( + "验证码", + "", + S.of(context).qingshuruyanzhengma, + addressController, + false), + )), + Padding( + padding: EdgeInsets.only(right: 16, top: 10), + child: GestureDetector( + onTap: () {}, + child: Text( + "发送验证", + style: TextStyle( + fontSize: 14.sp, + fontWeight: FontWeight.bold, + color: Color(0xFF32A060), + ), + ), + )), + ], + ), + Container( + margin: + EdgeInsets.symmetric(horizontal: 16, vertical: 5), + width: double.infinity, + height: 1, + color: Color(0xFFF4F4F4), + ), + ], + ), + ), + ], + ), + ), + Align( + alignment: Alignment.bottomCenter, + child: InkWell( + onTap: () { + + }, + child: Container( + color: Color(0xFF32A060), + width: MediaQuery.of(context).size.width, + padding: EdgeInsets.all(16), + height: 54, + alignment: Alignment.center, + child: Text( + S.of(context).querenbangding, + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16.sp, + color: Colors.white, + ), + ), + ), + )), + ], + ), + ); + } + + Widget editItem(start, text, hide, controller, isClick) { + return Container( + margin: EdgeInsets.symmetric(horizontal: 16, vertical: 5), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Text( + start, + style: TextStyle( + fontSize: 16.sp, + fontWeight: FontWeight.bold, + color: Color(0xFF353535), + ), + ), + TextField( + controller: controller, + enabled: start != "地址", + keyboardType: + start == "电话" ? TextInputType.phone : TextInputType.text, + decoration: InputDecoration( + border: InputBorder.none, + hintText: hide, + hintStyle: TextStyle( + color: Color(0xFFA29E9E), + fontSize: 14.sp, + ), + contentPadding: EdgeInsets.all(0), + ), + ), + ], + ), + ); + } + +} diff --git a/lib/mine/mine_vip/legal_right_details.dart b/lib/mine/mine_vip/legal_right_details.dart new file mode 100644 index 00000000..b1e22e52 --- /dev/null +++ b/lib/mine/mine_vip/legal_right_details.dart @@ -0,0 +1,570 @@ +import 'package:dio/dio.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:flutter_swiper/flutter_swiper.dart'; +import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/retrofit/data/base_data.dart'; +import 'package:huixiang/retrofit/data/rank.dart'; +import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:huixiang/utils/flutter_utils.dart'; +import 'package:huixiang/utils/font_weight.dart'; +import 'package:huixiang/view_widget/border_text.dart'; +import 'package:huixiang/view_widget/mine_vip_view.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:huixiang/view_widget/my_appbar.dart'; +import 'package:huixiang/view_widget/round_button.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +class LegalRightDetails extends StatefulWidget { + @override + State createState() { + return _LegalRightDetails(); + } +} + +class _LegalRightDetails extends State { + ApiService apiService; + + final SwiperController controller = SwiperController(); + + @override + void initState() { + super.initState(); + + SharedPreferences.getInstance().then((value) { + apiService = + ApiService(Dio(), context: context, token: value.getString("token")); + }); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: Color(0xFF131416), + appBar: MyAppBar( + title: S.of(context).quanyixiangqing, + titleColor: Colors.white, + titleSize: 18.sp, + background: Colors.transparent, + leadingColor: Colors.white, + ), + body: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Column( + children: [ + Container( + height: 130, + margin: EdgeInsets.only(top: 24), + child: ListView.builder( + scrollDirection: Axis.horizontal, + physics: BouncingScrollPhysics(), + padding: EdgeInsets.symmetric(horizontal: 10), + itemCount: 15, + itemBuilder: (context, position) { + return GestureDetector( + onTap: () { + setState(() {}); + }, + child: legalRightItem(), + ); + }, + ), + ), + Container( + alignment: Alignment.center, + width: 33, + height: 16, + decoration: BoxDecoration( + border: Border( + bottom: BorderSide( + width: 0, + color: Color(0xFFFFF6E9), + ), + ), + ), + child: Image.asset( + "assets/image/jian_j.png", + width: 33, + height: 16, + color: Color(0xFFFFF6E9), + fit: BoxFit.fill, + ), + ), + Container( + padding: EdgeInsets.only(left: 16, right: 49), + decoration: BoxDecoration( + border: Border.all( + width: 0, + color: Color(0xFFFFF6E9), + ), + color: Color(0xFFFFF6E9), + borderRadius: new BorderRadius.only( + topLeft: Radius.circular(8.0), + topRight: Radius.circular(8.0), + ), + ), + child: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 20, + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Container( + width: 13.w, + height: 2.h, + color: Color(0xFF674119), + ), + SizedBox(height: 5.h), + Container( + width: 9.w, + height: 2.h, + color: Color(0xFF674119), + ), + SizedBox(height: 5.h), + Container( + width: 6.5.w, + height: 2.h, + color: Color(0xFF674119), + ), + ], + ), + SizedBox(width: 6.w), + Text( + "可绑定5位副卡", + style: TextStyle( + fontSize: 17.sp, + fontWeight: FontWeight.bold, + color: Color(0xFF674119), + ), + ), + SizedBox(width: 6.w), + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 13.w, + height: 2.h, + color: Color(0xFF674119), + ), + SizedBox(height: 5.h), + Container( + width: 9.w, + height: 2.h, + color: Color(0xFF674119), + ), + SizedBox(height: 5.h), + Container( + width: 6.5.w, + height: 2.h, + color: Color(0xFF674119), + ), + ], + ), + ], + ), + Text( + S.of(context).quanyijishao, + style: TextStyle( + fontWeight: MyFontWeight.semi_bold, + fontSize: 14.sp, + color: Color(0xFF674119), + ), + ), + SizedBox( + height: 8.h, + ), + Text( + "用户在成为金卡会员/共创会员之后，即可进行副卡绑定。点击添加新副卡，输入需要绑定用户的手机号，输入验证码，" + "验证通过后，即可绑定成功。点击头像右下方的解除，出现提示弹窗，点击确认即可解除绑定。", + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + height: 1.5, + color: Color(0xFF674119), + ), + ), + SizedBox( + height: 20, + ), + Text( + S.of(context).quanyishuoming, + style: TextStyle( + fontWeight: MyFontWeight.semi_bold, + fontSize: 14.sp, + color: Color(0xFF674119), + ), + ), + SizedBox( + height: 8, + ), + Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 6.w, + height: 6.h, + margin: EdgeInsets.fromLTRB(4.w, 7.h, 4.w, 7.h), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(3), + color: Color(0xFF79572D), + ), + ), + Text( + "副卡用户必须为平台注册用户", + style: TextStyle( + textBaseline: TextBaseline.alphabetic, + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF674119), + ), + ), + ], + ), + SizedBox( + height: 6, + ), + Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 6.w, + height: 6.h, + margin: EdgeInsets.fromLTRB(4.w, 7.h, 4.w, 7.h), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(3), + color: Color(0xFF79572D), + ), + ), + Text( + "每位主卡用户只可绑定5位副卡用户,同时，只能解绑3次", + style: TextStyle( + textBaseline: TextBaseline.alphabetic, + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF674119), + ), + ), + ], + ), + SizedBox( + height: 6, + ), + Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 6.w, + height: 6.h, + margin: EdgeInsets.fromLTRB(4.w, 7.h, 4.w, 7.h), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(3), + color: Color(0xFF79572D), + ), + ), + Text( + "副卡享受主卡的部分权益，主卡会员失效后，副卡也失效", + style: TextStyle( + textBaseline: TextBaseline.alphabetic, + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF674119), + ), + ), + ], + ), + SizedBox( + height: 6, + ), + Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 6.w, + height: 6.h, + margin: EdgeInsets.fromLTRB(4.w, 7.h, 4.w, 7.h), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(3), + color: Color(0xFF79572D), + ), + ), + Text( + "副卡成为金卡会员后，自动与主卡解绑", + style: TextStyle( + textBaseline: TextBaseline.alphabetic, + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF674119), + ), + ), + ], + ), + SizedBox( + height: 20, + ), + Text( + "${S.of(context).yibangfuka}(0/5)", + style: TextStyle( + fontWeight: MyFontWeight.semi_bold, + fontSize: 14.sp, + color: Color(0xFF674119), + ), + ), + SizedBox( + height: 8, + ), + assistant(), + ], + ), + ), + ) + ], + ), + ), + ); + } + + ///解除绑定弹窗 + unbindShowDeleteDialog() { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + content: Container( + width: MediaQuery.of(context).size.width - 84, + height: 146.h, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + "确认要跟当前用户解除绑定？", + style: TextStyle( + fontSize: 17.sp, + fontWeight: MyFontWeight.medium, + color: Color(0xFF353535), + ), + ), + SizedBox( + height: 6.h, + ), + Text( + "剩余解绑次数:3次", + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.medium, + color: Color(0xFFA29E9E), + ), + ), + SizedBox( + height: 16.h, + ), + Row( + children: [ + Expanded( + child: InkWell( + child: BorderText( + text: "取消", + textColor: Color(0xFF32A060), + fontSize: 16.sp, + fontWeight: FontWeight.bold, + borderColor: Color(0xFF32A060), + radius: 4, + padding: EdgeInsets.all(12), + borderWidth: 1, + ), + onTap: () { + Navigator.of(context).pop(); + }, + ), + flex: 1, + ), + SizedBox( + width: 16.w, + ), + Expanded( + child: InkWell( + child: RoundButton( + text: "确定", + textColor: Colors.white, + radius: 4, + padding: EdgeInsets.all(12), + backgroup: Color(0xFF32A060), + fontSize: 16.sp, + fontWeight: FontWeight.bold, + ), + onTap: () { + Navigator.of(context).pop(); + }, + ), + flex: 1, + ), + ], + ) + ], + ), + ), + ); + }, + ); + } + + ///权益列表 + Widget legalRightItem() { + return Container( + margin: EdgeInsets.only(left: 20), + alignment: Alignment.center, + child: Column( + children: [ + Opacity( + opacity: 1, + // MImage( + // "assets/image/badge_img.png", + // width: 80, + // height: 80, + // fit: BoxFit.cover, + // errorSrc: "assets/image/default_1.png", + // fadeSrc: "assets/image/default_1.png", + // ), + child: Image.asset( + "assets/image/vip_qy.png", + width: 50, + height: 50, + fit: BoxFit.cover, + ), + ), + SizedBox( + height: 8.h, + ), + Text( + "储值优惠", + maxLines: 2, + overflow: TextOverflow.ellipsis, + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.white, + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + ), + ), + ], + ), + ); + } + + ///副卡列表 + Widget assistant() { + return Column( + children: [ + GridView.builder( + itemCount: 4, + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + //一行的Widget数量 + crossAxisCount: 3, + //水平子Widget之间间距 + crossAxisSpacing: 12, + //垂直子Widget之间间距 + mainAxisSpacing: 5, + //子Widget宽高比例 + // childAspectRatio: AppUtils.textScale(context) > 1 + // ? (1 - ((AppUtils.textScale(context) - 1))) + // : 0.48, + ), + itemBuilder: (context, index) { + return GestureDetector( + onTap: () {}, + child: assistantItem(), + ); + }, + ), + ], + ); + } + + Widget assistantItem() { + return Container( + alignment: Alignment.center, + child: + Column( + children: [ + Stack( + alignment: Alignment.bottomRight, + children: [ + Image.asset( + "assets/image/icon_idea_ya.png", + width: 50, + height: 50, + fit: BoxFit.cover, + ), + GestureDetector( + onTap: () { + setState(() { + unbindShowDeleteDialog(); + }); + }, + child: Image.asset( + "assets/image/fuka_j.png", + width: 24, + height: 24, + fit: BoxFit.cover, + ), + ), + ], + ), + SizedBox( + height: 5.h, + ), + Text( + "123****6789", + style: TextStyle( + color: Color(0xFF79572D), + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + ), + ), + ], + ), + // GestureDetector( + // onTap: (){ + // Navigator.of(context).pushNamed('/router/binding_assistant_card'); + // }, + // child:Column( + // children: [ + // Image.asset( + // "assets/image/fuka_zj.png", + // width:50, + // height:50, + // fit: BoxFit.cover, + // ), + // Text( + // "添加新副卡", + // style: TextStyle( + // color: Color(0xFF79572D), + // fontWeight: MyFontWeight.regular, + // fontSize: 12.sp, + // ), + // ), + // ], + // ), + // ), + ); + } +} diff --git a/lib/mine/mine_vip/mine_attainment_page.dart b/lib/mine/mine_vip/mine_attainment_page.dart new file mode 100644 index 00000000..1408a861 --- /dev/null +++ b/lib/mine/mine_vip/mine_attainment_page.dart @@ -0,0 +1,438 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/retrofit/data/user_info.dart'; +import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:huixiang/utils/flutter_utils.dart'; +import 'package:huixiang/utils/font_weight.dart'; +import 'package:huixiang/view_widget/border_text.dart'; +import 'package:huixiang/view_widget/custom_image.dart'; +import 'package:huixiang/view_widget/my_appbar.dart'; +import 'package:huixiang/view_widget/round_button.dart'; +import 'package:pull_to_refresh/pull_to_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +class MineAttainmentPage extends StatefulWidget { + final Map arguments; + + MineAttainmentPage({this.arguments}); + + @override + State createState() { + return _MineAttainmentPage(); + } +} + +class _MineAttainmentPage extends State { + ApiService apiService; + final RefreshController _refreshController = RefreshController(); + UserInfo userInfo; + var checkIndex = 1; + + @override + void dispose() { + super.dispose(); + if (_refreshController != null) _refreshController.dispose(); + } + + @override + void initState() { + super.initState(); + userInfo = widget.arguments["userInfo"]; + } + + @override + Widget build(BuildContext context) { + return Container(decoration: BoxDecoration( + image: DecorationImage( + fit: BoxFit.fill, + image: AssetImage("assets/image/attainment_bj.png"), + ), + ),child:Scaffold( + backgroundColor: Colors.transparent, + appBar: MyAppBar( + title: "我的成就", + titleColor: Colors.black, + titleSize: 18.sp, + background: Colors.transparent, + leadingColor: Colors.black, + ), + body: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Column( + children: [ + SizedBox(height: 24), + MImage( + userInfo?.headimg ?? "", + isCircle: true, + width: 58, + height: 58, + fit: BoxFit.cover, + errorSrc: "assets/image/default_user.png", + fadeSrc: "assets/image/default_user.png", + ), + SizedBox(height: 8), + Text( + userInfo?.nickname ?? S.of(context).denglu, + style: TextStyle( + fontSize: 16.sp, + fontWeight: FontWeight.bold, + color: Color(0xFF353535), + ), + ), + SizedBox(height: 28), + Container( + margin: EdgeInsets.only(left: 16, right: 16, top: 26, bottom: 8), + padding: EdgeInsets.all(20), + decoration: BoxDecoration( + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(12), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ) + ], + borderRadius: BorderRadius.all(Radius.circular(8)), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Text( + "成就徽章", + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 14.sp, + color: Color(0xFF353535)), + ), + SizedBox(width: 4), + Text( + "(", + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 14, + color: Color(0xFF353535)), + ), + Text( + "0", + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 14, + color: Color(0xFF32A060)), + ), + Text( + "/8)", + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 14, + color: Color(0xFF353535)), + ), + ], + ), + SizedBox(height: 12), + attainmentBadge(), + ], + ), + ), + ], + ), + )), + ); + } + + ///成就徽章列表 + Widget attainmentBadge() { + return GridView.builder( + itemCount: 8, + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + //一行的Widget数量 + crossAxisCount: 3, + //水平子Widget之间间距 + crossAxisSpacing: 13, + //垂直子Widget之间间距 + mainAxisSpacing: 12, + //子Widget宽高比例 + childAspectRatio: AppUtils.textScale(context) > 1 + ? (1 - ((AppUtils.textScale(context) - 1))) + : 0.85, + ), + itemBuilder: (context, index) { + return GestureDetector( + onTap: () { + showDeleteDialog(); + }, + child: badgeItem(), + ); + }, + ); + } + + Widget badgeItem() { + return Container( + alignment: Alignment.center, + child: Column( + children: [ + // MImage( + // "assets/image/badge_img.png", + // width: 80, + // height: 80, + // fit: BoxFit.cover, + // errorSrc: "assets/image/default_1.png", + // fadeSrc: "assets/image/default_1.png", + // ), + Image.asset( + "assets/image/badge_img.png", + width: 80, + height: 80, + fit: BoxFit.cover, + ), + SizedBox( + height: 4.h, + ), + Text( + "签到", + overflow: TextOverflow.ellipsis, + style: TextStyle( + color: Color(0xFF181818), + fontWeight: MyFontWeight.medium, + fontSize: 12.sp, + ), + ), + ], + ), + ); + } + + ///徽章成就弹窗 + showDeleteDialog() { + showDialog( + context: context, + builder: (context) { + return StatefulBuilder(builder: (context, state) { + return AlertDialog( + content: Container( + width: MediaQuery.of(context).size.width - 84, + height: 385.h, + child: Column( + // mainAxisAlignment: MainAxisAlignment.spaceAround, + // crossAxisAlignment: CrossAxisAlignment.start, + children: [ + GestureDetector( + onTap: () { + Navigator.of(context).pop(); + }, + child: Row( + children: [ + Spacer(), + Image.asset( + "assets/image/icon_order_cancel.png", + width: 24, + height: 24, + ), + ], + ), + ), + Image.asset( + "assets/image/badge_img.png", + width: 150, + height: 150, + fit: BoxFit.cover, + ), + Text( + "消费白银徽章", + style: TextStyle( + fontSize: 16.sp, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xFF181818), + ), + ), + SizedBox( + height: 6.h, + ), + Text( + "再消费268.4元即可升级", + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFFA3A3A3), + ), + ), + SizedBox( + height: 4.h, + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + "奖励:", + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + color: Color(0xFF515151)), + ), + SizedBox(width: 8), + Image.asset( + "assets/image/icon_gold_coin.png", + width: 14, + height: 14, + fit: BoxFit.cover, + ), + SizedBox(width: 4), + Text( + "+ 10", + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + color: Color(0xFF515151)), + ), + ], + ), + SizedBox(height: 5), + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + GestureDetector( + onTap: () { + state(() { + checkIndex = 1; + }); + }, + child: Column( + children: [ + Image.asset( + "assets/image/qt_badge.png", + width: checkIndex != 1 ? 30 : 55, + height: checkIndex != 1 ? 30 : 55, + fit: BoxFit.cover, + ), + SizedBox(height: 10), + Text( + "青铜", + style: TextStyle( + fontSize: 10.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFFA3A3A3), + ), + ), + ], + ), + ), + Container( + width: 35.w, + height: 2.h, + decoration: new BoxDecoration( + color: Color(0xFFE1F2F7), + ), + ), + GestureDetector( + onTap: () { + state(() { + checkIndex = 2; + }); + }, + child: Column( + children: [ + Image.asset( + "assets/image/by_badge.png", + width: checkIndex != 2 ? 35 : 65, + height: checkIndex != 2 ? 35 : 65, + fit: BoxFit.cover, + ), + SizedBox(height: 10), + Text( + "白银", + style: TextStyle( + fontSize: 10.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFFA3A3A3), + ), + ), + ], + ), + ), + Container( + width: 35.w, + height: 2.h, + decoration: new BoxDecoration( + color: Color(0xFFE1F2F7), + ), + ), + GestureDetector( + onTap: () { + state(() { + checkIndex = 3; + }); + }, + child: Column( + children: [ + Image.asset( + "assets/image/hj_badge.png", + width: checkIndex != 3 ? 35 : 65, + height: checkIndex != 3 ? 35 : 65, + fit: BoxFit.cover, + ), + SizedBox(height: 10), + Text( + "黄金", + style: TextStyle( + fontSize: 10.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFFA3A3A3), + ), + ), + ], + ), + ), + Container( + width: 35.w, + height: 2.h, + decoration: new BoxDecoration( + color: Color(0xFFE1F2F7), + ), + ), + GestureDetector( + onTap: () { + state(() { + checkIndex = 4; + }); + }, + child: Column( + children: [ + Image.asset( + "assets/image/qt_badge.png", + width: checkIndex != 4 ? 35 : 65, + height: checkIndex != 4 ? 35 : 65, + fit: BoxFit.cover, + ), + SizedBox(height: 10), + Text( + "铂金", + style: TextStyle( + fontSize: 10.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFFA3A3A3), + ), + ), + ], + ), + ), + ], + ), + ], + ), + ), + ); + }); + }, + ); + } +} diff --git a/lib/mine/mine_vip/mine_vip_core.dart b/lib/mine/mine_vip/mine_vip_core.dart new file mode 100644 index 00000000..744cca61 --- /dev/null +++ b/lib/mine/mine_vip/mine_vip_core.dart @@ -0,0 +1,558 @@ +import 'package:dio/dio.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:flutter_swiper/flutter_swiper.dart'; +import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/retrofit/data/base_data.dart'; +import 'package:huixiang/retrofit/data/rank.dart'; +import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:huixiang/utils/flutter_utils.dart'; +import 'package:huixiang/utils/font_weight.dart'; +import 'package:huixiang/view_widget/mine_vip_view.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:huixiang/view_widget/my_appbar.dart'; +import 'package:huixiang/view_widget/vip_dialog.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +class MineVipCore extends StatefulWidget { + final Map arguments; + + MineVipCore({this.arguments}); + + @override + State createState() { + return _MineVipCore(); + } +} + +class _MineVipCore extends State { + ApiService apiService; + List ranks = []; + + final SwiperController controller = SwiperController(); + + @override + void initState() { + super.initState(); + + SharedPreferences.getInstance().then((value) { + apiService = + ApiService(Dio(), context: context, token: value.getString("token")); + queryVipLevel(); + }); + } + + queryVipLevel() async { + BaseData> rankData = await apiService.rankList(); + if (rankData != null && rankData.isSuccess) { + ranks.clear(); + ranks.addAll(rankData.data); + setState(() { + controller.move((widget.arguments["rankLevel"] - 1), animation: false); + }); + } else { + SmartDialog.showToast(rankData.msg, alignment: Alignment.center); + } + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: MyAppBar( + title: S.of(context).huiyuanzhongxin, + titleColor: Colors.black, + titleSize: 18.sp, + background: Colors.transparent, + leadingColor: Colors.black, + ), + body: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Column( + children: [ + ///会员卡 + Container( + height: (MediaQuery.of(context).size.width) / + 1.78 * + AppUtils.textScale(context), + child: Swiper( + viewportFraction: 0.95, + loop: false, + physics: BouncingScrollPhysics(), + controller: controller, + itemBuilder: (context, position) { + return MineVipView( + vipLevel: !(ranks != null && ranks.isNotEmpty) + ? widget.arguments["rankLevel"] + : position + 1, + curLevel: widget.arguments["rankLevel"], + tag: (widget.arguments["rankLevel"] == (position + 1) || + !(ranks != null && ranks.isNotEmpty)) + ? "vip" + : "", + padding: 6.w, + rank: !(ranks != null && ranks.isNotEmpty) + ? 0 + : widget.arguments["points"], + rankMax: !(ranks != null && ranks.isNotEmpty) + ? 0 + : (position < (ranks.length - 1)) + ? ranks[position + 1].rankOrigin + : ranks[position].rankOrigin, + createTime: widget.arguments["createTime"], + ); + }, + itemCount: + (ranks != null && ranks.isNotEmpty) ? ranks.length : 1, + ), + ), + + ///会员权益 + Container( + margin: EdgeInsets.fromLTRB(0, 16.h, 0, 0), + padding: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 16.h), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(8), + topRight: Radius.circular(8), + ), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Container( + width: 4, + height: 18, + decoration: BoxDecoration( + gradient: new LinearGradient( + begin: Alignment.bottomCenter, + end: Alignment.topCenter, + colors: [ + Color(0xFF000000), + Color(0xFF585858), + ]), + ), + ), + SizedBox( + width: 4.w, + ), + Text( + S.of(context).huiyuanquanyi, + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 16.sp, + color: Colors.black, + ), + ), + ], + ), + SizedBox( + height: 12.h, + ), + vipLegalRight(), + ], + ), + ), + + ///会员规则说明 + Container( + margin: EdgeInsets.fromLTRB(0, 16.h, 0, 0), + padding: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 16.h), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(8), + topRight: Radius.circular(8), + ), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Container( + width: 4, + height: 18, + decoration: BoxDecoration( + gradient: new LinearGradient( + begin: Alignment.bottomCenter, + end: Alignment.topCenter, + colors: [ + Color(0xFF000000), + Color(0xFF585858), + ]), + ), + ), + SizedBox( + width: 4.w, + ), + Text( + S.of(context).huiyuanguize, + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 16.sp, + color: Colors.black, + ), + ), + ], + ), + SizedBox( + height: 12.h, + ), + Padding( + padding: EdgeInsets.only(left: 8), + child: Text( + "会员共分为3个等级，分别是银卡会员、金卡会员、共创会员。其中，银卡会员和金卡会员由用户的消费金额决定，" + "消费金额越高，会员等级越高，享受到的会员权益也越多。而共创会员需要直接购买，但是它的权益包含银卡和金卡的，属于最高等级会员。", + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + height: 1.5, + color: Color(0xFF4C4C4C), + ), + ), + ), + ], + ), + ), + + ///会员级别对照表 + Container( + margin: EdgeInsets.fromLTRB(0, 16.h, 0, 0), + padding: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 16.h), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(8), + topRight: Radius.circular(8), + ), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Container( + width: 4, + height: 18, + decoration: BoxDecoration( + gradient: new LinearGradient( + begin: Alignment.bottomCenter, + end: Alignment.topCenter, + colors: [ + Color(0xFF000000), + Color(0xFF585858), + ]), + ), + ), + SizedBox( + width: 4.w, + ), + Text( + S.of(context).huiyuanjibieduizhao, + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 16.sp, + color: Colors.black, + ), + ), + ], + ), + SizedBox( + height: 12.h, + ), + Image.asset( + "assets/image/vip_contrastive_table.png", + width: double.infinity, + height: 281, + ), + SizedBox( + height: 16.h, + ), + ], + ), + ), + + ///会员如何获得积分 + Container( + margin: EdgeInsets.fromLTRB(0, 16.h, 0, 0), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(8), + topRight: Radius.circular(8), + ), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + padding: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 16.h), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Container( + width: 4, + height: 18, + decoration: BoxDecoration( + gradient: new LinearGradient( + begin: Alignment.bottomCenter, + end: Alignment.topCenter, + colors: [ + Color(0xFF000000), + Color(0xFF585858), + ]), + ), + ), + SizedBox( + width: 4.w, + ), + Text( + S.of(context).huiyuanhuodejifen, + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 16.sp, + color: Colors.black, + ), + ), + ], + ), + SizedBox( + height: 12.h, + ), + Text( + "1.用户每消费1元可获得1个积分。", + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + color: Color(0xFF4C4C4C), + ), + ), + SizedBox( + height: 8.h, + ), + Text( + "2.通过完成积分详情-做任务得积分来获得积分。", + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + color: Color(0xFF4C4C4C), + ), + ), + SizedBox( + height: 8.h, + ), + Text( + "3.优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。", + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + height: 1.5, + color: Color(0xFF4C4C4C), + ), + ), + SizedBox( + height: 8.h, + ), + ], + ), + ), + InkWell( + onTap: () { + setState(() { + showAlertDialog(); + }); + }, + child: Container( + decoration: BoxDecoration( + gradient: new LinearGradient( + begin: Alignment.centerLeft, + end: Alignment.centerRight, + colors: [ + Color(0xFFFFDCA1), + Color(0xFFFAE4C0), + ]), + ), + width: MediaQuery.of(context).size.width, + padding: EdgeInsets.all(16), + height: 54, + alignment: Alignment.center, + child: Text( + "${S.of(context).lijikaitong}￥20000/永久", + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16.sp, + color: Color(0xFF4A4748), + ), + ), + ), + ) + ], + ), + ), + ], + ), + ), + ); + } + + Widget levelItem(Rank rank, rankOrigin, rankOriginMax) { + return Container( + margin: EdgeInsets.symmetric(vertical: 8.h), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Expanded( + child: Text( + rank?.rankName ?? "", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 14.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF353535), + ), + ), + flex: 1, + ), + Expanded( + child: Text( + "$rankOrigin - ${rankOriginMax == 0 ? "无限" : rankOriginMax}", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 14.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF353535), + ), + ), + flex: 1, + ), + ], + ), + ); + } + + ///会员权益列表 + Widget vipLegalRight() { + return GridView.builder( + itemCount: 13, + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + //一行的Widget数量 + crossAxisCount: 4, + //水平子Widget之间间距 + crossAxisSpacing: 35, + //垂直子Widget之间间距 + mainAxisSpacing: 10, + //子Widget宽高比例 + childAspectRatio: AppUtils.textScale(context) > 1 + ? (1 - ((AppUtils.textScale(context) - 1))) + : 0.85, + ), + itemBuilder: (context, index) { + return GestureDetector( + onTap: () { + Navigator.of(context) + .pushNamed('/router/legal_right_details', arguments: {}); + }, + child: vipLegalRightItem(), + ); + }, + ); + } + + Widget vipLegalRightItem() { + return Container( + alignment: Alignment.center, + child: Column( + children: [ + Stack( + alignment: Alignment.bottomCenter, + children: [ + Opacity( + opacity: 0.3, + // MImage( + // "assets/image/badge_img.png", + // width: 80, + // height: 80, + // fit: BoxFit.cover, + // errorSrc: "assets/image/default_1.png", + // fadeSrc: "assets/image/default_1.png", + // ), + child: Image.asset( + "assets/image/vip_qy.png", + width: 36, + height: 36, + fit: BoxFit.cover, + ), + ), + Container( + decoration: new BoxDecoration( + color: Color(0xFFA29E9E), + borderRadius: BorderRadius.circular(7.0), + ), + width: 52.w, + height: 15.h, + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.lock, + color: Color(0xFFFFDCA1), + size: 10, + ), + Text( + "暂未开放", + style: TextStyle( + color: Color(0xFF181818), + fontWeight: MyFontWeight.regular, + fontSize: 9.sp, + ), + ), + ], + ), + ) + ], + ), + SizedBox( + height: 5.h, + ), + Text( + "储值优惠", + maxLines: 2, + overflow: TextOverflow.ellipsis, + textAlign: TextAlign.center, + style: TextStyle( + color: Color(0xFF181818), + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + ), + ), + ], + ), + ); + } + + ///会员升级弹窗 + showAlertDialog() { + //显示对话框 + showDialog( + context: context, + builder: (BuildContext context) { + return VipDialog(); + }, + ); + } +} diff --git a/lib/mine/mine_vip_level_page.dart b/lib/mine/mine_vip_level_page.dart index 1822f2b4..817c160c 100644 --- a/lib/mine/mine_vip_level_page.dart +++ b/lib/mine/mine_vip_level_page.dart @@ -279,7 +279,7 @@ class _MineVipLevelPage extends State { children: [ Expanded( child: Text( - rank.rankName, + rank?.rankName ?? "", textAlign: TextAlign.center, style: TextStyle( fontSize: 14.sp, diff --git a/lib/order/exchange_history_page.dart b/lib/order/exchange_history_page.dart index ac57e16c..1b77eaf3 100644 --- a/lib/order/exchange_history_page.dart +++ b/lib/order/exchange_history_page.dart @@ -375,7 +375,7 @@ class _ExchangeHistoryList extends State { flex: 1, ), Text( - "x1", + "x${(exchangeOrder.creditOrderDetailList[0].goodsNumber).toString()}", style: TextStyle( fontSize: 12.sp, fontWeight: MyFontWeight.regular, @@ -399,7 +399,14 @@ class _ExchangeHistoryList extends State { // width: 4, // ), Text( - S.of(context).shifujifen(exchangeOrder.amount), + exchangeOrder?.amount == null || exchangeOrder.amount == "0" + ? "" + : S.of(context).shifujifen((exchangeOrder.amount)) + + ( exchangeOrder?.creditOrderDetailList[0]?.money == null || + exchangeOrder?.creditOrderDetailList[0]?.money == + "0.00" + ? "" + : " + ${double.parse(exchangeOrder?.creditOrderDetailList[0]?.money.toString()) * exchangeOrder?.creditOrderDetailList[0].goodsNumber}元"), style: TextStyle( fontSize: 12.sp, fontWeight: MyFontWeight.semi_bold, @@ -446,7 +453,7 @@ class _ExchangeHistoryList extends State { receive2Card(id) async { BaseData baseData = await apiService.creditOrderReceive(id); if (baseData != null && baseData.isSuccess) { - queryHistory(); + _refresh(); } } diff --git a/lib/order/exchange_order_page.dart b/lib/order/exchange_order_page.dart index dd59f5b5..8d476471 100644 --- a/lib/order/exchange_order_page.dart +++ b/lib/order/exchange_order_page.dart @@ -11,7 +11,6 @@ import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/retrofit/data/wx_pay.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/font_weight.dart'; -import 'package:huixiang/utils/min.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/round_button.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -33,6 +32,7 @@ class _ExchangeOrderPage extends State { ApiService apiService; String money = "0"; String balance = "0"; + int buyNum = 1; var checkIndex = 1; @override @@ -59,86 +59,54 @@ class _ExchangeOrderPage extends State { background: Color(0xFFFAFAFA), leadingColor: Colors.black, ), - body: SingleChildScrollView( - physics: BouncingScrollPhysics(), - child: Column( - children: [ - Column( - children: [ - Container( - margin: - EdgeInsets.only(left: 16, right: 16, top: 26, bottom: 8), - padding: EdgeInsets.all(20), - decoration: BoxDecoration( - color: Colors.white, - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(12), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0, - ) - ], - borderRadius: BorderRadius.all(Radius.circular(8)), - ), - child: Column( - children: [ - Row( - children: [ - Image.asset( - "assets/image/icon_order_exchange_info.png", - width: 24, - height: 24, - ), - SizedBox(width: 4), - Text( - S.of(context).duihuanxinxi, - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 16, - color: Color(0xFF353535)), - ), - ], - ), - SizedBox( - height: 18.h, - ), - Row( - children: [ - Text( - S.of(context).lingqufangshi, - style: TextStyle( - fontSize: 14.sp, - color: Color(0xFF353535), + body: Stack(children: [ + SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Column( + children: [ + widget.arguments["useTyped"] == 1? + Container( + margin: + EdgeInsets.only(left: 16, right: 16, top: 26, bottom: 8), + padding: EdgeInsets.all(20), + decoration: BoxDecoration( + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(12), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ) + ], + borderRadius: BorderRadius.all(Radius.circular(8)), + ), + child: Column( + children: [ + Row( + children: [ + Image.asset( + "assets/image/icon_order_exchange_info.png", + width: 24, + height: 24, ), - ), - SizedBox( - width: 12.w, - ), - Text( - widget.arguments["useTyped"] == 1 - ? S.of(context).ziti - : widget.arguments["useTyped"] == 2 - ? S.of(context).peisong - : S.of(context).xianshangfafang, - style: TextStyle( - fontSize: 14.sp, - color: Color(0xFF353535), + SizedBox(width: 4), + Text( + S.of(context).duihuanxinxi, + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16, + color: Color(0xFF353535)), ), - ), - ], - ), - Visibility( - child: SizedBox( - height: 13.h, + ], ), - visible: widget.arguments["useTyped"] != 3, - ), - Visibility( - child: Row( + SizedBox( + height: 18.h, + ), + Row( children: [ Text( - S.of(context).zitidizhi, + S.of(context).lingqufangshi, style: TextStyle( fontSize: 14.sp, color: Color(0xFF353535), @@ -147,671 +115,666 @@ class _ExchangeOrderPage extends State { SizedBox( width: 12.w, ), - Expanded( - child: GestureDetector( - onTap: () { - toAddressPicker(); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - crossAxisAlignment: CrossAxisAlignment.end, - mainAxisSize: MainAxisSize.min, - children: [ - Expanded( - child: Text( - (address != null && address != "") - ? address - : widget.arguments["useTyped"] == 1 - ? S.of(context).qingxuanzhemendian - : widget.arguments["useTyped"] == - 2 - ? S - .of(context) - .qingxuanzeshouhuodizhi - : S.of(context).xuni, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 14.sp, - color: Color(0xFF32A060), + Text( + widget.arguments["useTyped"] == 1 + ? S.of(context).ziti + : widget.arguments["useTyped"] == 2 + ? S.of(context).peisong + : S.of(context).xianshangfafang, + style: TextStyle( + fontSize: 14.sp, + color: Color(0xFF353535), + ), + ), + ], + ), + Visibility( + child: SizedBox( + height: 13.h, + ), + visible: widget.arguments["useTyped"] != 3, + ), + Visibility( + child: Row( + children: [ + Text( + S.of(context).zitidizhi, + style: TextStyle( + fontSize: 14.sp, + color: Color(0xFF353535), + ), + ), + SizedBox( + width: 12.w, + ), + Expanded( + child: GestureDetector( + onTap: () { + toAddressPicker(); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.end, + mainAxisSize: MainAxisSize.min, + children: [ + Expanded( + child: Text( + (address != null && address != "") + ? address + : widget.arguments["useTyped"] == 1 + ? S.of(context).qingxuanzhemendian + : widget.arguments["useTyped"] == + 2 + ? S + .of(context) + .qingxuanzeshouhuodizhi + : S.of(context).xuni, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 14.sp, + color: Color(0xFF32A060), + ), ), + flex: 1, ), - flex: 1, - ), - Icon( - Icons.keyboard_arrow_right, - size: 16, - color: Color(0xFF32A060), - ), - ], + Icon( + Icons.keyboard_arrow_right, + size: 16, + color: Color(0xFF32A060), + ), + ], + ), ), + flex: 1, + ), + ], + ), + visible: widget.arguments["useTyped"] != 3, + ), + SizedBox( + height: 12.h, + ), + Row( + children: [ + Visibility( + visible: widget.arguments["useTyped"] != 3, + child: Text( + S.of(context).zitishijian, + style: TextStyle( + fontSize: 14.sp, color: Color(0xFF353535)), + ), + ), + Visibility( + visible: widget.arguments["useTyped"] != 3, + child: SizedBox( + width: 12.w, ), - flex: 1, + ), + Text( + widget.arguments["useTyped"] == 1 + ? S.of(context).duihuanhouwugegongzuori + : widget.arguments["useTyped"] == 2 + ? S.of(context).duihuanhoufahuo + : S.of(context).feishiwushangpin, + style: TextStyle( + fontSize: 14.sp, + color: widget.arguments["useTyped"] == 3 + ? Color(0xFF32A060) + : Color(0xFF353535)), ), ], ), - visible: widget.arguments["useTyped"] != 3, - ), - SizedBox( - height: 12.h, - ), - Row( - children: [ - Visibility( - visible: widget.arguments["useTyped"] != 3, - child: Text( - S.of(context).zitishijian, + ], + ), + ): + Container( + margin: + EdgeInsets.only(left: 16, right: 16, top: 26, bottom: 8), + padding: EdgeInsets.all(20), + decoration: BoxDecoration( + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(12), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ) + ], + borderRadius: BorderRadius.all(Radius.circular(8)), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Image.asset( + "assets/image/icon_order_exchange_info.png", + width: 24, + height: 24, + ), + SizedBox(width: 4), + Text( + S.of(context).duihuanxinxi, style: TextStyle( - fontSize: 14.sp, color: Color(0xFF353535)), + fontWeight: FontWeight.bold, + fontSize: 16, + color: Color(0xFF353535)), ), - ), - Visibility( - visible: widget.arguments["useTyped"] != 3, - child: SizedBox( + ], + ), + SizedBox( + height: 18.h, + ), + Row( + children: [ + Text( + S.of(context).lingqufangshi, + style: TextStyle( + fontSize: 14.sp, + color: Color(0xFF353535), + ), + ), + SizedBox( width: 12.w, ), - ), - Text( - widget.arguments["useTyped"] == 1 - ? S.of(context).duihuanhouwugegongzuori - : widget.arguments["useTyped"] == 2 - ? S.of(context).duihuanhoufahuo - : S.of(context).feishiwushangpin, - style: TextStyle( + Text( + widget.arguments["useTyped"] == 1 + ? S.of(context).ziti + : widget.arguments["useTyped"] == 2 + ? S.of(context).peisong + : S.of(context).xianshangfafang, + style: TextStyle( fontSize: 14.sp, - color: widget.arguments["useTyped"] == 3 - ? Color(0xFF32A060) - : Color(0xFF353535)), - ), - ], - ), - ], - ), - ), - Container( - margin: - EdgeInsets.only(left: 16, right: 16, top: 26, bottom: 8), - padding: EdgeInsets.all(20), - decoration: BoxDecoration( - color: Colors.white, - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(12), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0, - ) - ], - borderRadius: BorderRadius.all(Radius.circular(8)), - ), - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Image.asset( - "assets/image/icon_order_exchange_info.png", - width: 24, - height: 24, - ), - SizedBox(width: 4), - Text( - S.of(context).duihuanxinxi, - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 16, - color: Color(0xFF353535)), - ), - ], - ), - SizedBox( - height: 18.h, - ), - Row( - children: [ - Text( - S.of(context).lingqufangshi, - style: TextStyle( - fontSize: 14.sp, - color: Color(0xFF353535), + color: Color(0xFF353535), + ), ), - ), - SizedBox( - width: 12.w, - ), - Text( - widget.arguments["useTyped"] == 1 - ? S.of(context).ziti - : widget.arguments["useTyped"] == 2 - ? S.of(context).peisong - : S.of(context).xianshangfafang, - style: TextStyle( + ], + ), + SizedBox( + height: 12.h, + ), + Text( + "非实物商品兑换后领取到卡包即可使用！", + style: TextStyle( fontSize: 14.sp, - color: Color(0xFF353535), - ), + color: Color(0xFF32A060), + fontWeight: MyFontWeight.medium ), - ], - ), - SizedBox( - height: 12.h, - ), - Text( - "非实物商品兑换后领取到卡包即可使用！", - style: TextStyle( - fontSize: 14.sp, - color: Color(0xFF32A060), - fontWeight: MyFontWeight.medium ), - ), - ], + ], + ), ), - ), - Container( - margin: - EdgeInsets.only(left: 16, right: 16, top: 8, bottom: 16), - padding: EdgeInsets.all(20), - decoration: BoxDecoration( - color: Colors.white, - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(12), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0, - ) - ], - borderRadius: BorderRadius.all(Radius.circular(8)), - ), - child: Column( - children: [ - Row( - children: [ - Image.asset( - "assets/image/icon_order_commodity_info.png", - width: 24, - height: 24, - ), - SizedBox(width: 4), - Text( - S.of(context).duihuanshangpinxiangqing, - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 16, - color: Color(0xFF353535), - ), - ), - ], - ), - SizedBox( - height: 18, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisSize: MainAxisSize.max, - children: [ - if (widget.arguments["image"] != null) - Image.network( - widget.arguments["image"], - fit: BoxFit.cover, - width: 80, - height: 80, - ) - else + Container( + margin: + EdgeInsets.only(left: 16, right: 16, top: 8, bottom: 16), + padding: EdgeInsets.all(20), + decoration: BoxDecoration( + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(12), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ) + ], + borderRadius: BorderRadius.all(Radius.circular(8)), + ), + child: Column( + children: [ + Row( + children: [ Image.asset( - "assets/image/default_1.png", - fit: BoxFit.cover, - width: 80, - height: 80, - ), - Expanded( - child: Container( - height: 80.h, - margin: EdgeInsets.only(left: 16.w), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Text( - widget.arguments["name"], - style: TextStyle( - fontSize: 14.sp, - fontWeight: FontWeight.bold, - color: Color(0xFF353535)), - ), - SizedBox( - height: 4.h, - ), - Text( - "x1", - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFF727272)), - ), - ], - ), - ), - flex: 1, - ) - ], - ), - SizedBox( - height: 12.h, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - "应付数额", - style: - TextStyle(fontSize: 14, color: Color(0xFF353535),fontWeight: MyFontWeight.regular), - ), - SizedBox( - width: 12, - ), - Text( - S.of(context).jifen_(widget.arguments["price"]), - style: TextStyle( - fontSize: 12, - color: Colors.black, - ), - ), - ], - ), - SizedBox( - height: 12, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - "现金抵扣积分", - style: - TextStyle(fontSize: 14, color: Color(0xFF353535),fontWeight: MyFontWeight.regular), - ), - SizedBox( - width: 12, - ), - Text( - S.of(context).jifen_(widget.arguments["price"]), - style: TextStyle( - fontSize: 12, - color: Colors.black, - ), - ), - ], - ), - SizedBox( - height: 12, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - "合计", - style: TextStyle( - fontSize: 14.sp, color: Color(0xFF353535),fontWeight: MyFontWeight.regular), - ), - SizedBox( - width: 12.w, - ), - Text( - S.of(context).jifen_(widget.arguments["price"]), - style: TextStyle( - fontSize: 12.sp, color: Color(0xFF32A060)), - ), - ], - ), - ], - ), - ), - Container( - margin: - EdgeInsets.only(left: 16, right: 16, bottom: 8), - padding: EdgeInsets.all(20), - decoration: BoxDecoration( - color: Colors.white, - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(12), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0, - ) - ], - borderRadius: BorderRadius.all(Radius.circular(8)), - ), - child: Column( - children: [ - Row( - children: [ - Expanded(child: Text( - "兑换数量", - style: TextStyle( - fontWeight: MyFontWeight.regular, - fontSize: 14.sp, - color: Color(0xFF353535)), - )), - InkWell( - onTap: () { - }, - child: Image.asset( - "assets/image/reduce.png", - width: 22, - height: 22, + "assets/image/icon_order_commodity_info.png", + width: 24, + height: 24, ), - ), - Container( - width: 30, - alignment: Alignment.center, - child: Text( - "1", + SizedBox(width: 4), + Text( + S.of(context).duihuanshangpinxiangqing, style: TextStyle( - color: Colors.black, - fontSize: 14.sp, - fontWeight: MyFontWeight.medium, + fontWeight: FontWeight.bold, + fontSize: 16, + color: Color(0xFF353535), ), ), - ), - InkWell( - onTap: () { - }, - child: Image.asset( - "assets/image/add.png", - width: 22, - height: 22, - ), - ), - ], - ), - ], - ), - ), - Container( - width: double.infinity, - margin: EdgeInsets.only( - left: 16.w, - right: 16.w, - top: 12.h, - bottom:20.h, - ), - padding: EdgeInsets.only( - left: 16.w, - right: 16.w, - top: 20.h, - bottom: 20.h, - ), - decoration: BoxDecoration( - boxShadow: [ - BoxShadow( - color: Color(0x000000).withAlpha(25), - offset: Offset(0, 1), - blurRadius: 12.0, - ), - ], - color: Colors.white, - borderRadius: BorderRadius.circular(8), - ), - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.only(bottom: 16.h), - child: Text( - S.of(context).zhifufangshi, - style: TextStyle( - fontSize: 16.sp, - color: Colors.black, - fontWeight: MyFontWeight.regular, - ), + ], ), - ), - GestureDetector( - onTap: () { - setState(() { - checkIndex = 1; - }); - // widget.payChannelCheck(4); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, + SizedBox( + height: 18, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.max, children: [ - checkPayView(1), + if (widget.arguments["image"] != null) + Image.network( + widget.arguments["image"], + fit: BoxFit.cover, + width: 80, + height: 80, + ) + else + Image.asset( + "assets/image/default_1.png", + fit: BoxFit.cover, + width: 80, + height: 80, + ), Expanded( - child: Container(), + child: Container( + height: 80.h, + margin: EdgeInsets.only(left: 16.w), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text( + widget.arguments["name"], + style: TextStyle( + fontSize: 14.sp, + fontWeight: FontWeight.bold, + color: Color(0xFF353535)), + ), + // SizedBox( + // height: 4.h, + // ), + // Text( + // "x1", + // style: TextStyle( + // fontSize: 12.sp, + // color: Color(0xFF727272)), + // ), + ], + ), + ), flex: 1, - ), + ) + ], + ), + SizedBox( + height: 12.h, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ Text( - "¥$money", - style: TextStyle( - fontSize: 14.sp, - color: Color(0xff353535), - fontWeight: MyFontWeight.semi_bold, - ), + "应付数额", + style: + TextStyle(fontSize: 14, color: Color(0xFF353535),fontWeight: MyFontWeight.regular), ), SizedBox( - width: 10, + width: 12, ), Text( - S.of(context).pingtaiyue, + widget.arguments["payType"] == 1 ? "${double.parse(widget.arguments["onePrice"])*buyNum}积分": + ((widget.arguments["price"] == null || widget.arguments["price"] == "0" + ? "" + : "${double.parse(widget.arguments["price"])*buyNum}积分") + + (widget.arguments["money"] == null || widget.arguments["money"] == "0.00" + ? "" + : " + ${double.parse(widget.arguments["money"])*buyNum}元")), style: TextStyle( - fontSize: 14.sp, - color: Color(0xff353535), - fontWeight: MyFontWeight.semi_bold, + fontSize: 12, + decoration:(widget.arguments["payType"] == 3) ? TextDecoration.lineThrough:TextDecoration.none, + color: Color(0xFF32A060), ), ), ], ), - ), - SizedBox( - height: 10, - ), - GestureDetector( - onTap: () { - setState(() { - checkIndex = 2; - }); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, + SizedBox( + height: 12, + ), + if(widget.arguments["payType"] == 3) + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + "现金抵扣积分", + style: + TextStyle(fontSize: 14, color: Color(0xFF353535),fontWeight: MyFontWeight.regular), + ), + SizedBox( + width: 12, + ), + Text( + "${double.parse(widget.arguments["oneMoney"])*buyNum}元", + style: TextStyle( + fontSize: 12, + color: Colors.black, + ), + ), + ], + ), + SizedBox( + height: 12, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [ - checkPayView(2), - Expanded( - child: Container(), - flex: 1, - ), Text( - "¥$balance", + "合计", style: TextStyle( - fontSize: 14.sp, - color: Color(0xff353535), - fontWeight: MyFontWeight.semi_bold, - ), + fontSize: 14.sp, color: Color(0xFF353535),fontWeight: MyFontWeight.regular), ), SizedBox( - width: 10, + width: 12.w, ), Text( - S.of(context).dianpuyue, + handleNeedPay(), style: TextStyle( - fontSize: 14.sp, - color: Color(0xff353535), - fontWeight: MyFontWeight.semi_bold, - ), + fontSize: 12.sp, color: Color(0xFF32A060)), ), ], ), - ), - SizedBox( - height: 10, - ), - GestureDetector( - onTap: () { - setState(() { - checkIndex = 3; - }); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.start, + ], + ), + ), + Container( + margin: + EdgeInsets.only(left: 16, right: 16, bottom: 8), + padding: EdgeInsets.all(20), + decoration: BoxDecoration( + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(12), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ) + ], + borderRadius: BorderRadius.all(Radius.circular(8)), + ), + child: Column( + children: [ + Row( children: [ - checkPayView(3), - Spacer(), - Image.asset("assets/image/icon_we_chat.png"), - Padding( - padding: EdgeInsets.only(left: 8.w), + Expanded(child: Text( + "兑换数量", + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 14.sp, + color: Color(0xFF353535)), + )), + InkWell( + onTap: () { + setState(() { + if(buyNum > 1) + buyNum -= 1; + }); + }, + child: Image.asset( + "assets/image/reduce.png", + width: 22, + height: 22, + ), + ), + Container( + width: 30, + alignment: Alignment.center, child: Text( - S.of(context).weixinzhifu, + buyNum.toString(), style: TextStyle( + color: Colors.black, fontSize: 14.sp, - color: Color(0xff353535), - fontWeight: MyFontWeight.semi_bold, + fontWeight: MyFontWeight.medium, ), ), ), + InkWell( + onTap: () { + setState(() { + if(widget.arguments["payType"] == 1 ? + (double.parse(widget.arguments["onePrice"])*(buyNum+1)) + > double.parse(points): + (widget.arguments["price"] == null || widget.arguments["price"] == "0" + ? false + : (double.parse(widget.arguments["price"])*(buyNum+1)) > double.parse(points))){ + SmartDialog.showToast("您的积分不足", alignment: Alignment.center); + return; + } + buyNum += 1; + }); + }, + child: Image.asset( + "assets/image/add.png", + width: 22, + height: 22, + ), + ), ], ), - ), - ], + ], + ), ), - ), - // GestureDetector( - // onTap: () { - // if (!storeIsSelected) return; - // creditOrder(); - // }, - // child: Container( - // padding: EdgeInsets.only(top: 16, bottom: 16), - // decoration: BoxDecoration( - // color: MaterialStateColor.resolveWith((states) => - // storeIsSelected ? Color(0xFF32A060) : Color(0xFFD8D8D8)), - // borderRadius: BorderRadius.only( - // topLeft: Radius.circular(4), - // topRight: Radius.circular(4))), - // alignment: Alignment.center, - // child: Text( - // S.of(context).querenduihuan, - // style: TextStyle( - // fontSize: 16.sp, - // color: MaterialStateColor.resolveWith((states) => - // storeIsSelected ? Colors.white : Color(0xFFA0A0A0)), - // fontWeight: FontWeight.bold), - // ), - // ), - // ), - Container( - height: 54.h, - color: Colors.white, - child: Row( - children: [ - Spacer(), - Padding(padding: EdgeInsets.only(top: 7,right: 16), - child:Column( - crossAxisAlignment: CrossAxisAlignment.center, + if(widget.arguments["payType"] == 3 || + (widget.arguments["payType"] == 2 && + widget.arguments["money"] != "0.00")) + Container( + width: double.infinity, + margin: EdgeInsets.only( + left: 16.w, + right: 16.w, + top: 12.h, + bottom:20.h, + ), + padding: EdgeInsets.only( + left: 16.w, + right: 16.w, + top: 20.h, + bottom: 20.h, + ), + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Color(0x000000).withAlpha(25), + offset: Offset(0, 1), + blurRadius: 12.0, + ), + ], + color: Colors.white, + borderRadius: BorderRadius.circular(8), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - S.of(context).heji, - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color: Colors.black, + Padding( + padding: EdgeInsets.only(bottom: 16.h), + child: Text( + S.of(context).zhifufangshi, + style: TextStyle( + fontSize: 16.sp, + color: Colors.black, + fontWeight: MyFontWeight.regular, + ), ), ), - Text( - "￥0.0", - style: TextStyle( - fontSize: 16.sp, - fontWeight: MyFontWeight.medium, - color: Color(0xFF32A060), + GestureDetector( + onTap: () { + setState(() { + checkIndex = 1; + }); + // widget.payChannelCheck(4); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + checkPayView(1), + Expanded( + child: Container(), + flex: 1, + ), + Text( + "¥$money", + style: TextStyle( + fontSize: 14.sp, + color: Color(0xff353535), + fontWeight: MyFontWeight.semi_bold, + ), + ), + SizedBox( + width: 10, + ), + Text( + S.of(context).pingtaiyue, + style: TextStyle( + fontSize: 14.sp, + color: Color(0xff353535), + fontWeight: MyFontWeight.semi_bold, + ), + ), + ], ), ), - ], - )), - GestureDetector( - onTap: () { - - }, - child: RoundButton( - width: 103.w, - height: 54.h, - text: S.current.jiesuan, - textColor: Colors.white, - fontWeight: MyFontWeight.regular, - backgroup: Color(0xFF32A060), - radius: 0, - fontSize: 16.sp, - padding: EdgeInsets.symmetric(vertical: 5.h), - ), - ), - ], - ), - ), - Container( - height: 54.h, - color: Colors.white, - child: Row( - children: [ - Spacer(), - Padding(padding: EdgeInsets.only(top: 7,right: 16), - child:Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - S.of(context).heji, - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.regular, - color: Colors.black, + SizedBox( + height: 10, + ), + GestureDetector( + onTap: () { + setState(() { + checkIndex = 2; + }); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + checkPayView(2), + Expanded( + child: Container(), + flex: 1, ), - ), - Text( - S.of(context).jifen_(widget.arguments["price"]), - style: TextStyle( - fontSize: 16.sp, - fontWeight: MyFontWeight.medium, - color: Color(0xFF32A060), + Text( + "¥$balance", + style: TextStyle( + fontSize: 14.sp, + color: Color(0xff353535), + fontWeight: MyFontWeight.semi_bold, + ), ), - ), - ], - )), - GestureDetector( - onTap: () { - if (!storeIsSelected) return; - creditOrder(); - }, - child: RoundButton( - width: 103.w, - height: 54.h, - text: S.current.duihuan, - textColor: Colors.white, - fontWeight: MyFontWeight.regular, - backgroup: Color(0xFF32A060), - radius: 0, - fontSize: 16.sp, - padding: EdgeInsets.symmetric(vertical: 5.h), - ), + SizedBox( + width: 10, + ), + Text( + S.of(context).dianpuyue, + style: TextStyle( + fontSize: 14.sp, + color: Color(0xff353535), + fontWeight: MyFontWeight.semi_bold, + ), + ), + ], + ), + ), + SizedBox( + height: 10, + ), + GestureDetector( + onTap: () { + setState(() { + checkIndex = 3; + }); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + checkPayView(3), + Spacer(), + Image.asset("assets/image/icon_we_chat.png"), + Padding( + padding: EdgeInsets.only(left: 8.w), + child: Text( + S.of(context).weixinzhifu, + style: TextStyle( + fontSize: 14.sp, + color: Color(0xff353535), + fontWeight: MyFontWeight.semi_bold, + ), + ), + ), + ], + ), + ), + ], ), - ], + ), + SizedBox(height: 40) + ], + )), + Align(alignment: Alignment.bottomCenter,child: + Container( + height: 54.h, + color: Colors.white, + child: Row( + children: [ + Spacer(), + Padding(padding: EdgeInsets.only(top: 7,right: 16), + child:Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + S.of(context).heji, + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Colors.black, + ), + ), + Text(handleNeedPay(), + style: TextStyle( + fontSize: 16.sp, + fontWeight: MyFontWeight.medium, + color: Color(0xFF32A060), + ), + ), + ], + )), + GestureDetector( + onTap: () { + if (!storeIsSelected) return; + creditOrder(); + }, + child: RoundButton( + width: 103.w, + height: 54.h, + text: widget.arguments["payType"] == 3 || + (widget.arguments["payType"] == 2 && + widget.arguments["money"] != "0.00") ? + S.current.jiesuan : S.current.duihuan, + textColor: Colors.white, + fontWeight: MyFontWeight.regular, + backgroup: Color(0xFF32A060), + radius: 0, + fontSize: 16.sp, + padding: EdgeInsets.symmetric(vertical: 5.h), ), ), ], ), - - // Expanded( - // child: - // ), - - ], - ) ,), + )) + ],) ); } + String handleNeedPay(){ + return widget.arguments["payType"] == 1 ? + "${double.parse(widget.arguments["onePrice"])*buyNum}积分".toString() : (widget.arguments["payType"] == 2 + ? ((widget.arguments["price"] == null || widget.arguments["price"] == "0" + ? "" : "${double.parse(widget.arguments["price"]) * buyNum}积分") + + (widget.arguments["money"] == null || widget.arguments["money"] == "0.00" + ? "" : " + ${double.parse(widget.arguments["money"])*buyNum}元")):"${double.parse(widget.arguments["oneMoney"])*buyNum}元"); + } + Widget checkPayView(var index) { return Container( padding: EdgeInsets.only(right: 16.w), @@ -849,6 +812,7 @@ class _ExchangeOrderPage extends State { setState(() {}); } + ///创建积分订单 creditOrder() async { if (widget.arguments["useTyped"] == 1 && (storeId == null || storeId == "")) { @@ -862,19 +826,23 @@ class _ExchangeOrderPage extends State { } BaseData baseDate = await apiService.creditOrder({ "goodsId": widget.arguments["goodsId"], - "number": 1, + "isOneSell":widget.arguments["payType"] != 2, + "number": buyNum, "useTyped": widget.arguments["useTyped"], - "payChannel":checkIndex == 3?"1":"4", + "payChannel":handleNeedPay().contains("元") ? (checkIndex == 3?"1":"4") : "0", if (widget.arguments["useTyped"] == 1) "storeId": storeId, if (widget.arguments["useTyped"] == 2) "userAddressId": userAddressId, }); if (baseDate.isSuccess) { - if(checkIndex == 3){ + if((widget.arguments["payType"] == 3 || + (widget.arguments["payType"] == 2 && + widget.arguments["money"] != "0.00")) && + checkIndex == 3){ // if (!(await Min.isInitialize())) { - // // 小程序的微信支付和app的充值支付使用同一个WXPayEntryActivity回调， - // // 然而充值时小程序未初始化会导致回调内部代码调用getPackage空指针， - // // 故而在此初始化一下 - // await Min.initialize(); + // 小程序的微信支付和app的充值支付使用同一个WXPayEntryActivity回调， + // 然而充值时小程序未初始化会导致回调内部代码调用getPackage空指针， + // 故而在此初始化一下 + // await Min.initialize(); // } WxPay wxPay = WxPay.fromJson(baseDate.data); await registerWxApi( @@ -894,9 +862,16 @@ class _ExchangeOrderPage extends State { weChatResponseEventHandler.listen((event) async { print("payCallback: ${event.errCode}"); Navigator.of(context).popAndPushNamed( - '/router/order_details', + '/router/exchange_order_success_page', arguments: { "id": widget.arguments["goodsId"], + "price": (widget.arguments["payType"] == 1 ? + (double.parse(widget.arguments["onePrice"])*buyNum).toString(): + (widget.arguments["price"] == null || widget.arguments["price"] == "0" + ? "0" + : (double.parse(widget.arguments["price"])*buyNum).toString())), + "points": points, + "payChannel":widget.arguments["payChannel"], }, ); }); @@ -904,8 +879,13 @@ class _ExchangeOrderPage extends State { } await Navigator.of(context) .pushNamed('/router/exchange_order_success_page', arguments: { - "price": widget.arguments["price"], + "price": (widget.arguments["payType"] == 1 ? + (double.parse(widget.arguments["onePrice"])*buyNum).toString(): + (widget.arguments["price"] == null || widget.arguments["price"] == "0" + ? "0" + : (double.parse(widget.arguments["price"])*buyNum).toString())), "points": points, + "payChannel":widget.arguments["payChannel"], "id": baseDate.data }); points = diff --git a/lib/order/exchange_order_success_page.dart b/lib/order/exchange_order_success_page.dart index 9bbb7f0e..ae2f076a 100644 --- a/lib/order/exchange_order_success_page.dart +++ b/lib/order/exchange_order_success_page.dart @@ -9,7 +9,6 @@ import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/border_text.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; -import 'package:huixiang/view_widget/round_button.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -30,8 +29,8 @@ class _ExchangeOrderSuccessPage extends State { @override void initState() { super.initState(); - price = int.tryParse(widget.arguments["points"]) - - int.tryParse(widget.arguments["price"]); + price = double.parse((widget.arguments["points"] ?? "0").toString()).toInt() - + double.parse((widget.arguments["price"] ?? "0").toString()).toInt(); UserInfo userInfo; SharedPreferences.getInstance().then((value){ @@ -172,26 +171,26 @@ class _ExchangeOrderSuccessPage extends State { SizedBox( width: 16.w, ), - Expanded( - child: InkWell( - onTap: () { - receiveToCard(); - }, - child: RoundButton( - text: S.of(context).lingqudaokabao, - textColor: Colors.white, - backgroup: Color(0xFF32A060), - radius: 4, - fontWeight: MyFontWeight.semi_bold, - fontSize: 16.sp, - padding: EdgeInsets.only(top: 12.h, bottom: 12.h), - ), - ), - flex: 1, - ), - SizedBox( - width: 16.w, - ), + // Expanded( + // child: InkWell( + // onTap: () { + // receiveToCard(); + // }, + // child: RoundButton( + // text: S.of(context).lingqudaokabao, + // textColor: Colors.white, + // backgroup: Color(0xFF32A060), + // radius: 4, + // fontWeight: MyFontWeight.semi_bold, + // fontSize: 16.sp, + // padding: EdgeInsets.only(top: 12.h, bottom: 12.h), + // ), + // ), + // flex: 1, + // ), + // SizedBox( + // width: 16.w, + // ), ], ) ], diff --git a/lib/retrofit/data/exchange_order_goods.dart b/lib/retrofit/data/exchange_order_goods.dart index 6f5acd30..d0800a02 100644 --- a/lib/retrofit/data/exchange_order_goods.dart +++ b/lib/retrofit/data/exchange_order_goods.dart @@ -14,6 +14,7 @@ class ExchangeOrderGoods { String description; String worth; String price; + String money; String couponId; bool canPick; bool canDelivery; @@ -36,6 +37,7 @@ class ExchangeOrderGoods { ..description = json['description'] as String ..worth = json['worth'] as String ..price = json['price'] as String + ..money = json['money'] as String ..couponId = json['couponId'] as String ..canPick = json['canPick'] as bool ..canDelivery = json['canDelivery'] as bool @@ -57,6 +59,7 @@ class ExchangeOrderGoods { 'description': this.description, 'worth': this.worth, 'price': this.price, + 'money': this.money, 'couponId': this.couponId, 'canPick': this.canPick, 'canDelivery': this.canDelivery, diff --git a/lib/retrofit/data/goods.dart b/lib/retrofit/data/goods.dart index 65d67b22..20a75811 100644 --- a/lib/retrofit/data/goods.dart +++ b/lib/retrofit/data/goods.dart @@ -1,5 +1,114 @@ +/// id : "1420627244354633728" +/// createTime : "2021-07-29 14:08:24" +/// createUser : "1" +/// updateTime : "2021-11-10 13:59:42" +/// updateUser : "1" +/// categoryId : "2" +/// storeId : "0" +/// name : "回乡" +/// description : "免费拿，一人发一个！" +/// detail : "

(1) 兑换商品中所要求的积分达到方可兑换

\n

(2)先到先得

" +/// worth : "9999.00" +/// price : "1" +/// money : "2.00" +/// onePrice : "0" +/// oneMoney : "0.00" +/// stock : 28 +/// sales : 22 +/// isHot : true +/// sortOrder : 6 +/// state : 1 +/// canPick : true +/// canDelivery : true +/// isDelete : 0 +/// categoryName : null +/// mainImgPath : "https://pos.upload.gznl.top/0000/2021/07/bd3a1387-02a0-4ad9-9505-f4c43b26aa3b.png" +/// viceImgPaths : ["https://pos.upload.gznl.top/0000/2021/07/bd3a1387-02a0-4ad9-9505-f4c43b26aa3b.png","https://pos.upload.gznl.top/0000/2021/07/bd3a1387-02a0-4ad9-9505-f4c43b26aa3b.png"] class Goods { + Goods({ + String id, + String createTime, + String createUser, + String updateTime, + String updateUser, + String categoryId, + String storeId, + String name, + String description, + String detail, + String worth, + String price, + String money, + String onePrice, + String oneMoney, + int stock, + int sales, + bool isHot, + int sortOrder, + int state, + bool canPick, + bool canDelivery, + int isDelete, + dynamic categoryName, + String mainImgPath, + List viceImgPaths,}){ + _id = id; + _createTime = createTime; + _createUser = createUser; + _updateTime = updateTime; + _updateUser = updateUser; + _categoryId = categoryId; + _storeId = storeId; + _name = name; + _description = description; + _detail = detail; + _worth = worth; + _price = price; + _money = money; + _onePrice = onePrice; + _oneMoney = oneMoney; + _stock = stock; + _sales = sales; + _isHot = isHot; + _sortOrder = sortOrder; + _state = state; + _canPick = canPick; + _canDelivery = canDelivery; + _isDelete = isDelete; + _categoryName = categoryName; + _mainImgPath = mainImgPath; + _viceImgPaths = viceImgPaths; + } + + Goods.fromJson(dynamic json) { + _id = json['id']; + _createTime = json['createTime']; + _createUser = json['createUser']; + _updateTime = json['updateTime']; + _updateUser = json['updateUser']; + _categoryId = json['categoryId']; + _storeId = json['storeId']; + _name = json['name']; + _description = json['description']; + _detail = json['detail']; + _worth = json['worth']; + _price = json['price']; + _money = json['money']; + _onePrice = json['onePrice']; + _oneMoney = json['oneMoney']; + _stock = json['stock']; + _sales = json['sales']; + _isHot = json['isHot']; + _sortOrder = json['sortOrder']; + _state = json['state']; + _canPick = json['canPick']; + _canDelivery = json['canDelivery']; + _isDelete = json['isDelete']; + _categoryName = json['categoryName']; + _mainImgPath = json['mainImgPath']; + _viceImgPaths = json['viceImgPaths'] != null ? json['viceImgPaths'].cast() : []; + } String _id; String _createTime; String _createUser; @@ -9,9 +118,12 @@ class Goods { String _storeId; String _name; String _description; + String _detail; String _worth; String _price; - String _detail; + String _money; + String _onePrice; + String _oneMoney; int _stock; int _sales; bool _isHot; @@ -33,9 +145,12 @@ class Goods { String get storeId => _storeId; String get name => _name; String get description => _description; + String get detail => _detail; String get worth => _worth; String get price => _price; - String get detail => _detail; + String get money => _money; + String get onePrice => _onePrice; + String get oneMoney => _oneMoney; int get stock => _stock; int get sales => _sales; bool get isHot => _isHot; @@ -48,106 +163,34 @@ class Goods { String get mainImgPath => _mainImgPath; List get viceImgPaths => _viceImgPaths; - Goods({ - String id, - String createTime, - String createUser, - String updateTime, - String updateUser, - String categoryId, - String storeId, - String name, - String description, - String worth, - String price, - String detail, - int stock, - int sales, - bool isHot, - int sortOrder, - int state, - bool canPick, - bool canDelivery, - int isDelete, - dynamic categoryName, - String mainImgPath, - List viceImgPaths}){ - _id = id; - _createTime = createTime; - _createUser = createUser; - _updateTime = updateTime; - _updateUser = updateUser; - _categoryId = categoryId; - _storeId = storeId; - _name = name; - _description = description; - _worth = worth; - _price = price; - _detail = detail; - _stock = stock; - _sales = sales; - _isHot = isHot; - _sortOrder = sortOrder; - _state = state; - _canPick = canPick; - _canDelivery = canDelivery; - _isDelete = isDelete; - _categoryName = categoryName; - _mainImgPath = mainImgPath; - _viceImgPaths = viceImgPaths; -} - - Goods.fromJson(dynamic json) { - _id = json["id"]; - _createTime = json["createTime"]; - _createUser = json["createUser"]; - _updateTime = json["updateTime"]; - _updateUser = json["updateUser"]; - _categoryId = json["categoryId"]; - _storeId = json["storeId"]; - _name = json["name"]; - _description = json["description"]; - _worth = json["worth"]; - _price = json["price"]; - _detail = json["detail"]; - _stock = json["stock"]; - _sales = json["sales"]; - _isHot = json["isHot"]; - _sortOrder = json["sortOrder"]; - _state = json["state"]; - _canPick = json["canPick"]; - _canDelivery = json["canDelivery"]; - _isDelete = json["isDelete"]; - _categoryName = json["categoryName"]; - _mainImgPath = json["mainImgPath"]; - _viceImgPaths = json["viceImgPaths"] != null ? json["viceImgPaths"].cast() : []; - } - Map toJson() { - var map = {}; - map["id"] = _id; - map["createTime"] = _createTime; - map["createUser"] = _createUser; - map["updateTime"] = _updateTime; - map["updateUser"] = _updateUser; - map["categoryId"] = _categoryId; - map["storeId"] = _storeId; - map["name"] = _name; - map["description"] = _description; - map["worth"] = _worth; - map["price"] = _price; - map["detail"] = _detail; - map["stock"] = _stock; - map["sales"] = _sales; - map["isHot"] = _isHot; - map["sortOrder"] = _sortOrder; - map["state"] = _state; - map["canPick"] = _canPick; - map["canDelivery"] = _canDelivery; - map["isDelete"] = _isDelete; - map["categoryName"] = _categoryName; - map["mainImgPath"] = _mainImgPath; - map["viceImgPaths"] = _viceImgPaths; + final map = {}; + map['id'] = _id; + map['createTime'] = _createTime; + map['createUser'] = _createUser; + map['updateTime'] = _updateTime; + map['updateUser'] = _updateUser; + map['categoryId'] = _categoryId; + map['storeId'] = _storeId; + map['name'] = _name; + map['description'] = _description; + map['detail'] = _detail; + map['worth'] = _worth; + map['price'] = _price; + map['money'] = _money; + map['onePrice'] = _onePrice; + map['oneMoney'] = _oneMoney; + map['stock'] = _stock; + map['sales'] = _sales; + map['isHot'] = _isHot; + map['sortOrder'] = _sortOrder; + map['state'] = _state; + map['canPick'] = _canPick; + map['canDelivery'] = _canDelivery; + map['isDelete'] = _isDelete; + map['categoryName'] = _categoryName; + map['mainImgPath'] = _mainImgPath; + map['viceImgPaths'] = _viceImgPaths; return map; } diff --git a/lib/retrofit/data/rank.dart b/lib/retrofit/data/rank.dart index 40e1929e..2b9a3402 100644 --- a/lib/retrofit/data/rank.dart +++ b/lib/retrofit/data/rank.dart @@ -13,6 +13,7 @@ class Rank { String _createTime; String _createUser; String _id; + String _price; String _rankContent; String _rankImg; String _rankName; @@ -24,6 +25,7 @@ class Rank { String get createTime => _createTime; String get createUser => _createUser; String get id => _id; + String get price => _price; String get rankContent => _rankContent; String get rankImg => _rankImg; String get rankName => _rankName; @@ -46,6 +48,7 @@ class Rank { _createTime = createTime; _createUser = createUser; _id = id; + _price = price; _rankContent = rankContent; _rankImg = rankImg; _rankName = rankName; @@ -59,6 +62,7 @@ class Rank { _createTime = json["createTime"]; _createUser = json["createUser"]; _id = json["id"]; + _price = json["price"]; _rankContent = json["rankContent"]; _rankImg = json["rankImg"]; _rankName = json["rankName"]; @@ -73,6 +77,7 @@ class Rank { map["createTime"] = _createTime; map["createUser"] = _createUser; map["id"] = _id; + map["price"] = _price; map["rankContent"] = _rankContent; map["rankImg"] = _rankImg; map["rankName"] = _rankName; diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 10b18133..980493d7 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -48,15 +48,15 @@ part 'retrofit_api.g.dart'; // const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式 // const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式 -const base_url = "http://192.168.10.236:8766/app/"; ///费韬 -const baseUrl = "http://192.168.10.236:8766/app/"; ///费韬 +// const base_url = "http://192.168.10.236:8766/app/"; ///费韬 +// const baseUrl = "http://192.168.10.236:8766/app/"; ///费韬 // const base_url = "http://192.168.10.37:8766/app/"; // const baseUrl = "http://192.168.10.37:8766/app/"; -// const base_url = "http://192.168.10.130:8766/app/";///詹云久 -// const baseUrl = "http://192.168.10.130:8766/app/";///詹云久 +const base_url = "http://192.168.10.130:8766/app/";///詹云久 +const baseUrl = "http://192.168.10.130:8766/app/";///詹云久 @RestApi(baseUrl: baseUrl) abstract class ApiService { diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart index 8c3cf22b..c859fde0 100644 --- a/lib/retrofit/retrofit_api.g.dart +++ b/lib/retrofit/retrofit_api.g.dart @@ -9,7 +9,7 @@ part of 'retrofit_api.dart'; class _ApiService implements ApiService { _ApiService(this._dio, {this.baseUrl}) { ArgumentError.checkNotNull(_dio, '_dio'); - baseUrl ??= 'http://192.168.10.236:8766/app/'; + baseUrl ??= 'http://192.168.10.130:8766/app/'; } final Dio _dio; diff --git a/lib/store/store_view/product_sku.dart b/lib/store/store_view/product_sku.dart index 34320ebf..c75e8a58 100644 --- a/lib/store/store_view/product_sku.dart +++ b/lib/store/store_view/product_sku.dart @@ -137,7 +137,7 @@ class _ProductSku extends State { Padding( padding: EdgeInsets.only(top: 4, bottom: 7), child: Text( - "已选: " + + ": " + (selectSkus.map((e) => "$e").toList().toString()), style: TextStyle( color: Color(0xFF727272), diff --git a/lib/view_widget/mine_vip_view.dart b/lib/view_widget/mine_vip_view.dart index 1aac0318..a2c69e2f 100644 --- a/lib/view_widget/mine_vip_view.dart +++ b/lib/view_widget/mine_vip_view.dart @@ -56,61 +56,62 @@ class MineVipView extends StatelessWidget { } else if (vipLevel < curLevel) { topLeft = S.of(context).shangyidengji; } else { - topLeft = S.of(context).xiayidengji; + topLeft = S.of(context).zanweikaitong; } switch (vipLevel) { case 1: - { - linearColor = [ - Color(0xFFD6F6F3), - Color(0xFF86BEBA), - ]; - levelColor = Color(0xFF558B87); - levelText = "LV1 ${S.of(context).qingtonghuiyuan}"; - break; - } - case 2: { linearColor = [ Color(0xFFF2F2F2), - Color(0xFFBEBEBE), + Color(0xFFCCCCCC), ]; levelColor = Color(0xFF575757); textColor = Color(0xFF575757); - levelText = "LV2 ${S.of(context).baiyinhuiyuan}"; + levelText = "VIP ${S.of(context).yinkahuiyuan}"; break; } - case 3: + case 2: { linearColor = [ Color(0xFFFEF5DC), Color(0xFFD1B97D), ]; levelColor = Color(0xFFAE9B6D); - levelText = "LV3 ${S.of(context).huangjinhuiyuan}"; - break; - } - case 4: - { - linearColor = [ - Color(0xFFEEEEEF), - Color(0xFFA999DB), - ]; - levelColor = Color(0xFF887CB4); - levelText = "LV4 ${S.of(context).zuanshihuiyuan}"; + textColor = Color(0xFF93723B); + levelText = "VIP ${S.of(context).jinkahuiyuan}"; break; } - case 5: + case 3: { linearColor = [ Color(0xFFEEEEEF), Color(0xFF000000), ]; levelColor = Color(0xFF000000); - levelText = "LV5 ${S.of(context).zhizunhuiyuan}"; + levelText = "VIP ${S.of(context).gongchuanghuiyuan}"; break; } + // case 4: + // { + // linearColor = [ + // Color(0xFFEEEEEF), + // Color(0xFFA999DB), + // ]; + // levelColor = Color(0xFF887CB4); + // levelText = "LV4 ${S.of(context).zuanshihuiyuan}"; + // break; + // } + // case 5: + // { + // linearColor = [ + // Color(0xFFEEEEEF), + // Color(0xFF000000), + // ]; + // levelColor = Color(0xFF000000); + // levelText = "LV5 ${S.of(context).zhizunhuiyuan}"; + // break; + // } } bool isUserVip = (userInfo == null); @@ -214,9 +215,12 @@ class MineVipView extends StatelessWidget { children: [ Expanded( child: Text( + // rank > rankMax + // ? S.of(context).dangqiandengji + // : "${S.of(context).jifen_(rankMax - rank)} ${S.of(context).daoxiayidengji}", rank > rankMax ? S.of(context).dangqiandengji - : "${S.of(context).jifen_(rankMax - rank)} ${S.of(context).daoxiayidengji}", + : "消费￥20000 升级为金卡", overflow: TextOverflow.ellipsis, style: TextStyle( color: textColor, @@ -263,28 +267,28 @@ class MineVipView extends StatelessWidget { ), ), // if (isUserVip) - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // crossAxisAlignment: CrossAxisAlignment.center, - // children: [ - // Text( - // S.of(context).kaitongriqi( - // (createTime != null && createTime != "") - // ? createTime.split(" ")[0] - // : "$createTime"), - // style: TextStyle( - // color: textColor, - // fontWeight: MyFontWeight.regular, - // fontSize: 12.sp, - // ), - // ), - // Icon( - // Icons.qr_code, - // size: 24, - // color: Colors.white, - // ), - // ], - // ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + S.of(context).kaitongriqi( + (createTime != null && createTime != "") + ? createTime.split(" ")[0] + : "$createTime"), + style: TextStyle( + color: textColor, + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + ), + ), + Icon( + Icons.qr_code, + size: 24, + color:textColor, + ), + ], + ), ], ), ), @@ -303,8 +307,14 @@ class MineVipView extends StatelessWidget { LoginTipsDialog().show(context); return; } + // Navigator.of(context) + // .pushNamed('/router/mine_vip_level_page', arguments: { + // "rankLevel": curLevel, + // "createTime": (userInfo != null) ? "${userInfo.createTime}" : "", + // "points": (userInfo != null) ? int.tryParse(userInfo.points) : 0, + // }); Navigator.of(context) - .pushNamed('/router/mine_vip_level_page', arguments: { + .pushNamed('/router/mine_vip_core', arguments: { "rankLevel": curLevel, "createTime": (userInfo != null) ? "${userInfo.createTime}" : "", "points": (userInfo != null) ? int.tryParse(userInfo.points) : 0, diff --git a/lib/view_widget/receive_success.dart b/lib/view_widget/receive_success.dart index 73cf98aa..90cd3fcf 100644 --- a/lib/view_widget/receive_success.dart +++ b/lib/view_widget/receive_success.dart @@ -98,8 +98,8 @@ class ReceiveSuccess extends StatelessWidget { Image.asset( "assets/image/icon_order_success.png", fit: BoxFit.cover, - width: 80.w, - height: 80.h, + width: 80, + height: 80, ), ], ) diff --git a/lib/view_widget/vip_dialog.dart b/lib/view_widget/vip_dialog.dart new file mode 100644 index 00000000..d7b2c959 --- /dev/null +++ b/lib/view_widget/vip_dialog.dart @@ -0,0 +1,206 @@ +import 'package:flutter/material.dart'; +import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/utils/font_weight.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +class VipDialog extends StatelessWidget { + @override + Widget build(BuildContext context) { + return SimpleDialog( + titlePadding: EdgeInsets.all(10), + backgroundColor: Colors.transparent, + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(6), + ), + children: [ + Stack( + alignment: Alignment.topCenter, + children: [ + Container( + margin: EdgeInsets.only(top: 40.h), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8),), + child:SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Column( + children: [ + Container( + alignment: Alignment.center, + width:double.infinity, + height: 92, + padding: EdgeInsets.only(top: 50.h, bottom: 19.h), + decoration: BoxDecoration( + color: Colors.black, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(8), + topRight: Radius.circular(8), + ),), + child:Text( + "${S.of(context).gongxinchengwei}银卡会员", + style: TextStyle( + color: Colors.white, + fontSize: 18.sp, + fontWeight: FontWeight.bold, + ), + ), + ), + Container( + child: Column( + children: [ + Padding( + padding: EdgeInsets.only(top:16.h, bottom: 19.h), + child: Text( + S.of(context).huodequanyi, + style: TextStyle( + color: Colors.black, + fontSize: 14.sp, + fontWeight:MyFontWeight.medium, + ), + ), + ), + // vipUpgrade(), + Container( + margin: EdgeInsets.only(left: 32,right: 32,bottom: 20), + decoration: BoxDecoration( + gradient: new LinearGradient( + begin: Alignment.centerLeft, + end: Alignment.centerRight, + colors: [ + Color(0xFFFFDCA1), + Color(0xFFFAE4C0), + ]), + borderRadius: BorderRadius.circular(22.5), + ), + width: MediaQuery.of(context).size.width, + height: 40, + alignment: Alignment.center, + child: Text( + S.of(context).chakanquanyi, + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16.sp, + color: Color(0xFF4A4748), + ), + ), + ), + ], + ), + ), + ], + ), + ), + ), + Image.asset( + "assets/image/vip_yk.png", + fit: BoxFit.cover, + width: 76, + height: 76, + ), + ], + ), + ], + ); + } + + ///会员升级权益列表 + Widget vipUpgrade() { + return GridView.builder( + itemCount:9, + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + //一行的Widget数量 + crossAxisCount:3, + //水平子Widget之间间距 + crossAxisSpacing:10, + //垂直子Widget之间间距 + mainAxisSpacing: 10, + ), + itemBuilder: (context, index) { + return GestureDetector( + onTap: () { + Navigator.of(context) + .pushNamed('/router/legal_right_details', arguments: {}); + }, + child: vipUpgradeItem(), + ); + }, + ); + } + + Widget vipUpgradeItem() { + return Container( + alignment: Alignment.center, + child: Column( + children: [ + Stack( + alignment: Alignment.bottomCenter, + children: [ + Opacity( + opacity: 0.3, + // MImage( + // "assets/image/badge_img.png", + // width: 80, + // height: 80, + // fit: BoxFit.cover, + // errorSrc: "assets/image/default_1.png", + // fadeSrc: "assets/image/default_1.png", + // ), + child: Image.asset( + "assets/image/vip_qy.png", + width: 36, + height: 36, + fit: BoxFit.cover, + ), + ), + Container( + decoration: new BoxDecoration( + color: Color(0xFFA29E9E), + borderRadius: BorderRadius.circular(7.0), + ), + width: 52.w, + height: 15.h, + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.lock, + color: Color(0xFFFFDCA1), + size: 10, + ), + Text( + "暂未开放", + style: TextStyle( + color: Color(0xFF181818), + fontWeight: MyFontWeight.regular, + fontSize: 9.sp, + ), + ), + ], + ), + ) + ], + ), + SizedBox( + height: 5.h, + ), + Text( + "储值优惠", + maxLines: 2, + overflow: TextOverflow.ellipsis, + textAlign: TextAlign.center, + style: TextStyle( + color: Color(0xFF181818), + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + ), + ), + ], + ), + ); + } + +} \ No newline at end of file