Merge branch 'master' into dev

# Conflicts:
#	lib/generated/intl/messages_en.dart
#	lib/generated/l10n.dart
#	lib/l10n/intl_en.arb
#	lib/l10n/intl_zh_CN.arb
#	lib/l10n/intl_zh_Hans_CN.arb
#	lib/l10n/intl_zh_Hant_CN.arb
#	lib/l10n/intl_zh_TW.arb

lib/generated/intl/messages_en.dart

@@ -94,7 +94,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "banben" : m0,
     "bangong" : MessageLookupByLibrary.simpleMessage("办公"),
     "bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("帮助与反馈"),
+    "baocun" : MessageLookupByLibrary.simpleMessage("保存"),
+    "baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
     "beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
+    "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"),
     "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"),
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"),
     "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
@@ -108,6 +111,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "changjianwenti" : MessageLookupByLibrary.simpleMessage("常见问题"),
     "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("创始人故事"),
     "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"),
+    "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"),
     "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员，享专属权益"),
     "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
     "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
@@ -127,12 +131,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打开定位"),
     "dangqianbanben" : MessageLookupByLibrary.simpleMessage("当前版本"),
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
+    "dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"),
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用户取餐"),
     "denglu" : MessageLookupByLibrary.simpleMessage("登录"),
     "diancan" : MessageLookupByLibrary.simpleMessage("点餐"),
+    "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
     "dingdan" : MessageLookupByLibrary.simpleMessage("订单"),
@@ -146,6 +152,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanyiwancheng" : MessageLookupByLibrary.simpleMessage("订单已完成"),
     "dingdanyizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"),
     "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
+    "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
     "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
     "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
     "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@@ -246,6 +253,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"),
     "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
     "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"),
+    "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"),
     "lingqu" : MessageLookupByLibrary.simpleMessage("领取"),
     "lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("领券中心"),
     "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"),
@@ -266,6 +274,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"),
     "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
     "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
+    "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"),
     "mi" : m16,
     "mingxi" : MessageLookupByLibrary.simpleMessage("明细"),
     "morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"),
@@ -302,6 +311,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("请输入手机号"),
     "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("请输入验证码"),
     "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"),
+    "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"),
+    "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("请填写收件人姓名"),
     "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青铜会员"),
     "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("请选择使用门店"),
     "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("请选择收货地址"),
@@ -370,7 +381,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "shiyongriqi" : MessageLookupByLibrary.simpleMessage("使用日期"),
     "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"),
     "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"),
-    "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("收货地址"),
+    "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("请输入详细收货地址"),
+    "shouhuorenshoujihao" : MessageLookupByLibrary.simpleMessage("请输入收货人手机号"),
+    "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人详细地址"),
+    "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("请输入收货人姓名"),
     "shoujihao" : MessageLookupByLibrary.simpleMessage("手机号"),
     "shouye" : MessageLookupByLibrary.simpleMessage("首页"),
     "shuaxin" : MessageLookupByLibrary.simpleMessage("刷新"),
@@ -378,6 +392,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuaxinshibai" : MessageLookupByLibrary.simpleMessage("刷新失败"),
     "shuaxinyue" : MessageLookupByLibrary.simpleMessage("刷新余额"),
     "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
+    "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"),
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
     "sui" : m24,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
@@ -398,6 +413,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"),
     "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"),
     "weidenglu" : MessageLookupByLibrary.simpleMessage("未登录"),
+    "weidengluxinxi" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "weihexiao" : MessageLookupByLibrary.simpleMessage("未核销"),
     "weikaiqi" : MessageLookupByLibrary.simpleMessage("未开启"),
     "weilegeiningenghaodefuwu" : MessageLookupByLibrary.simpleMessage("为了给您提供更好的服务，以及享受更加精彩的信息内容，请您在使用期间，进行登录"),
@@ -421,6 +437,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiangji" : MessageLookupByLibrary.simpleMessage("相机"),
     "xiangjitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以在使用过程中进行分享，希望您使用HISAPP时让我们使用相机功能"),
     "xiangqing" : MessageLookupByLibrary.simpleMessage("详情"),
+    "xiangxidizhi" : MessageLookupByLibrary.simpleMessage("详细地址"),
     "xianshangfafang" : MessageLookupByLibrary.simpleMessage("线上发放"),
     "xianxiashiyong" : MessageLookupByLibrary.simpleMessage("线下使用"),
     "xiaofei" : MessageLookupByLibrary.simpleMessage("消费"),
@@ -429,8 +446,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
+    "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
     "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"),
+    "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
     "yiduihuanjian" : m27,
@@ -438,6 +457,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
     "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"),
+    "yindao1" : MessageLookupByLibrary.simpleMessage("新增多项功能，海量优惠资讯实时推送"),
+    "yindao2" : MessageLookupByLibrary.simpleMessage("新增多项功能，使用平台钱包优惠多多，更有充值优惠享不停"),
+    "yindao3" : MessageLookupByLibrary.simpleMessage("新增会员任务得积分，消费可得绿金、积分商城换购"),
+    "yindao4" : MessageLookupByLibrary.simpleMessage("传递友爱纯净健康有机环保智慧理念"),
+    "yindaoye1" : MessageLookupByLibrary.simpleMessage("会员最新资讯抢先看"),
+    "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"),
+    "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"),
+    "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
     "yingyeshijian" : m28,
     "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),

lib/generated/intl/messages_zh_CN.dart

@@ -94,7 +94,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "banben" : m0,
     "bangong" : MessageLookupByLibrary.simpleMessage("办公"),
     "bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("帮助与反馈"),
+    "baocun" : MessageLookupByLibrary.simpleMessage("保存"),
+    "baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
     "beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
+    "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"),
     "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"),
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"),
     "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
@@ -108,6 +111,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "changjianwenti" : MessageLookupByLibrary.simpleMessage("常见问题"),
     "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("创始人故事"),
     "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"),
+    "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"),
     "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员，享专属权益"),
     "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
     "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
@@ -127,12 +131,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打开定位"),
     "dangqianbanben" : MessageLookupByLibrary.simpleMessage("当前版本"),
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
+    "dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"),
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用户取餐"),
     "denglu" : MessageLookupByLibrary.simpleMessage("登录"),
     "diancan" : MessageLookupByLibrary.simpleMessage("点餐"),
+    "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
     "dingdan" : MessageLookupByLibrary.simpleMessage("订单"),
@@ -146,6 +152,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanyiwancheng" : MessageLookupByLibrary.simpleMessage("订单已完成"),
     "dingdanyizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"),
     "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
+    "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
     "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
     "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
     "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@@ -245,6 +252,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"),
     "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
     "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"),
+    "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"),
     "lingqu" : MessageLookupByLibrary.simpleMessage("领取"),
     "lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("领券中心"),
     "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"),
@@ -265,6 +273,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"),
     "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
     "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
+    "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"),
     "mi" : m16,
     "mingxi" : MessageLookupByLibrary.simpleMessage("明细"),
     "morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"),
@@ -301,6 +310,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("请输入手机号"),
     "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("请输入验证码"),
     "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"),
+    "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"),
+    "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("请填写收件人姓名"),
     "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青铜会员"),
     "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("请选择使用门店"),
     "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("请选择收货地址"),
@@ -369,7 +380,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "shiyongriqi" : MessageLookupByLibrary.simpleMessage("使用日期"),
     "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"),
     "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"),
-    "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("收货地址"),
+    "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("请输入详细收货地址"),
+    "shouhuorenshoujihao" : MessageLookupByLibrary.simpleMessage("请输入收货人手机号"),
+    "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人详细地址"),
+    "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("请输入收货人姓名"),
     "shoujihao" : MessageLookupByLibrary.simpleMessage("手机号"),
     "shouye" : MessageLookupByLibrary.simpleMessage("首页"),
     "shuaxin" : MessageLookupByLibrary.simpleMessage("刷新"),
@@ -377,6 +391,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuaxinshibai" : MessageLookupByLibrary.simpleMessage("刷新失败"),
     "shuaxinyue" : MessageLookupByLibrary.simpleMessage("刷新余额"),
     "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
+    "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"),
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
     "sui" : m24,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
@@ -397,6 +412,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"),
     "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"),
     "weidenglu" : MessageLookupByLibrary.simpleMessage("未登录"),
+    "weidengluxinxi" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "weihexiao" : MessageLookupByLibrary.simpleMessage("未核销"),
     "weikaiqi" : MessageLookupByLibrary.simpleMessage("未开启"),
     "weilegeiningenghaodefuwu" : MessageLookupByLibrary.simpleMessage("为了给您提供更好的服务，以及享受更加精彩的信息内容，请您在使用期间，进行登录"),
@@ -420,6 +436,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiangji" : MessageLookupByLibrary.simpleMessage("相机"),
     "xiangjitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以在使用过程中进行分享，希望您使用HISAPP时让我们使用相机功能"),
     "xiangqing" : MessageLookupByLibrary.simpleMessage("详情"),
+    "xiangxidizhi" : MessageLookupByLibrary.simpleMessage("详细地址"),
     "xianshangfafang" : MessageLookupByLibrary.simpleMessage("线上发放"),
     "xianxiashiyong" : MessageLookupByLibrary.simpleMessage("线下使用"),
     "xiaofei" : MessageLookupByLibrary.simpleMessage("消费"),
@@ -428,8 +445,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
+    "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
     "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"),
+    "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
     "yiduihuanjian" : m27,
@@ -437,6 +456,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
     "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"),
+    "yindao1" : MessageLookupByLibrary.simpleMessage("新增多项功能，海量优惠资讯实时推送"),
+    "yindao2" : MessageLookupByLibrary.simpleMessage("新增多项功能，使用平台钱包优惠多多，更有充值优惠享不停"),
+    "yindao3" : MessageLookupByLibrary.simpleMessage("新增会员任务得积分，消费可得绿金、积分商城换购"),
+    "yindao4" : MessageLookupByLibrary.simpleMessage("传递友爱纯净健康有机环保智慧理念"),
+    "yindaoye1" : MessageLookupByLibrary.simpleMessage("会员最新资讯抢先看"),
+    "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"),
+    "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"),
+    "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
     "yingyeshijian" : m28,
     "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -94,7 +94,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "banben" : m0,
     "bangong" : MessageLookupByLibrary.simpleMessage("办公"),
     "bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("帮助与反馈"),
+    "baocun" : MessageLookupByLibrary.simpleMessage("保存"),
+    "baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
     "beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
+    "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"),
     "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"),
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"),
     "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
@@ -108,6 +111,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "changjianwenti" : MessageLookupByLibrary.simpleMessage("常见问题"),
     "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("创始人故事"),
     "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"),
+    "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"),
     "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员，享专属权益"),
     "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
     "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
@@ -127,12 +131,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打开定位"),
     "dangqianbanben" : MessageLookupByLibrary.simpleMessage("当前版本"),
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
+    "dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"),
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用户取餐"),
     "denglu" : MessageLookupByLibrary.simpleMessage("登录"),
     "diancan" : MessageLookupByLibrary.simpleMessage("点餐"),
+    "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
     "dingdan" : MessageLookupByLibrary.simpleMessage("订单"),
@@ -146,6 +152,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanyiwancheng" : MessageLookupByLibrary.simpleMessage("订单已完成"),
     "dingdanyizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"),
     "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
+    "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
     "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
     "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
     "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@@ -245,6 +252,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"),
     "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
     "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"),
+    "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"),
     "lingqu" : MessageLookupByLibrary.simpleMessage("领取"),
     "lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("领券中心"),
     "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"),
@@ -265,6 +273,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"),
     "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
     "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
+    "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"),
     "mi" : m16,
     "mingxi" : MessageLookupByLibrary.simpleMessage("明细"),
     "morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"),
@@ -301,6 +310,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("请输入手机号"),
     "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("请输入验证码"),
     "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"),
+    "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"),
+    "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("请填写收件人姓名"),
     "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青铜会员"),
     "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("请选择使用门店"),
     "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("请选择收货地址"),
@@ -369,7 +380,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "shiyongriqi" : MessageLookupByLibrary.simpleMessage("使用日期"),
     "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"),
     "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"),
-    "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("收货地址"),
+    "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("请输入详细收货地址"),
+    "shouhuorenshoujihao" : MessageLookupByLibrary.simpleMessage("请输入收货人手机号"),
+    "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人详细地址"),
+    "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("请输入收货人姓名"),
     "shoujihao" : MessageLookupByLibrary.simpleMessage("手机号"),
     "shouye" : MessageLookupByLibrary.simpleMessage("首页"),
     "shuaxin" : MessageLookupByLibrary.simpleMessage("刷新"),
@@ -377,6 +391,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuaxinshibai" : MessageLookupByLibrary.simpleMessage("刷新失败"),
     "shuaxinyue" : MessageLookupByLibrary.simpleMessage("刷新余额"),
     "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
+    "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"),
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
     "sui" : m24,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
@@ -397,6 +412,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"),
     "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"),
     "weidenglu" : MessageLookupByLibrary.simpleMessage("未登录"),
+    "weidengluxinxi" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "weihexiao" : MessageLookupByLibrary.simpleMessage("未核销"),
     "weikaiqi" : MessageLookupByLibrary.simpleMessage("未开启"),
     "weilegeiningenghaodefuwu" : MessageLookupByLibrary.simpleMessage("为了给您提供更好的服务，以及享受更加精彩的信息内容，请您在使用期间，进行登录"),
@@ -420,6 +436,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiangji" : MessageLookupByLibrary.simpleMessage("相机"),
     "xiangjitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以在使用过程中进行分享，希望您使用HISAPP时让我们使用相机功能"),
     "xiangqing" : MessageLookupByLibrary.simpleMessage("详情"),
+    "xiangxidizhi" : MessageLookupByLibrary.simpleMessage("详细地址"),
     "xianshangfafang" : MessageLookupByLibrary.simpleMessage("线上发放"),
     "xianxiashiyong" : MessageLookupByLibrary.simpleMessage("线下使用"),
     "xiaofei" : MessageLookupByLibrary.simpleMessage("消费"),
@@ -428,8 +445,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
+    "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
     "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"),
+    "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
     "yiduihuanjian" : m27,
@@ -437,6 +456,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
     "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"),
+    "yindao1" : MessageLookupByLibrary.simpleMessage("新增多项功能，海量优惠资讯实时推送"),
+    "yindao2" : MessageLookupByLibrary.simpleMessage("新增多项功能，使用平台钱包优惠多多，更有充值优惠享不停"),
+    "yindao3" : MessageLookupByLibrary.simpleMessage("新增会员任务得积分，消费可得绿金、积分商城换购"),
+    "yindao4" : MessageLookupByLibrary.simpleMessage("传递友爱纯净健康有机环保智慧理念"),
+    "yindaoye1" : MessageLookupByLibrary.simpleMessage("会员最新资讯抢先看"),
+    "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"),
+    "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"),
+    "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
     "yingyeshijian" : m28,
     "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -94,7 +94,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "banben" : m0,
     "bangong" : MessageLookupByLibrary.simpleMessage("辦公"),
     "bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("幫助與反饋"),
+    "baocun" : MessageLookupByLibrary.simpleMessage("保存"),
+    "baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
     "beizhu" : MessageLookupByLibrary.simpleMessage("備注"),
+    "bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"),
     "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("標為已讀"),
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("撥打電話"),
     "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回鄉"),
@@ -108,6 +111,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "changjianwenti" : MessageLookupByLibrary.simpleMessage("常見問題"),
     "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("創始人故事"),
     "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"),
+    "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市選擇"),
     "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成為專屬會員，享專屬權益"),
     "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
     "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
@@ -127,12 +131,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打開定位"),
     "dangqianbanben" : MessageLookupByLibrary.simpleMessage("當前版本"),
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("當前等級"),
+    "dangqianjifen" : MessageLookupByLibrary.simpleMessage("當前積分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("當前商品兌換核銷碼已核銷完成 "),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等級"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家確認"),
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用戶取餐"),
     "denglu" : MessageLookupByLibrary.simpleMessage("登錄"),
     "diancan" : MessageLookupByLibrary.simpleMessage("點餐"),
+    "dianhua" : MessageLookupByLibrary.simpleMessage("電話"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"),
     "dingdan" : MessageLookupByLibrary.simpleMessage("訂單"),
@@ -146,6 +152,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanyiwancheng" : MessageLookupByLibrary.simpleMessage("訂單已完成"),
     "dingdanyizhifu" : MessageLookupByLibrary.simpleMessage("訂單已支付"),
     "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
+    "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
     "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
     "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
     "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@@ -245,6 +252,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即參加"),
     "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
     "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即簽到"),
+    "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即體驗"),
     "lingqu" : MessageLookupByLibrary.simpleMessage("領取"),
     "lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("領券中心"),
     "lingquchenggong" : MessageLookupByLibrary.simpleMessage("領取成功"),
@@ -265,6 +273,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("沒有更多數據了"),
     "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
     "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
+    "menpaihao" : MessageLookupByLibrary.simpleMessage("請輸入門牌號"),
     "mi" : m16,
     "mingxi" : MessageLookupByLibrary.simpleMessage("明細"),
     "morenpaixu" : MessageLookupByLibrary.simpleMessage("默認排序"),
@@ -301,6 +310,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("請輸入手機號碼"),
     "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"),
     "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("請輸入支付密碼"),
+    "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("請填寫收件人手機號"),
+    "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("請填寫收件人姓名"),
     "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青銅會員"),
     "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("請選擇使用門店"),
     "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("請選擇收貨地址"),
@@ -369,7 +380,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "shiyongriqi" : MessageLookupByLibrary.simpleMessage("使用日期"),
     "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"),
     "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"),
-    "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("收貨地址"),
+    "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("請輸入詳細收貨地址"),
+    "shouhuorenshoujihao" : MessageLookupByLibrary.simpleMessage("請輸入收貨人手機號"),
+    "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人詳細地址"),
+    "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("請輸入收貨人姓名"),
     "shoujihao" : MessageLookupByLibrary.simpleMessage("手機號"),
     "shouye" : MessageLookupByLibrary.simpleMessage("首頁"),
     "shuaxin" : MessageLookupByLibrary.simpleMessage("刷新"),
@@ -377,6 +391,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuaxinshibai" : MessageLookupByLibrary.simpleMessage("刷新失敗"),
     "shuaxinyue" : MessageLookupByLibrary.simpleMessage("刷新餘額"),
     "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
+    "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人地址"),
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"),
     "sui" : m24,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"),
@@ -397,6 +412,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日資訊後自動生成 "),
     "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日資訊得專屬優惠劵 "),
     "weidenglu" : MessageLookupByLibrary.simpleMessage("未登錄"),
+    "weidengluxinxi" : MessageLookupByLibrary.simpleMessage("點擊登錄，享受更多精彩資訊"),
     "weihexiao" : MessageLookupByLibrary.simpleMessage("未核銷"),
     "weikaiqi" : MessageLookupByLibrary.simpleMessage("未開啓"),
     "weilegeiningenghaodefuwu" : MessageLookupByLibrary.simpleMessage("為了給您提供更好的服務，以及享受更加精彩的信息內容，請在使用使用期間登錄"),
@@ -420,6 +436,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiangji" : MessageLookupByLibrary.simpleMessage("相機"),
     "xiangjitishixinxi" : MessageLookupByLibrary.simpleMessage("為了您可以在使用過程中進行分享，希望您使用HISAPP時讓我們使用相機功能 "),
     "xiangqing" : MessageLookupByLibrary.simpleMessage("詳情"),
+    "xiangxidizhi" : MessageLookupByLibrary.simpleMessage("詳細地址"),
     "xianshangfafang" : MessageLookupByLibrary.simpleMessage("綫上發放"),
     "xianxiashiyong" : MessageLookupByLibrary.simpleMessage("線下使用"),
     "xiaofei" : MessageLookupByLibrary.simpleMessage("消費"),
@@ -428,8 +445,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"),
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"),
+    "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系統通知"),
     "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系統消息"),
+    "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"),
     "yiduihuanjian" : m27,
@@ -437,6 +456,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"),
     "yilingqu" : MessageLookupByLibrary.simpleMessage("已領取"),
+    "yindao1" : MessageLookupByLibrary.simpleMessage("新增多項功能，海量優惠資訊實時推送"),
+    "yindao2" : MessageLookupByLibrary.simpleMessage("新增多項功能，使用平臺錢包優惠多多，更有充值優惠享不停"),
+    "yindao3" : MessageLookupByLibrary.simpleMessage("新增會員任務得積分，消費可得綠金、積分商城換購"),
+    "yindao4" : MessageLookupByLibrary.simpleMessage("傳遞友愛純淨健康有機環保智慧理念"),
+    "yindaoye1" : MessageLookupByLibrary.simpleMessage("會員最新資訊搶先看"),
+    "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集團聯盟店會員點餐"),
+    "yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"),
+    "yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
     "yingyeshijian" : m28,
     "yinshi" : MessageLookupByLibrary.simpleMessage("飲食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"),

lib/generated/intl/messages_zh_TW.dart

@@ -94,7 +94,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "banben" : m0,
     "bangong" : MessageLookupByLibrary.simpleMessage("辦公"),
     "bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("幫助與反饋"),
+    "baocun" : MessageLookupByLibrary.simpleMessage("保存"),
+    "baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
     "beizhu" : MessageLookupByLibrary.simpleMessage("備注"),
+    "bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"),
     "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("標為已讀"),
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("撥打電話"),
     "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回鄉"),
@@ -108,6 +111,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "changjianwenti" : MessageLookupByLibrary.simpleMessage("常見問題"),
     "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("創始人故事"),
     "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("成功登录注册，并绑定相关信息即可成为会员。"),
+    "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市選擇"),
     "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成為專屬會員，享專屬權益"),
     "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
     "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
@@ -127,12 +131,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打開定位"),
     "dangqianbanben" : MessageLookupByLibrary.simpleMessage("當前版本"),
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("當前等級"),
+    "dangqianjifen" : MessageLookupByLibrary.simpleMessage("當前積分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("當前商品兌換核銷碼已核銷完成 "),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等級"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家確認"),
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用戶取餐"),
     "denglu" : MessageLookupByLibrary.simpleMessage("登錄"),
     "diancan" : MessageLookupByLibrary.simpleMessage("點餐"),
+    "dianhua" : MessageLookupByLibrary.simpleMessage("電話"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"),
     "dingdan" : MessageLookupByLibrary.simpleMessage("訂單"),
@@ -146,6 +152,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanyiwancheng" : MessageLookupByLibrary.simpleMessage("訂單已完成"),
     "dingdanyizhifu" : MessageLookupByLibrary.simpleMessage("訂單已支付"),
     "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
+    "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
     "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
     "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
     "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@@ -245,6 +252,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即參加"),
     "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
     "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即簽到"),
+    "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即體驗"),
     "lingqu" : MessageLookupByLibrary.simpleMessage("領取"),
     "lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("領券中心"),
     "lingquchenggong" : MessageLookupByLibrary.simpleMessage("領取成功"),
@@ -265,6 +273,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("沒有更多數據了"),
     "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
     "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
+    "menpaihao" : MessageLookupByLibrary.simpleMessage("請輸入門牌號"),
     "mi" : m16,
     "mingxi" : MessageLookupByLibrary.simpleMessage("明細"),
     "morenpaixu" : MessageLookupByLibrary.simpleMessage("默認排序"),
@@ -301,6 +310,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("請輸入手機號碼"),
     "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"),
     "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("請輸入支付密碼"),
+    "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("請填寫收件人手機號"),
+    "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("請填寫收件人姓名"),
     "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("青銅會員"),
     "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("請選擇使用門店"),
     "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("請選擇收貨地址"),
@@ -369,7 +380,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "shiyongriqi" : MessageLookupByLibrary.simpleMessage("使用日期"),
     "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("使用说明"),
     "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("使用条件"),
-    "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("收貨地址"),
+    "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("請輸入詳細收貨地址"),
+    "shouhuorenshoujihao" : MessageLookupByLibrary.simpleMessage("請輸入收貨人手機號"),
+    "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人詳細地址"),
+    "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("請輸入收貨人姓名"),
     "shoujihao" : MessageLookupByLibrary.simpleMessage("手機號"),
     "shouye" : MessageLookupByLibrary.simpleMessage("首頁"),
     "shuaxin" : MessageLookupByLibrary.simpleMessage("刷新"),
@@ -377,6 +391,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuaxinshibai" : MessageLookupByLibrary.simpleMessage("刷新失敗"),
     "shuaxinyue" : MessageLookupByLibrary.simpleMessage("刷新餘額"),
     "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
+    "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人地址"),
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"),
     "sui" : m24,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"),
@@ -397,6 +412,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日資訊後自動生成 "),
     "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日資訊得專屬優惠劵 "),
     "weidenglu" : MessageLookupByLibrary.simpleMessage("未登錄"),
+    "weidengluxinxi" : MessageLookupByLibrary.simpleMessage("點擊登錄，享受更多精彩資訊"),
     "weihexiao" : MessageLookupByLibrary.simpleMessage("未核銷"),
     "weikaiqi" : MessageLookupByLibrary.simpleMessage("未開啓"),
     "weilegeiningenghaodefuwu" : MessageLookupByLibrary.simpleMessage("為了給您提供更好的服務，以及享受更加精彩的信息內容，請在使用使用期間登錄"),
@@ -420,6 +436,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiangji" : MessageLookupByLibrary.simpleMessage("相機"),
     "xiangjitishixinxi" : MessageLookupByLibrary.simpleMessage("為了您可以在使用過程中進行分享，希望您使用HISAPP時讓我們使用相機功能 "),
     "xiangqing" : MessageLookupByLibrary.simpleMessage("詳情"),
+    "xiangxidizhi" : MessageLookupByLibrary.simpleMessage("詳細地址"),
     "xianshangfafang" : MessageLookupByLibrary.simpleMessage("綫上發放"),
     "xianxiashiyong" : MessageLookupByLibrary.simpleMessage("線下使用"),
     "xiaofei" : MessageLookupByLibrary.simpleMessage("消費"),
@@ -428,8 +445,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"),
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"),
+    "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系統通知"),
     "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系統消息"),
+    "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"),
     "yiduihuanjian" : m27,
@@ -437,6 +456,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"),
     "yilingqu" : MessageLookupByLibrary.simpleMessage("已領取"),
+    "yindao1" : MessageLookupByLibrary.simpleMessage("新增多項功能，海量優惠資訊實時推送"),
+    "yindao2" : MessageLookupByLibrary.simpleMessage("新增多項功能，使用平臺錢包優惠多多，更有充值優惠享不停"),
+    "yindao3" : MessageLookupByLibrary.simpleMessage("新增會員任務得積分，消費可得綠金、積分商城換購"),
+    "yindao4" : MessageLookupByLibrary.simpleMessage("傳遞友愛純淨健康有機環保智慧理念"),
+    "yindaoye1" : MessageLookupByLibrary.simpleMessage("會員最新資訊搶先看"),
+    "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集團聯盟店會員點餐"),
+    "yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"),
+    "yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
     "yingyeshijian" : m28,
     "yinshi" : MessageLookupByLibrary.simpleMessage("飲食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"),

lib/home/home_page.dart

@@ -229,8 +229,8 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
                 text: S.of(context).pinpaijieshao,
                 imgPath: "assets/image/icon_brand_introduction.png",
               ),
-              // brands(),
+              brands(),
-              ban(),
+              // ban(),
               Container(
                 margin:
                     EdgeInsets.only(left: 16.5.w, right: 16.5.w, bottom: 40.h,top: 20.h),
@@ -466,7 +466,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
         //垂直子Widget之间间距
         mainAxisSpacing: 16,
         //子Widget宽高比例
-        childAspectRatio: 1 - (AppUtils.textScale(context) - 1) / 2,
+        childAspectRatio: 1 - (AppUtils.textScale(context) - 1),
       ),
       itemBuilder: (contetx, index) {
         return GestureDetector(
@@ -488,12 +488,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
           MImage(
             goods.mainImgPath,
             aspectRatio: 5 / 3,
-            radius: BorderRadius.only(
+            radius: BorderRadius.circular(4),
-              topLeft: Radius.circular(4),
-              topRight: Radius.circular(4),
-              bottomRight: Radius.circular(4),
-              bottomLeft: Radius.circular(4),
-            ),
             fit: BoxFit.cover,
             errorSrc: "assets/image/default_1.png",
             fadeSrc: "assets/image/default_1.png",
@@ -610,61 +605,18 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
     );
   }
 
-  // brands() {
+  brands() {
-  //   return Container(
-  //     height: 90.h,
-  //     margin: EdgeInsets.only(bottom: 18.h),
-  //     child: ListView.builder(
-  //       padding: EdgeInsets.only(left: 10.w, right: 10.w),
-  //       scrollDirection: Axis.horizontal,
-  //       physics: BouncingScrollPhysics(),
-  //       itemBuilder: (context, position) {
-  //         return Container(
-  //           height: 60.h,
-  //           width: 120.w,
-  //           margin: EdgeInsets.symmetric(horizontal: 3.w, vertical: 15.h),
-  //           decoration: BoxDecoration(
-  //             color: Colors.white,
-  //             boxShadow: [
-  //               BoxShadow(
-  //                 color: Colors.black.withAlpha(37),
-  //                 offset: Offset(0, 2),
-  //                 blurRadius: 5,
-  //                 spreadRadius: 0,
-  //               )
-  //             ],
-  //             borderRadius: BorderRadius.circular(8),
-  //           ),
-  //           child: MImage(
-  //             brandData != null ? brandData[position].image : "",
-  //             radius: BorderRadius.circular(8),
-  //             fit: BoxFit.cover,
-  //             errorSrc: "assets/image/default_2_1.png",
-  //             fadeSrc: "assets/image/default_2_1.png",
-  //           ),
-  //         );
-  //       },
-  //       itemCount:
-  //           (brandData != null && brandData.length > 0) ? brandData.length : 0,
-  //     ),
-  //   );
-  // }
-
-  ban() {
     return Container(
-      // height: 90.h,
+      height: 90.h,
       margin: EdgeInsets.only(bottom: 18.h),
-      child: AspectRatio(
+      child: ListView.builder(
-        aspectRatio:4/1,
+        padding: EdgeInsets.only(left: 10.w, right: 10.w),
-        child: Swiper(
+        scrollDirection: Axis.horizontal,
-            viewportFraction: 0.5,
+        physics: BouncingScrollPhysics(),
-            scale: 0.5,
-            // loop: false,
-            // scrollDirection: Axis.horizontal,
         itemBuilder: (context, position) {
           return Container(
-                height: 50.h,
+            height: 60.h,
-                width: 106.w,
+            width: 120.w,
             margin: EdgeInsets.symmetric(horizontal: 3.w, vertical: 15.h),
             decoration: BoxDecoration(
               color: Colors.white,
@@ -687,11 +639,54 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
             ),
           );
         },
-            itemCount: bannerData != null ? bannerData.length : 0),
+        itemCount:
+            (brandData != null && brandData.length > 0) ? brandData.length : 0,
       ),
     );
   }
 
+  // ban() {
+  //   return Container(
+  //     // height: 90.h,
+  //     margin: EdgeInsets.only(bottom: 18.h),
+  //     child: AspectRatio(
+  //       aspectRatio:4/1,
+  //       child: Swiper(
+  //           viewportFraction: 0.5,
+  //           scale: 0.5,
+  //           // loop: false,
+  //           // scrollDirection: Axis.horizontal,
+  //           itemBuilder: (context, position) {
+  //             return Container(
+  //               height: 50.h,
+  //               width: 106.w,
+  //               margin: EdgeInsets.symmetric(horizontal: 3.w, vertical: 15.h),
+  //               decoration: BoxDecoration(
+  //                 color: Colors.white,
+  //                 boxShadow: [
+  //                   BoxShadow(
+  //                     color: Colors.black.withAlpha(37),
+  //                     offset: Offset(0, 2),
+  //                     blurRadius: 5,
+  //                     spreadRadius: 0,
+  //                   )
+  //                 ],
+  //                 borderRadius: BorderRadius.circular(8),
+  //               ),
+  //               child: MImage(
+  //                 brandData != null ? brandData[position].image : "",
+  //                 radius: BorderRadius.circular(8),
+  //                 fit: BoxFit.cover,
+  //                 errorSrc: "assets/image/default_2_1.png",
+  //                 fadeSrc: "assets/image/default_2_1.png",
+  //               ),
+  //             );
+  //           },
+  //           itemCount: bannerData != null ? bannerData.length : 0),
+  //     ),
+  //   );
+  // }
+
   banner() {
     return Container(
       child: AspectRatio(

lib/view_widget/mine_vip_view.dart

@@ -94,7 +94,7 @@ class MineVipView extends StatelessWidget {
         }
     }
     return AspectRatio(
-      aspectRatio: 1.8,
+      aspectRatio: 1.7,
       child: Container(
         margin: EdgeInsets.fromLTRB(padding.w, 16.h, padding.w, 8.h),
         decoration: BoxDecoration(
@@ -180,7 +180,7 @@ class MineVipView extends StatelessWidget {
                       Expanded(
                         child: Text(
                           rank > rankMax
-                              ? "当前积分:"
+                              ? S.of(context).dangqianjifen
                               : "${S.of(context).jifen_(rankMax - rank)} ${S.of(context).daoxiayidengji}",
                           overflow: TextOverflow.ellipsis,
                           style: TextStyle(