diff --git a/android/app/src/main/res/xml/provider_paths.xml b/android/app/src/main/res/xml/provider_paths.xml
new file mode 100644
index 00000000..928e0ecc
--- /dev/null
+++ b/android/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--自定义配置分享文件目录访问权限-->
+    <external-path name="sample-external-path" path="/"/>
+    <files-path name="sample-files-path" path="/"/>
+</paths>
\ No newline at end of file
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
index c29566bb..d6125d48 100644
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@@ -25,75 +25,77 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static m2(time) => "创建时间${time}";
 
-  static m3(shijian) => "发行开始时间 ${shijian}";
+  static m3(xihuan) => "点赞喜欢${xihuan}";
 
-  static m4(ge) => "${ge}g/个";
+  static m4(shijian) => "发行开始时间 ${shijian}";
 
-  static m5(jian) => "共${jian}件";
+  static m5(ge) => "${ge}g/个";
 
-  static m6(jian) => "共${jian}件商品";
+  static m6(jian) => "共${jian}件";
 
-  static m7(km) => "${km}公里";
+  static m7(jian) => "共${jian}件商品";
 
-  static m8(huifu) => "回复@${huifu}:";
+  static m8(km) => "${km}公里";
 
-  static m9(yuan) => "活动减免${yuan}元配送费";
+  static m9(huifu) => "回复@${huifu}:";
 
-  static m10(jifen) => "+ ${jifen} 积分";
+  static m10(yuan) => "活动减免${yuan}元配送费";
 
-  static m11(jianjie) => "简介:${jianjie}";
+  static m11(jifen) => "+ ${jifen} 积分";
 
-  static m12(jifen) => "${jifen}积分";
+  static m12(jianjie) => "简介:${jianjie}";
 
-  static m13(jifen) => "${jifen}积分 到下一个等级";
+  static m13(jifen) => "${jifen}积分";
 
-  static m14(date) => "开通日期:${date}";
+  static m14(jifen) => "${jifen}积分 到下一个等级";
 
-  static m15(shijian) => "领取时间 ${shijian}";
+  static m15(date) => "开通日期:${date}";
 
-  static m16(man, jian) => "满${man}元立减${jian}元代金券";
+  static m16(shijian) => "领取时间 ${shijian}";
 
-  static m17(yuan) => "满${yuan}可用";
+  static m17(man, jian) => "满${man}元立减${jian}元代金券";
 
-  static m18(mi) => "${mi}米";
+  static m18(yuan) => "满${yuan}可用";
 
-  static m19(tian) => "您已连续签到${tian}天";
+  static m19(mi) => "${mi}米";
 
-  static m20(pinglun) => "评论(${pinglun})";
+  static m20(tian) => "您已连续签到${tian}天";
 
-  static m21(zhe) => "全场${zhe}折";
+  static m21(pinglun) => "评论(${pinglun})";
 
-  static m22(num) => "取单号${num}";
+  static m22(zhe) => "全场${zhe}折";
 
-  static m23(ren) => "¥${ren}/人";
+  static m23(num) => "取单号${num}";
 
-  static m24(second) => "${second}s后重新发送";
+  static m24(ren) => "¥${ren}/人";
 
-  static m25(jifen) => "商品积分 ${jifen}积分";
+  static m25(second) => "${second}s后重新发送";
 
-  static m26(jifen) => "实付积分 ${jifen}积分";
+  static m26(jifen) => "商品积分 ${jifen}积分";
 
-  static m27(sui) => "${sui}岁";
+  static m27(jifen) => "实付积分 ${jifen}积分";
 
-  static m28(num) => "完成${num}";
+  static m28(sui) => "${sui}岁";
 
-  static m29(time) => "下单时间:${time}";
+  static m29(num) => "完成${num}";
 
-  static m30(xihuan) => "喜欢(${xihuan})";
+  static m30(time) => "下单时间:${time}";
 
-  static m31(jian) => "已兑换${jian}件";
+  static m31(xihuan) => "喜欢(${xihuan})";
 
-  static m32(time) => "营业时间: ${time}";
+  static m32(jian) => "已兑换${jian}件";
 
-  static m33(date) => "有效期:${date}";
+  static m33(time) => "营业时间: ${time}";
 
-  static m34(date) => "有效期至${date}";
+  static m34(date) => "有效期:${date}";
 
-  static m35(yuan) => "${yuan}元";
+  static m35(date) => "有效期至${date}";
 
-  static m36(yue) => "余额${yue}";
+  static m36(yuan) => "${yuan}元";
 
-  static m37(zuozhe) => "作者:${zuozhe}";
+  static m37(yue) => "余额${yue}";
+
+  static m38(zuozhe) => "作者:${zuozhe}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static _notInlinedMessages(_) => <String, Function> {
@@ -143,6 +145,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
     "dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"),
+    "daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到评论列表顶部"),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"),
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用户取餐"),
@@ -151,6 +154,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
+    "dianzanxihuan_" : m3,
     "dingdan" : MessageLookupByLibrary.simpleMessage("订单"),
     "dingdandaifahuo" : MessageLookupByLibrary.simpleMessage("订单待发货"),
     "dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"),
@@ -182,20 +186,20 @@ class MessageLookup extends MessageLookupByLibrary {
     "fapiao" : MessageLookupByLibrary.simpleMessage("发票"),
     "fapiaozhushou" : MessageLookupByLibrary.simpleMessage("发票助手"),
     "fasong" : MessageLookupByLibrary.simpleMessage("发送"),
-    "faxingshijian" : m3,
+    "faxingshijian" : m4,
     "feishiwuduihuanma" : MessageLookupByLibrary.simpleMessage("非实物兑换吗"),
     "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非实物商品兑换后领取到卡包即可使用！"),
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
-    "ge" : m4,
+    "ge" : m5,
     "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"),
     "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
     "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"),
     "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"),
     "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"),
     "gong" : MessageLookupByLibrary.simpleMessage("共"),
-    "gongjijian" : m5,
-    "gongjijianshangpin" : m6,
-    "gongli" : m7,
+    "gongjijian" : m6,
+    "gongjijianshangpin" : m7,
+    "gongli" : m8,
     "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成为本店的会员，快去享受超多会员权益吧。"),
     "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"),
     "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"),
@@ -210,7 +214,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
     "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
     "huifu" : MessageLookupByLibrary.simpleMessage("回复"),
-    "huifu_" : m8,
+    "huifu_" : m9,
     "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
     "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
     "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
@@ -220,7 +224,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"),
     "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"),
     "huode" : MessageLookupByLibrary.simpleMessage("获得"),
-    "huodongjianmianpeisongfei" : m9,
+    "huodong" : MessageLookupByLibrary.simpleMessage("活动"),
+    "huodongjianmianpeisongfei" : m10,
     "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"),
     "huodongliebiao" : MessageLookupByLibrary.simpleMessage("活动列表"),
     "huodongzixun" : MessageLookupByLibrary.simpleMessage("活动资讯"),
@@ -229,16 +234,16 @@ class MessageLookup extends MessageLookupByLibrary {
     "input_code_hide" : MessageLookupByLibrary.simpleMessage("请输入验证码"),
     "input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"),
     "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"),
-    "jiajifen" : m10,
+    "jiajifen" : m11,
     "jian" : MessageLookupByLibrary.simpleMessage("件"),
-    "jianjie" : m11,
+    "jianjie" : m12,
     "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"),
     "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"),
     "jiesuanjine" : MessageLookupByLibrary.simpleMessage("结算金额"),
     "jifen" : MessageLookupByLibrary.simpleMessage("积分"),
-    "jifen_" : m12,
+    "jifen_" : m13,
     "jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的积分不足"),
-    "jifendaoxiayidengji" : m13,
+    "jifendaoxiayidengji" : m14,
     "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"),
     "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"),
     "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"),
@@ -255,7 +260,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jujue" : MessageLookupByLibrary.simpleMessage("拒绝"),
     "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
     "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
-    "kaitongriqi" : m14,
+    "kaitongriqi" : m15,
     "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
     "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"),
     "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"),
@@ -276,7 +281,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"),
     "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("领取到卡包"),
     "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"),
-    "lingqushijian" : m15,
+    "lingqushijian" : m16,
     "linian" : MessageLookupByLibrary.simpleMessage("理念"),
     "lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"),
     "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的评论吧"),
@@ -285,15 +290,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
     "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
     "main_menu3" : MessageLookupByLibrary.simpleMessage("我的"),
-    "manlijiandaijinquan" : m16,
-    "manyuankeyong" : m17,
+    "manlijiandaijinquan" : m17,
+    "manyuankeyong" : m18,
     "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"),
     "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"),
     "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"),
     "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
     "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
     "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"),
-    "mi" : m18,
+    "mi" : m19,
     "mingxi" : MessageLookupByLibrary.simpleMessage("明细"),
     "morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"),
     "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暂无星店活动"),
@@ -301,7 +306,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "nindingweigongnengweikaiqi" : MessageLookupByLibrary.simpleMessage("您定位功能开关未开启，请点击去打開定位"),
     "nindingweiquanxianweiyunxu" : MessageLookupByLibrary.simpleMessage("您未开启位置权限，请点击确定申请权限"),
     "ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登录，请点击去登录"),
-    "ninyilianxuqiandaotian" : m19,
+    "ninyilianxuqiandaotian" : m20,
     "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"),
     "ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"),
     "paizhao" : MessageLookupByLibrary.simpleMessage("拍照"),
@@ -311,7 +316,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "peisongfuwu" : MessageLookupByLibrary.simpleMessage("配送服务"),
     "peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"),
     "phone_error" : MessageLookupByLibrary.simpleMessage("手机格式错误"),
-    "pinglun_" : m20,
+    "pinglun" : MessageLookupByLibrary.simpleMessage("评论"),
+    "pinglun_" : m21,
     "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
     "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"),
     "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"),
@@ -349,12 +355,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"),
     "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兑换"),
     "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全场通用"),
-    "quanchangzhe" : m21,
+    "quanchangzhe" : m22,
     "quantian" : MessageLookupByLibrary.simpleMessage("全天"),
     "quanxian" : MessageLookupByLibrary.simpleMessage("权限"),
     "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"),
     "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"),
-    "qudanhao" : m22,
+    "qudanhao" : m23,
     "qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"),
     "queding" : MessageLookupByLibrary.simpleMessage("确定"),
     "queren" : MessageLookupByLibrary.simpleMessage("确认"),
@@ -374,9 +380,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"),
     "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("热门文章视频"),
     "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("热门文章视频列表"),
-    "ren" : m23,
+    "ren" : m24,
     "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"),
-    "resend_in_seconds" : m24,
+    "resend_in_seconds" : m25,
     "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
     "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"),
     "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"),
@@ -393,7 +399,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"),
     "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"),
     "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"),
-    "shangpinjifen" : m25,
+    "shangpinjifen" : m26,
     "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"),
     "shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等级"),
     "shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娱乐"),
@@ -402,7 +408,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shezhi" : MessageLookupByLibrary.simpleMessage("设置"),
     "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"),
     "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"),
-    "shifujifen" : m26,
+    "shifujifen" : m27,
     "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"),
     "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
     "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@@ -425,7 +431,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
     "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"),
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
-    "sui" : m27,
+    "sui" : m28,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
     "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
     "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"),
@@ -439,7 +445,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "waimai" : MessageLookupByLibrary.simpleMessage("外卖"),
     "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
     "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
-    "wancheng_" : m28,
+    "wancheng_" : m29,
     "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),
     "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"),
     "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"),
@@ -453,6 +459,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "weixinzhifu" : MessageLookupByLibrary.simpleMessage("微信支付"),
     "weizhitishixinxi" : MessageLookupByLibrary.simpleMessage("为了向您推荐附近的门店信息，推荐您在使用HISAPP时让我们使用位置信息"),
     "wentijian" : MessageLookupByLibrary.simpleMessage("问题件"),
+    "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章详情"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未领取"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的会员等级"),
@@ -466,7 +473,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
     "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"),
     "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"),
-    "xiadanshijian_" : m29,
+    "xiadanshijian_" : m30,
     "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
     "xiangce" : MessageLookupByLibrary.simpleMessage("相册"),
     "xiangji" : MessageLookupByLibrary.simpleMessage("相机"),
@@ -479,8 +486,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
     "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
+    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("下载完成"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
-    "xihuan_" : m30,
+    "xihuan_" : m31,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
     "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
@@ -488,7 +496,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
-    "yiduihuanjian" : m31,
+    "yiduihuanjian" : m32,
     "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
@@ -501,7 +509,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"),
     "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"),
     "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
-    "yingyeshijian" : m32,
+    "yingyeshijian" : m33,
     "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隐私协议》"),
@@ -529,13 +537,13 @@ class MessageLookup extends MessageLookupByLibrary {
     "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"),
     "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"),
     "youkedenglu" : MessageLookupByLibrary.simpleMessage("游客登录"),
-    "youxiaoqi" : m33,
+    "youxiaoqi" : m34,
     "youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
-    "youxiaoqizhi" : m34,
+    "youxiaoqizhi" : m35,
     "yuan" : MessageLookupByLibrary.simpleMessage("元"),
-    "yuan_" : m35,
+    "yuan_" : m36,
     "yue" : MessageLookupByLibrary.simpleMessage("余额"),
-    "yue_" : m36,
+    "yue_" : m37,
     "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"),
     "yunfei" : MessageLookupByLibrary.simpleMessage("运费"),
     "yuyan" : MessageLookupByLibrary.simpleMessage("语言"),
@@ -567,6 +575,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"),
     "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"),
     "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"),
-    "zuozhe" : m37
+    "zuozhe" : m38
   };
 }
diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart
index b739257a..f6b35b4e 100644
--- a/lib/generated/intl/messages_zh_CN.dart
+++ b/lib/generated/intl/messages_zh_CN.dart
@@ -25,75 +25,77 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static m2(time) => "创建时间${time}";
 
-  static m3(shijian) => "发行开始时间 ${shijian}";
+  static m3(xihuan) => "点赞喜欢${xihuan}";
 
-  static m4(ge) => "${ge}g/个";
+  static m4(shijian) => "发行开始时间 ${shijian}";
 
-  static m5(jian) => "共${jian}件";
+  static m5(ge) => "${ge}g/个";
 
-  static m6(jian) => "共${jian}件商品";
+  static m6(jian) => "共${jian}件";
 
-  static m7(km) => "${km}公里";
+  static m7(jian) => "共${jian}件商品";
 
-  static m8(huifu) => "回复@${huifu}:";
+  static m8(km) => "${km}公里";
 
-  static m9(yuan) => "活动减免${yuan}元配送费";
+  static m9(huifu) => "回复@${huifu}:";
 
-  static m10(jifen) => "+ ${jifen} 积分";
+  static m10(yuan) => "活动减免${yuan}元配送费";
 
-  static m11(jianjie) => "简介:${jianjie}";
+  static m11(jifen) => "+ ${jifen} 积分";
 
-  static m12(jifen) => "${jifen}积分";
+  static m12(jianjie) => "简介:${jianjie}";
 
-  static m13(jifen) => "${jifen}积分 到下一个等级";
+  static m13(jifen) => "${jifen}积分";
 
-  static m14(date) => "开通日期:${date}";
+  static m14(jifen) => "${jifen}积分 到下一个等级";
 
-  static m15(shijian) => "领取时间 ${shijian}";
+  static m15(date) => "开通日期:${date}";
 
-  static m16(man, jian) => "满${man}元立减${jian}元代金券";
+  static m16(shijian) => "领取时间 ${shijian}";
 
-  static m17(yuan) => "满${yuan}可用";
+  static m17(man, jian) => "满${man}元立减${jian}元代金券";
 
-  static m18(mi) => "${mi}米";
+  static m18(yuan) => "满${yuan}可用";
 
-  static m19(tian) => "您已连续签到${tian}天";
+  static m19(mi) => "${mi}米";
 
-  static m20(pinglun) => "评论(${pinglun})";
+  static m20(tian) => "您已连续签到${tian}天";
 
-  static m21(zhe) => "全场${zhe}折";
+  static m21(pinglun) => "评论(${pinglun})";
 
-  static m22(num) => "取单号${num}";
+  static m22(zhe) => "全场${zhe}折";
 
-  static m23(ren) => "¥${ren}/人";
+  static m23(num) => "取单号${num}";
 
-  static m24(second) => "${second}s后重新发送";
+  static m24(ren) => "¥${ren}/人";
 
-  static m25(jifen) => "商品积分 ${jifen}积分";
+  static m25(second) => "${second}s后重新发送";
 
-  static m26(jifen) => "实付积分 ${jifen}积分";
+  static m26(jifen) => "商品积分 ${jifen}积分";
 
-  static m27(sui) => "${sui}岁";
+  static m27(jifen) => "实付积分 ${jifen}积分";
 
-  static m28(num) => "完成${num}";
+  static m28(sui) => "${sui}岁";
 
-  static m29(time) => "下单时间:${time}";
+  static m29(num) => "完成${num}";
 
-  static m30(xihuan) => "喜欢(${xihuan})";
+  static m30(time) => "下单时间:${time}";
 
-  static m31(jian) => "已兑换${jian}件";
+  static m31(xihuan) => "喜欢(${xihuan})";
 
-  static m32(time) => "营业时间: ${time}";
+  static m32(jian) => "已兑换${jian}件";
 
-  static m33(date) => "有效期:${date}";
+  static m33(time) => "营业时间: ${time}";
 
-  static m34(date) => "有效期至${date}";
+  static m34(date) => "有效期:${date}";
 
-  static m35(yuan) => "${yuan}元";
+  static m35(date) => "有效期至${date}";
 
-  static m36(yue) => "余额${yue}";
+  static m36(yuan) => "${yuan}元";
 
-  static m37(zuozhe) => "作者:${zuozhe}";
+  static m37(yue) => "余额${yue}";
+
+  static m38(zuozhe) => "作者:${zuozhe}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static _notInlinedMessages(_) => <String, Function> {
@@ -143,6 +145,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
     "dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"),
+    "daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到评论列表顶部"),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"),
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用户取餐"),
@@ -151,6 +154,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
+    "dianzanxihuan_" : m3,
     "dingdan" : MessageLookupByLibrary.simpleMessage("订单"),
     "dingdandaifahuo" : MessageLookupByLibrary.simpleMessage("订单待发货"),
     "dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"),
@@ -182,20 +186,20 @@ class MessageLookup extends MessageLookupByLibrary {
     "fapiao" : MessageLookupByLibrary.simpleMessage("发票"),
     "fapiaozhushou" : MessageLookupByLibrary.simpleMessage("发票助手"),
     "fasong" : MessageLookupByLibrary.simpleMessage("发送"),
-    "faxingshijian" : m3,
+    "faxingshijian" : m4,
     "feishiwuduihuanma" : MessageLookupByLibrary.simpleMessage("非实物兑换吗"),
     "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非实物商品兑换后领取到卡包即可使用！"),
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
-    "ge" : m4,
+    "ge" : m5,
     "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"),
     "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
     "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"),
     "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"),
     "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"),
     "gong" : MessageLookupByLibrary.simpleMessage("共"),
-    "gongjijian" : m5,
-    "gongjijianshangpin" : m6,
-    "gongli" : m7,
+    "gongjijian" : m6,
+    "gongjijianshangpin" : m7,
+    "gongli" : m8,
     "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成为本店的会员，快去享受超多会员权益吧。"),
     "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"),
     "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"),
@@ -209,7 +213,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
     "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
     "huifu" : MessageLookupByLibrary.simpleMessage("回复"),
-    "huifu_" : m8,
+    "huifu_" : m9,
     "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
     "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
     "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
@@ -219,7 +223,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"),
     "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"),
     "huode" : MessageLookupByLibrary.simpleMessage("获得"),
-    "huodongjianmianpeisongfei" : m9,
+    "huodong" : MessageLookupByLibrary.simpleMessage("活动"),
+    "huodongjianmianpeisongfei" : m10,
     "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"),
     "huodongliebiao" : MessageLookupByLibrary.simpleMessage("活动列表"),
     "huodongzixun" : MessageLookupByLibrary.simpleMessage("活动资讯"),
@@ -228,16 +233,16 @@ class MessageLookup extends MessageLookupByLibrary {
     "input_code_hide" : MessageLookupByLibrary.simpleMessage("请输入验证码"),
     "input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"),
     "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"),
-    "jiajifen" : m10,
+    "jiajifen" : m11,
     "jian" : MessageLookupByLibrary.simpleMessage("件"),
-    "jianjie" : m11,
+    "jianjie" : m12,
     "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"),
     "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"),
     "jiesuanjine" : MessageLookupByLibrary.simpleMessage("结算金额"),
     "jifen" : MessageLookupByLibrary.simpleMessage("积分"),
-    "jifen_" : m12,
+    "jifen_" : m13,
     "jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的积分不足"),
-    "jifendaoxiayidengji" : m13,
+    "jifendaoxiayidengji" : m14,
     "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"),
     "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"),
     "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"),
@@ -254,7 +259,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jujue" : MessageLookupByLibrary.simpleMessage("拒绝"),
     "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
     "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
-    "kaitongriqi" : m14,
+    "kaitongriqi" : m15,
     "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
     "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"),
     "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"),
@@ -275,7 +280,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"),
     "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("领取到卡包"),
     "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"),
-    "lingqushijian" : m15,
+    "lingqushijian" : m16,
     "linian" : MessageLookupByLibrary.simpleMessage("理念"),
     "lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"),
     "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的评论吧"),
@@ -284,15 +289,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
     "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
     "main_menu3" : MessageLookupByLibrary.simpleMessage("我的"),
-    "manlijiandaijinquan" : m16,
-    "manyuankeyong" : m17,
+    "manlijiandaijinquan" : m17,
+    "manyuankeyong" : m18,
     "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"),
     "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"),
     "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"),
     "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
     "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
     "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"),
-    "mi" : m18,
+    "mi" : m19,
     "mingxi" : MessageLookupByLibrary.simpleMessage("明细"),
     "morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"),
     "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暂无星店活动"),
@@ -300,7 +305,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "nindingweigongnengweikaiqi" : MessageLookupByLibrary.simpleMessage("您定位功能开关未开启，请点击去打開定位"),
     "nindingweiquanxianweiyunxu" : MessageLookupByLibrary.simpleMessage("您未开启位置权限，请点击确定申请权限"),
     "ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登录，请点击去登录"),
-    "ninyilianxuqiandaotian" : m19,
+    "ninyilianxuqiandaotian" : m20,
     "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"),
     "ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"),
     "paizhao" : MessageLookupByLibrary.simpleMessage("拍照"),
@@ -310,7 +315,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "peisongfuwu" : MessageLookupByLibrary.simpleMessage("配送服务"),
     "peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"),
     "phone_error" : MessageLookupByLibrary.simpleMessage("手机格式错误"),
-    "pinglun_" : m20,
+    "pinglun" : MessageLookupByLibrary.simpleMessage("评论"),
+    "pinglun_" : m21,
     "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
     "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"),
     "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"),
@@ -348,12 +354,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"),
     "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兑换"),
     "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全场通用"),
-    "quanchangzhe" : m21,
+    "quanchangzhe" : m22,
     "quantian" : MessageLookupByLibrary.simpleMessage("全天"),
     "quanxian" : MessageLookupByLibrary.simpleMessage("权限"),
     "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"),
     "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"),
-    "qudanhao" : m22,
+    "qudanhao" : m23,
     "qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"),
     "queding" : MessageLookupByLibrary.simpleMessage("确定"),
     "queren" : MessageLookupByLibrary.simpleMessage("确认"),
@@ -373,9 +379,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"),
     "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("热门文章视频"),
     "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("热门文章视频列表"),
-    "ren" : m23,
+    "ren" : m24,
     "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"),
-    "resend_in_seconds" : m24,
+    "resend_in_seconds" : m25,
     "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
     "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"),
     "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"),
@@ -392,7 +398,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"),
     "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"),
     "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"),
-    "shangpinjifen" : m25,
+    "shangpinjifen" : m26,
     "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"),
     "shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等级"),
     "shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娱乐"),
@@ -401,7 +407,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shezhi" : MessageLookupByLibrary.simpleMessage("设置"),
     "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"),
     "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"),
-    "shifujifen" : m26,
+    "shifujifen" : m27,
     "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"),
     "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
     "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@@ -424,7 +430,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
     "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"),
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
-    "sui" : m27,
+    "sui" : m28,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
     "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
     "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"),
@@ -438,7 +444,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "waimai" : MessageLookupByLibrary.simpleMessage("外卖"),
     "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
     "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
-    "wancheng_" : m28,
+    "wancheng_" : m29,
     "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),
     "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"),
     "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"),
@@ -452,6 +458,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "weixinzhifu" : MessageLookupByLibrary.simpleMessage("微信支付"),
     "weizhitishixinxi" : MessageLookupByLibrary.simpleMessage("为了向您推荐附近的门店信息，推荐您在使用HISAPP时让我们使用位置信息"),
     "wentijian" : MessageLookupByLibrary.simpleMessage("问题件"),
+    "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章详情"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未领取"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的会员等级"),
@@ -465,7 +472,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
     "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"),
     "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"),
-    "xiadanshijian_" : m29,
+    "xiadanshijian_" : m30,
     "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
     "xiangce" : MessageLookupByLibrary.simpleMessage("相册"),
     "xiangji" : MessageLookupByLibrary.simpleMessage("相机"),
@@ -478,8 +485,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
     "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
+    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("下载完成"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
-    "xihuan_" : m30,
+    "xihuan_" : m31,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
     "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
@@ -487,7 +495,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
-    "yiduihuanjian" : m31,
+    "yiduihuanjian" : m32,
     "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
@@ -500,7 +508,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"),
     "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"),
     "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
-    "yingyeshijian" : m32,
+    "yingyeshijian" : m33,
     "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隐私协议》"),
@@ -528,13 +536,13 @@ class MessageLookup extends MessageLookupByLibrary {
     "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"),
     "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"),
     "youkedenglu" : MessageLookupByLibrary.simpleMessage("游客登录"),
-    "youxiaoqi" : m33,
+    "youxiaoqi" : m34,
     "youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
-    "youxiaoqizhi" : m34,
+    "youxiaoqizhi" : m35,
     "yuan" : MessageLookupByLibrary.simpleMessage("元"),
-    "yuan_" : m35,
+    "yuan_" : m36,
     "yue" : MessageLookupByLibrary.simpleMessage("余额"),
-    "yue_" : m36,
+    "yue_" : m37,
     "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"),
     "yunfei" : MessageLookupByLibrary.simpleMessage("运费"),
     "yuyan" : MessageLookupByLibrary.simpleMessage("语言"),
@@ -565,6 +573,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"),
     "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"),
     "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"),
-    "zuozhe" : m37
+    "zuozhe" : m38
   };
 }
diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart
index f81052a8..93c854ea 100644
--- a/lib/generated/intl/messages_zh_Hans_CN.dart
+++ b/lib/generated/intl/messages_zh_Hans_CN.dart
@@ -25,75 +25,77 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static m2(time) => "创建时间${time}";
 
-  static m3(shijian) => "发行开始时间 ${shijian}";
+  static m3(xihuan) => "点赞喜欢${xihuan}";
 
-  static m4(ge) => "${ge}g/个";
+  static m4(shijian) => "发行开始时间 ${shijian}";
 
-  static m5(jian) => "共${jian}件";
+  static m5(ge) => "${ge}g/个";
 
-  static m6(jian) => "共${jian}件商品";
+  static m6(jian) => "共${jian}件";
 
-  static m7(km) => "${km}公里";
+  static m7(jian) => "共${jian}件商品";
 
-  static m8(huifu) => "回复@${huifu}:";
+  static m8(km) => "${km}公里";
 
-  static m9(yuan) => "活动减免${yuan}元配送费";
+  static m9(huifu) => "回复@${huifu}:";
 
-  static m10(jifen) => "+ ${jifen} 积分";
+  static m10(yuan) => "活动减免${yuan}元配送费";
 
-  static m11(jianjie) => "简介:${jianjie}";
+  static m11(jifen) => "+ ${jifen} 积分";
 
-  static m12(jifen) => "${jifen}积分";
+  static m12(jianjie) => "简介:${jianjie}";
 
-  static m13(jifen) => "${jifen}积分 到下一个等级";
+  static m13(jifen) => "${jifen}积分";
 
-  static m14(date) => "开通日期:${date}";
+  static m14(jifen) => "${jifen}积分 到下一个等级";
 
-  static m15(shijian) => "领取时间 ${shijian}";
+  static m15(date) => "开通日期:${date}";
 
-  static m16(man, jian) => "满${man}元立减${jian}元代金券";
+  static m16(shijian) => "领取时间 ${shijian}";
 
-  static m17(yuan) => "满${yuan}可用";
+  static m17(man, jian) => "满${man}元立减${jian}元代金券";
 
-  static m18(mi) => "${mi}米";
+  static m18(yuan) => "满${yuan}可用";
 
-  static m19(tian) => "您已连续签到${tian}天";
+  static m19(mi) => "${mi}米";
 
-  static m20(pinglun) => "评论(${pinglun})";
+  static m20(tian) => "您已连续签到${tian}天";
 
-  static m21(zhe) => "全场${zhe}折";
+  static m21(pinglun) => "评论(${pinglun})";
 
-  static m22(num) => "取单号${num}";
+  static m22(zhe) => "全场${zhe}折";
 
-  static m23(ren) => "¥${ren}/人";
+  static m23(num) => "取单号${num}";
 
-  static m24(second) => "${second}s后重新发送";
+  static m24(ren) => "¥${ren}/人";
 
-  static m25(jifen) => "商品积分 ${jifen}积分";
+  static m25(second) => "${second}s后重新发送";
 
-  static m26(jifen) => "实付积分 ${jifen}积分";
+  static m26(jifen) => "商品积分 ${jifen}积分";
 
-  static m27(sui) => "${sui}岁";
+  static m27(jifen) => "实付积分 ${jifen}积分";
 
-  static m28(num) => "完成${num}";
+  static m28(sui) => "${sui}岁";
 
-  static m29(time) => "下单时间:${time}";
+  static m29(num) => "完成${num}";
 
-  static m30(xihuan) => "喜欢(${xihuan})";
+  static m30(time) => "下单时间:${time}";
 
-  static m31(jian) => "已兑换${jian}件";
+  static m31(xihuan) => "喜欢(${xihuan})";
 
-  static m32(time) => "营业时间: ${time}";
+  static m32(jian) => "已兑换${jian}件";
 
-  static m33(date) => "有效期:${date}";
+  static m33(time) => "营业时间: ${time}";
 
-  static m34(date) => "有效期至${date}";
+  static m34(date) => "有效期:${date}";
 
-  static m35(yuan) => "${yuan}元";
+  static m35(date) => "有效期至${date}";
 
-  static m36(yue) => "余额${yue}";
+  static m36(yuan) => "${yuan}元";
 
-  static m37(zuozhe) => "作者:${zuozhe}";
+  static m37(yue) => "余额${yue}";
+
+  static m38(zuozhe) => "作者:${zuozhe}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static _notInlinedMessages(_) => <String, Function> {
@@ -143,6 +145,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
     "dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"),
+    "daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到评论列表顶部"),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"),
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用户取餐"),
@@ -151,6 +154,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
+    "dianzanxihuan_" : m3,
     "dingdan" : MessageLookupByLibrary.simpleMessage("订单"),
     "dingdandaifahuo" : MessageLookupByLibrary.simpleMessage("订单待发货"),
     "dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"),
@@ -182,20 +186,20 @@ class MessageLookup extends MessageLookupByLibrary {
     "fapiao" : MessageLookupByLibrary.simpleMessage("发票"),
     "fapiaozhushou" : MessageLookupByLibrary.simpleMessage("发票助手"),
     "fasong" : MessageLookupByLibrary.simpleMessage("发送"),
-    "faxingshijian" : m3,
+    "faxingshijian" : m4,
     "feishiwuduihuanma" : MessageLookupByLibrary.simpleMessage("非实物兑换吗"),
     "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非实物商品兑换后领取到卡包即可使用！"),
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
-    "ge" : m4,
+    "ge" : m5,
     "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"),
     "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
     "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"),
     "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"),
     "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"),
     "gong" : MessageLookupByLibrary.simpleMessage("共"),
-    "gongjijian" : m5,
-    "gongjijianshangpin" : m6,
-    "gongli" : m7,
+    "gongjijian" : m6,
+    "gongjijianshangpin" : m7,
+    "gongli" : m8,
     "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成为本店的会员，快去享受超多会员权益吧。"),
     "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"),
     "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"),
@@ -209,7 +213,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
     "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
     "huifu" : MessageLookupByLibrary.simpleMessage("回复"),
-    "huifu_" : m8,
+    "huifu_" : m9,
     "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
     "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
     "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
@@ -219,7 +223,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"),
     "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"),
     "huode" : MessageLookupByLibrary.simpleMessage("获得"),
-    "huodongjianmianpeisongfei" : m9,
+    "huodong" : MessageLookupByLibrary.simpleMessage("活动"),
+    "huodongjianmianpeisongfei" : m10,
     "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"),
     "huodongliebiao" : MessageLookupByLibrary.simpleMessage("活动列表"),
     "huodongzixun" : MessageLookupByLibrary.simpleMessage("活动资讯"),
@@ -228,16 +233,16 @@ class MessageLookup extends MessageLookupByLibrary {
     "input_code_hide" : MessageLookupByLibrary.simpleMessage("请输入验证码"),
     "input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"),
     "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"),
-    "jiajifen" : m10,
+    "jiajifen" : m11,
     "jian" : MessageLookupByLibrary.simpleMessage("件"),
-    "jianjie" : m11,
+    "jianjie" : m12,
     "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"),
     "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"),
     "jiesuanjine" : MessageLookupByLibrary.simpleMessage("结算金额"),
     "jifen" : MessageLookupByLibrary.simpleMessage("积分"),
-    "jifen_" : m12,
+    "jifen_" : m13,
     "jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的积分不足"),
-    "jifendaoxiayidengji" : m13,
+    "jifendaoxiayidengji" : m14,
     "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"),
     "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"),
     "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"),
@@ -254,7 +259,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jujue" : MessageLookupByLibrary.simpleMessage("拒绝"),
     "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
     "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
-    "kaitongriqi" : m14,
+    "kaitongriqi" : m15,
     "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
     "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"),
     "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"),
@@ -275,7 +280,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"),
     "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("领取到卡包"),
     "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"),
-    "lingqushijian" : m15,
+    "lingqushijian" : m16,
     "linian" : MessageLookupByLibrary.simpleMessage("理念"),
     "lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"),
     "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的评论吧"),
@@ -284,15 +289,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
     "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
     "main_menu3" : MessageLookupByLibrary.simpleMessage("我的"),
-    "manlijiandaijinquan" : m16,
-    "manyuankeyong" : m17,
+    "manlijiandaijinquan" : m17,
+    "manyuankeyong" : m18,
     "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"),
     "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"),
     "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"),
     "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
     "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
     "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"),
-    "mi" : m18,
+    "mi" : m19,
     "mingxi" : MessageLookupByLibrary.simpleMessage("明细"),
     "morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"),
     "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暂无星店活动"),
@@ -300,7 +305,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "nindingweigongnengweikaiqi" : MessageLookupByLibrary.simpleMessage("您定位功能开关未开启，请点击去打開定位"),
     "nindingweiquanxianweiyunxu" : MessageLookupByLibrary.simpleMessage("您未开启位置权限，请点击确定申请权限"),
     "ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登录，请点击去登录"),
-    "ninyilianxuqiandaotian" : m19,
+    "ninyilianxuqiandaotian" : m20,
     "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"),
     "ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"),
     "paizhao" : MessageLookupByLibrary.simpleMessage("拍照"),
@@ -310,7 +315,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "peisongfuwu" : MessageLookupByLibrary.simpleMessage("配送服务"),
     "peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"),
     "phone_error" : MessageLookupByLibrary.simpleMessage("手机格式错误"),
-    "pinglun_" : m20,
+    "pinglun" : MessageLookupByLibrary.simpleMessage("评论"),
+    "pinglun_" : m21,
     "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
     "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"),
     "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"),
@@ -348,12 +354,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"),
     "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兑换"),
     "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全场通用"),
-    "quanchangzhe" : m21,
+    "quanchangzhe" : m22,
     "quantian" : MessageLookupByLibrary.simpleMessage("全天"),
     "quanxian" : MessageLookupByLibrary.simpleMessage("权限"),
     "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"),
     "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"),
-    "qudanhao" : m22,
+    "qudanhao" : m23,
     "qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"),
     "queding" : MessageLookupByLibrary.simpleMessage("确定"),
     "queren" : MessageLookupByLibrary.simpleMessage("确认"),
@@ -373,9 +379,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"),
     "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("热门文章视频"),
     "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("热门文章视频列表"),
-    "ren" : m23,
+    "ren" : m24,
     "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"),
-    "resend_in_seconds" : m24,
+    "resend_in_seconds" : m25,
     "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
     "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"),
     "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"),
@@ -392,7 +398,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"),
     "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"),
     "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"),
-    "shangpinjifen" : m25,
+    "shangpinjifen" : m26,
     "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"),
     "shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等级"),
     "shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娱乐"),
@@ -401,7 +407,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shezhi" : MessageLookupByLibrary.simpleMessage("设置"),
     "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"),
     "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"),
-    "shifujifen" : m26,
+    "shifujifen" : m27,
     "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"),
     "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
     "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@@ -424,7 +430,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
     "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"),
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
-    "sui" : m27,
+    "sui" : m28,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
     "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
     "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"),
@@ -438,7 +444,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "waimai" : MessageLookupByLibrary.simpleMessage("外卖"),
     "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
     "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
-    "wancheng_" : m28,
+    "wancheng_" : m29,
     "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),
     "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"),
     "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"),
@@ -452,6 +458,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "weixinzhifu" : MessageLookupByLibrary.simpleMessage("微信支付"),
     "weizhitishixinxi" : MessageLookupByLibrary.simpleMessage("为了向您推荐附近的门店信息，推荐您在使用HISAPP时让我们使用位置信息"),
     "wentijian" : MessageLookupByLibrary.simpleMessage("问题件"),
+    "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章详情"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未领取"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的会员等级"),
@@ -465,7 +472,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
     "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"),
     "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"),
-    "xiadanshijian_" : m29,
+    "xiadanshijian_" : m30,
     "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
     "xiangce" : MessageLookupByLibrary.simpleMessage("相册"),
     "xiangji" : MessageLookupByLibrary.simpleMessage("相机"),
@@ -478,8 +485,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
     "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
+    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("下载完成"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
-    "xihuan_" : m30,
+    "xihuan_" : m31,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
     "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
@@ -487,7 +495,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
-    "yiduihuanjian" : m31,
+    "yiduihuanjian" : m32,
     "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
@@ -500,7 +508,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"),
     "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"),
     "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
-    "yingyeshijian" : m32,
+    "yingyeshijian" : m33,
     "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隐私协议》"),
@@ -528,13 +536,13 @@ class MessageLookup extends MessageLookupByLibrary {
     "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"),
     "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"),
     "youkedenglu" : MessageLookupByLibrary.simpleMessage("游客登录"),
-    "youxiaoqi" : m33,
+    "youxiaoqi" : m34,
     "youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
-    "youxiaoqizhi" : m34,
+    "youxiaoqizhi" : m35,
     "yuan" : MessageLookupByLibrary.simpleMessage("元"),
-    "yuan_" : m35,
+    "yuan_" : m36,
     "yue" : MessageLookupByLibrary.simpleMessage("余额"),
-    "yue_" : m36,
+    "yue_" : m37,
     "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"),
     "yunfei" : MessageLookupByLibrary.simpleMessage("运费"),
     "yuyan" : MessageLookupByLibrary.simpleMessage("语言"),
@@ -565,6 +573,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"),
     "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"),
     "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"),
-    "zuozhe" : m37
+    "zuozhe" : m38
   };
 }
diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart
index b7b45610..37f2f0f8 100644
--- a/lib/generated/intl/messages_zh_Hant_CN.dart
+++ b/lib/generated/intl/messages_zh_Hant_CN.dart
@@ -25,75 +25,77 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static m2(time) => "創建時間${time}";
 
-  static m3(shijian) => "發行開始時間 ${shijian}";
+  static m3(xihuan) => "點贊喜歡${xihuan}";
 
-  static m4(ge) => "${ge}g/個";
+  static m4(shijian) => "發行開始時間 ${shijian}";
 
-  static m5(jian) => "共${jian}件";
+  static m5(ge) => "${ge}g/個";
 
-  static m6(jian) => "共${jian}件商品";
+  static m6(jian) => "共${jian}件";
 
-  static m7(km) => "${km}公里";
+  static m7(jian) => "共${jian}件商品";
 
-  static m8(huifu) => "回復@${huifu}:";
+  static m8(km) => "${km}公里";
 
-  static m9(yuan) => "活動減免${yuan}元配送費";
+  static m9(huifu) => "回復@${huifu}:";
 
-  static m10(jifen) => "+ ${jifen} 積分";
+  static m10(yuan) => "活動減免${yuan}元配送費";
 
-  static m11(jianjie) => "簡介:${jianjie}";
+  static m11(jifen) => "+ ${jifen} 積分";
 
-  static m12(jifen) => "${jifen}積分";
+  static m12(jianjie) => "簡介:${jianjie}";
 
-  static m13(jifen) => "${jifen}積分 到下一個等級";
+  static m13(jifen) => "${jifen}積分";
 
-  static m14(date) => "開通日期:${date}";
+  static m14(jifen) => "${jifen}積分 到下一個等級";
 
-  static m15(shijian) => "領取時間 ${shijian}";
+  static m15(date) => "開通日期:${date}";
 
-  static m16(man, jian) => "滿${man}元立減${jian}元代金券";
+  static m16(shijian) => "領取時間 ${shijian}";
 
-  static m17(yuan) => "滿${yuan}可用";
+  static m17(man, jian) => "滿${man}元立減${jian}元代金券";
 
-  static m18(mi) => "${mi}米";
+  static m18(yuan) => "滿${yuan}可用";
 
-  static m19(tian) => "您已連續簽到${tian}天";
+  static m19(mi) => "${mi}米";
 
-  static m20(pinglun) => "評論(${pinglun})";
+  static m20(tian) => "您已連續簽到${tian}天";
 
-  static m21(zhe) => "全場${zhe}折";
+  static m21(pinglun) => "評論(${pinglun})";
 
-  static m22(num) => "取膽號${num}";
+  static m22(zhe) => "全場${zhe}折";
 
-  static m23(ren) => "¥${ren}/人";
+  static m23(num) => "取膽號${num}";
 
-  static m24(second) => "${second}s后重新發送";
+  static m24(ren) => "¥${ren}/人";
 
-  static m25(jifen) => "商品積分 ${jifen}積分";
+  static m25(second) => "${second}s后重新發送";
 
-  static m26(jifen) => "實付積分 ${jifen}積分";
+  static m26(jifen) => "商品積分 ${jifen}積分";
 
-  static m27(sui) => "${sui}嵗";
+  static m27(jifen) => "實付積分 ${jifen}積分";
 
-  static m28(num) => "完成${num}";
+  static m28(sui) => "${sui}嵗";
 
-  static m29(time) => "下單時間:${time}";
+  static m29(num) => "完成${num}";
 
-  static m30(xihuan) => "喜歡(${xihuan})";
+  static m30(time) => "下單時間:${time}";
 
-  static m31(jian) => "已兌換${jian}件";
+  static m31(xihuan) => "喜歡(${xihuan})";
 
-  static m32(time) => "營業時間: ${time}";
+  static m32(jian) => "已兌換${jian}件";
 
-  static m33(date) => "有效期:${date}";
+  static m33(time) => "營業時間: ${time}";
 
-  static m34(date) => "有效期至${date}";
+  static m34(date) => "有效期:${date}";
 
-  static m35(yuan) => "${yuan}元";
+  static m35(date) => "有效期至${date}";
 
-  static m36(yue) => "餘額${yue}";
+  static m36(yuan) => "${yuan}元";
 
-  static m37(zuozhe) => "作者:${zuozhe}";
+  static m37(yue) => "餘額${yue}";
+
+  static m38(zuozhe) => "作者:${zuozhe}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static _notInlinedMessages(_) => <String, Function> {
@@ -143,6 +145,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("當前等級"),
     "dangqianjifen" : MessageLookupByLibrary.simpleMessage("當前積分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("當前商品兌換核銷碼已核銷完成 "),
+    "daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到評論列表頂部"),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等級"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家確認"),
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用戶取餐"),
@@ -151,6 +154,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dianhua" : MessageLookupByLibrary.simpleMessage("電話"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"),
+    "dianzanxihuan_" : m3,
     "dingdan" : MessageLookupByLibrary.simpleMessage("訂單"),
     "dingdandaifahuo" : MessageLookupByLibrary.simpleMessage("訂單待發貨"),
     "dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("訂單待支付"),
@@ -182,20 +186,20 @@ class MessageLookup extends MessageLookupByLibrary {
     "fapiao" : MessageLookupByLibrary.simpleMessage("發票"),
     "fapiaozhushou" : MessageLookupByLibrary.simpleMessage("發票助手"),
     "fasong" : MessageLookupByLibrary.simpleMessage("發送"),
-    "faxingshijian" : m3,
+    "faxingshijian" : m4,
     "feishiwuduihuanma" : MessageLookupByLibrary.simpleMessage("非實物兌換碼"),
     "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非實物商品！"),
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
-    "ge" : m4,
+    "ge" : m5,
     "geiwopingfen" : MessageLookupByLibrary.simpleMessage("給我評分"),
     "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
     "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多優惠券"),
     "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"),
     "gerenxinxi" : MessageLookupByLibrary.simpleMessage("個人信息"),
     "gong" : MessageLookupByLibrary.simpleMessage("共"),
-    "gongjijian" : m5,
-    "gongjijianshangpin" : m6,
-    "gongli" : m7,
+    "gongjijian" : m6,
+    "gongjijianshangpin" : m7,
+    "gongli" : m8,
     "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成為本店會員，快去享受超多的會員權益吧。"),
     "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("請勾選同意隱私服務和一心回鄉服務協定"),
     "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"),
@@ -209,7 +213,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"),
     "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黃金會員"),
     "huifu" : MessageLookupByLibrary.simpleMessage("回復"),
-    "huifu_" : m8,
+    "huifu_" : m9,
     "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
     "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回鄉頭條"),
     "huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"),
@@ -219,7 +223,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("會員卡詳情"),
     "huiyuanyue" : MessageLookupByLibrary.simpleMessage("會員餘額"),
     "huode" : MessageLookupByLibrary.simpleMessage("獲得"),
-    "huodongjianmianpeisongfei" : m9,
+    "huodong" : MessageLookupByLibrary.simpleMessage("活動"),
+    "huodongjianmianpeisongfei" : m10,
     "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活動進行中"),
     "huodongliebiao" : MessageLookupByLibrary.simpleMessage("活動列表"),
     "huodongzixun" : MessageLookupByLibrary.simpleMessage("活動資訊"),
@@ -228,16 +233,16 @@ class MessageLookup extends MessageLookupByLibrary {
     "input_code_hide" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"),
     "input_phone" : MessageLookupByLibrary.simpleMessage("輸入手機號"),
     "input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"),
-    "jiajifen" : m10,
+    "jiajifen" : m11,
     "jian" : MessageLookupByLibrary.simpleMessage("件"),
-    "jianjie" : m11,
+    "jianjie" : m12,
     "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加載失敗"),
     "jiesuan" : MessageLookupByLibrary.simpleMessage("結算"),
     "jiesuanjine" : MessageLookupByLibrary.simpleMessage("結算金額"),
     "jifen" : MessageLookupByLibrary.simpleMessage("積分"),
-    "jifen_" : m12,
+    "jifen_" : m13,
     "jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的積分不足"),
-    "jifendaoxiayidengji" : m13,
+    "jifendaoxiayidengji" : m14,
     "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"),
     "jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"),
     "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"),
@@ -254,7 +259,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jujue" : MessageLookupByLibrary.simpleMessage("拒絕"),
     "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
     "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"),
-    "kaitongriqi" : m14,
+    "kaitongriqi" : m15,
     "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
     "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可領取的卡券"),
     "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"),
@@ -275,7 +280,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lingquchenggong" : MessageLookupByLibrary.simpleMessage("領取成功"),
     "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("領取到卡包"),
     "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"),
-    "lingqushijian" : m15,
+    "lingqushijian" : m16,
     "linian" : MessageLookupByLibrary.simpleMessage("理念"),
     "lishijilu" : MessageLookupByLibrary.simpleMessage("歷史記錄"),
     "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的評論吧"),
@@ -284,15 +289,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"),
     "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"),
     "main_menu3" : MessageLookupByLibrary.simpleMessage("我的"),
-    "manlijiandaijinquan" : m16,
-    "manyuankeyong" : m17,
+    "manlijiandaijinquan" : m17,
+    "manyuankeyong" : m18,
     "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日簽到"),
     "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("沒有更多會員卡"),
     "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("沒有更多數據了"),
     "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
     "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
     "menpaihao" : MessageLookupByLibrary.simpleMessage("請輸入門牌號"),
-    "mi" : m18,
+    "mi" : m19,
     "mingxi" : MessageLookupByLibrary.simpleMessage("明細"),
     "morenpaixu" : MessageLookupByLibrary.simpleMessage("默認排序"),
     "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暫無星店活動"),
@@ -300,7 +305,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "nindingweigongnengweikaiqi" : MessageLookupByLibrary.simpleMessage("您定位功能開關未開啟，請點擊去開啟定位"),
     "nindingweiquanxianweiyunxu" : MessageLookupByLibrary.simpleMessage("您未开启位置权限，请点击确定申请权限"),
     "ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登錄，請點擊去登錄"),
-    "ninyilianxuqiandaotian" : m19,
+    "ninyilianxuqiandaotian" : m20,
     "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一個訂單需要前往門店領取"),
     "ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一個新訂單"),
     "paizhao" : MessageLookupByLibrary.simpleMessage("拍照"),
@@ -310,7 +315,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "peisongfuwu" : MessageLookupByLibrary.simpleMessage("配送服務"),
     "peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"),
     "phone_error" : MessageLookupByLibrary.simpleMessage("手機格式錯誤"),
-    "pinglun_" : m20,
+    "pinglun" : MessageLookupByLibrary.simpleMessage("評論"),
+    "pinglun_" : m21,
     "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
     "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介紹"),
     "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登錄既同意"),
@@ -348,12 +354,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部訂單"),
     "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兌換"),
     "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全場通用"),
-    "quanchangzhe" : m21,
+    "quanchangzhe" : m22,
     "quantian" : MessageLookupByLibrary.simpleMessage("全天"),
     "quanxian" : MessageLookupByLibrary.simpleMessage("權限"),
     "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("權限設置"),
     "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐號"),
-    "qudanhao" : m22,
+    "qudanhao" : m23,
     "qudenglu" : MessageLookupByLibrary.simpleMessage("去登錄"),
     "queding" : MessageLookupByLibrary.simpleMessage("確定"),
     "queren" : MessageLookupByLibrary.simpleMessage("确认"),
@@ -373,9 +379,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"),
     "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("熱門文章視頻"),
     "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("熱門文章視頻清單"),
-    "ren" : m23,
+    "ren" : m24,
     "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任務中心"),
-    "resend_in_seconds" : m24,
+    "resend_in_seconds" : m25,
     "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
     "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兌換積分"),
     "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("點擊淨弼，進入積分商城，點擊你想兌換的領商品，進入商品詳情後點擊下方兌換，即可兌換哦~"),
@@ -392,7 +398,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已發貨"),
     "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"),
     "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加載"),
-    "shangpinjifen" : m25,
+    "shangpinjifen" : m26,
     "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品詳情"),
     "shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等級"),
     "shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娛樂"),
@@ -401,7 +407,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shezhi" : MessageLookupByLibrary.simpleMessage("設置"),
     "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("釋放加載更多"),
     "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("釋放刷新"),
-    "shifujifen" : m26,
+    "shifujifen" : m27,
     "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("實名認證"),
     "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
     "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@@ -424,7 +430,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
     "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人地址"),
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"),
-    "sui" : m27,
+    "sui" : m28,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"),
     "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
     "tingchewei" : MessageLookupByLibrary.simpleMessage("停車位"),
@@ -438,7 +444,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "waimai" : MessageLookupByLibrary.simpleMessage("外賣"),
     "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
     "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
-    "wancheng_" : m28,
+    "wancheng_" : m29,
     "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"),
     "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日資訊後自動生成 "),
     "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日資訊得專屬優惠劵 "),
@@ -452,6 +458,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "weixinzhifu" : MessageLookupByLibrary.simpleMessage("微信支付"),
     "weizhitishixinxi" : MessageLookupByLibrary.simpleMessage("為了向您推薦附近的門店資訊，推薦您在使用HISAPP時讓我們使用位置資訊"),
     "wentijian" : MessageLookupByLibrary.simpleMessage("問題件"),
+    "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章詳情"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未領取"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的會員等級"),
@@ -465,7 +472,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
     "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流狀態:"),
     "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下單時間"),
-    "xiadanshijian_" : m29,
+    "xiadanshijian_" : m30,
     "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
     "xiangce" : MessageLookupByLibrary.simpleMessage("相冊"),
     "xiangji" : MessageLookupByLibrary.simpleMessage("相機"),
@@ -478,8 +485,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
     "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"),
+    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("下載完成"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"),
-    "xihuan_" : m30,
+    "xihuan_" : m31,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"),
     "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系統通知"),
@@ -487,7 +495,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"),
-    "yiduihuanjian" : m31,
+    "yiduihuanjian" : m32,
     "yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"),
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"),
@@ -500,7 +508,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集團聯盟店會員點餐"),
     "yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"),
     "yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
-    "yingyeshijian" : m32,
+    "yingyeshijian" : m33,
     "yinshi" : MessageLookupByLibrary.simpleMessage("飲食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"),
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隱私協議》"),
@@ -528,13 +536,13 @@ class MessageLookup extends MessageLookupByLibrary {
     "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("優惠券領取"),
     "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("優惠金額無法累積積分，訂單撤銷或其他原因造成的未成功支付的訂單，無法獲得對應的積分。"),
     "youkedenglu" : MessageLookupByLibrary.simpleMessage("遊客登錄"),
-    "youxiaoqi" : m33,
+    "youxiaoqi" : m34,
     "youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
-    "youxiaoqizhi" : m34,
+    "youxiaoqizhi" : m35,
     "yuan" : MessageLookupByLibrary.simpleMessage("元"),
-    "yuan_" : m35,
+    "yuan_" : m36,
     "yue" : MessageLookupByLibrary.simpleMessage("餘額"),
-    "yue_" : m36,
+    "yue_" : m37,
     "yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"),
     "yunfei" : MessageLookupByLibrary.simpleMessage("運費"),
     "yuyan" : MessageLookupByLibrary.simpleMessage("語言"),
@@ -566,6 +574,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "zitishijian" : MessageLookupByLibrary.simpleMessage("自提時間"),
     "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"),
     "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"),
-    "zuozhe" : m37
+    "zuozhe" : m38
   };
 }
diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart
index b64b6f9a..68f9a16b 100644
--- a/lib/generated/intl/messages_zh_TW.dart
+++ b/lib/generated/intl/messages_zh_TW.dart
@@ -25,75 +25,77 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static m2(time) => "創建時間${time}";
 
-  static m3(shijian) => "發行開始時間 ${shijian}";
+  static m3(xihuan) => "點贊喜歡${xihuan}";
 
-  static m4(ge) => "${ge}g/個";
+  static m4(shijian) => "發行開始時間 ${shijian}";
 
-  static m5(jian) => "共${jian}件";
+  static m5(ge) => "${ge}g/個";
 
-  static m6(jian) => "共${jian}件商品";
+  static m6(jian) => "共${jian}件";
 
-  static m7(km) => "${km}公里";
+  static m7(jian) => "共${jian}件商品";
 
-  static m8(huifu) => "回復@${huifu}:";
+  static m8(km) => "${km}公里";
 
-  static m9(yuan) => "活動減免${yuan}元配送費";
+  static m9(huifu) => "回復@${huifu}:";
 
-  static m10(jifen) => "+ ${jifen} 積分";
+  static m10(yuan) => "活動減免${yuan}元配送費";
 
-  static m11(jianjie) => "簡介:${jianjie}";
+  static m11(jifen) => "+ ${jifen} 積分";
 
-  static m12(jifen) => "${jifen}積分";
+  static m12(jianjie) => "簡介:${jianjie}";
 
-  static m13(jifen) => "${jifen}積分 到下一個等級";
+  static m13(jifen) => "${jifen}積分";
 
-  static m14(date) => "開通日期:${date}";
+  static m14(jifen) => "${jifen}積分 到下一個等級";
 
-  static m15(shijian) => "領取時間 ${shijian}";
+  static m15(date) => "開通日期:${date}";
 
-  static m16(man, jian) => "滿${man}元立減${jian}元代金券";
+  static m16(shijian) => "領取時間 ${shijian}";
 
-  static m17(yuan) => "滿${yuan}可用";
+  static m17(man, jian) => "滿${man}元立減${jian}元代金券";
 
-  static m18(mi) => "${mi}米";
+  static m18(yuan) => "滿${yuan}可用";
 
-  static m19(tian) => "您已連續簽到${tian}天";
+  static m19(mi) => "${mi}米";
 
-  static m20(pinglun) => "評論(${pinglun})";
+  static m20(tian) => "您已連續簽到${tian}天";
 
-  static m21(zhe) => "全場${zhe}折";
+  static m21(pinglun) => "評論(${pinglun})";
 
-  static m22(num) => "取膽號${num}";
+  static m22(zhe) => "全場${zhe}折";
 
-  static m23(ren) => "¥${ren}/人";
+  static m23(num) => "取膽號${num}";
 
-  static m24(second) => "${second}s后重新發送";
+  static m24(ren) => "¥${ren}/人";
 
-  static m25(jifen) => "商品積分 ${jifen}積分";
+  static m25(second) => "${second}s后重新發送";
 
-  static m26(jifen) => "實付積分 ${jifen}積分";
+  static m26(jifen) => "商品積分 ${jifen}積分";
 
-  static m27(sui) => "${sui}嵗";
+  static m27(jifen) => "實付積分 ${jifen}積分";
 
-  static m28(num) => "完成${num}";
+  static m28(sui) => "${sui}嵗";
 
-  static m29(time) => "下單時間:${time}";
+  static m29(num) => "完成${num}";
 
-  static m30(xihuan) => "喜歡(${xihuan})";
+  static m30(time) => "下單時間:${time}";
 
-  static m31(jian) => "已兌換${jian}件";
+  static m31(xihuan) => "喜歡(${xihuan})";
 
-  static m32(time) => "營業時間: ${time}";
+  static m32(jian) => "已兌換${jian}件";
 
-  static m33(date) => "有效期:${date}";
+  static m33(time) => "營業時間: ${time}";
 
-  static m34(date) => "有效期至${date}";
+  static m34(date) => "有效期:${date}";
 
-  static m35(yuan) => "${yuan}元";
+  static m35(date) => "有效期至${date}";
 
-  static m36(yue) => "餘額${yue}";
+  static m36(yuan) => "${yuan}元";
 
-  static m37(zuozhe) => "作者:${zuozhe}";
+  static m37(yue) => "餘額${yue}";
+
+  static m38(zuozhe) => "作者:${zuozhe}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static _notInlinedMessages(_) => <String, Function> {
@@ -143,6 +145,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dangqiandengji" : MessageLookupByLibrary.simpleMessage("當前等級"),
     "dangqianjifen" : MessageLookupByLibrary.simpleMessage("當前積分:"),
     "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("當前商品兌換核銷碼已核銷完成 "),
+    "daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到評論列表頂部"),
     "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等級"),
     "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家確認"),
     "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("等待用戶取餐"),
@@ -151,6 +154,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dianhua" : MessageLookupByLibrary.simpleMessage("電話"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄，享受更多精彩信息"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"),
+    "dianzanxihuan_" : m3,
     "dingdan" : MessageLookupByLibrary.simpleMessage("訂單"),
     "dingdandaifahuo" : MessageLookupByLibrary.simpleMessage("訂單待發貨"),
     "dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("訂單待支付"),
@@ -182,20 +186,20 @@ class MessageLookup extends MessageLookupByLibrary {
     "fapiao" : MessageLookupByLibrary.simpleMessage("發票"),
     "fapiaozhushou" : MessageLookupByLibrary.simpleMessage("發票助手"),
     "fasong" : MessageLookupByLibrary.simpleMessage("發送"),
-    "faxingshijian" : m3,
+    "faxingshijian" : m4,
     "feishiwuduihuanma" : MessageLookupByLibrary.simpleMessage("非實物兌換碼"),
     "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非實物商品！"),
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
-    "ge" : m4,
+    "ge" : m5,
     "geiwopingfen" : MessageLookupByLibrary.simpleMessage("給我評分"),
     "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
     "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多優惠券"),
     "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更換頭像"),
     "gerenxinxi" : MessageLookupByLibrary.simpleMessage("個人信息"),
     "gong" : MessageLookupByLibrary.simpleMessage("共"),
-    "gongjijian" : m5,
-    "gongjijianshangpin" : m6,
-    "gongli" : m7,
+    "gongjijian" : m6,
+    "gongjijianshangpin" : m7,
+    "gongli" : m8,
     "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成為本店會員，快去享受超多的會員權益吧。"),
     "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("請勾選同意隱私服務和一心回鄉服務協定"),
     "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"),
@@ -209,7 +213,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"),
     "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黃金會員"),
     "huifu" : MessageLookupByLibrary.simpleMessage("回復"),
-    "huifu_" : m8,
+    "huifu_" : m9,
     "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
     "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回鄉頭條"),
     "huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"),
@@ -219,7 +223,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("會員卡詳情"),
     "huiyuanyue" : MessageLookupByLibrary.simpleMessage("會員餘額"),
     "huode" : MessageLookupByLibrary.simpleMessage("獲得"),
-    "huodongjianmianpeisongfei" : m9,
+    "huodong" : MessageLookupByLibrary.simpleMessage("活動"),
+    "huodongjianmianpeisongfei" : m10,
     "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活動進行中"),
     "huodongliebiao" : MessageLookupByLibrary.simpleMessage("活動列表"),
     "huodongzixun" : MessageLookupByLibrary.simpleMessage("活動資訊"),
@@ -228,16 +233,16 @@ class MessageLookup extends MessageLookupByLibrary {
     "input_code_hide" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"),
     "input_phone" : MessageLookupByLibrary.simpleMessage("輸入手機號"),
     "input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"),
-    "jiajifen" : m10,
+    "jiajifen" : m11,
     "jian" : MessageLookupByLibrary.simpleMessage("件"),
-    "jianjie" : m11,
+    "jianjie" : m12,
     "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加載失敗"),
     "jiesuan" : MessageLookupByLibrary.simpleMessage("結算"),
     "jiesuanjine" : MessageLookupByLibrary.simpleMessage("結算金額"),
     "jifen" : MessageLookupByLibrary.simpleMessage("積分"),
-    "jifen_" : m12,
+    "jifen_" : m13,
     "jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的積分不足"),
-    "jifendaoxiayidengji" : m13,
+    "jifendaoxiayidengji" : m14,
     "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"),
     "jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"),
     "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"),
@@ -254,7 +259,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jujue" : MessageLookupByLibrary.simpleMessage("拒絕"),
     "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
     "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"),
-    "kaitongriqi" : m14,
+    "kaitongriqi" : m15,
     "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
     "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可領取的卡券"),
     "keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"),
@@ -275,7 +280,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lingquchenggong" : MessageLookupByLibrary.simpleMessage("領取成功"),
     "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("領取到卡包"),
     "lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"),
-    "lingqushijian" : m15,
+    "lingqushijian" : m16,
     "linian" : MessageLookupByLibrary.simpleMessage("理念"),
     "lishijilu" : MessageLookupByLibrary.simpleMessage("歷史記錄"),
     "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的評論吧"),
@@ -284,15 +289,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"),
     "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"),
     "main_menu3" : MessageLookupByLibrary.simpleMessage("我的"),
-    "manlijiandaijinquan" : m16,
-    "manyuankeyong" : m17,
+    "manlijiandaijinquan" : m17,
+    "manyuankeyong" : m18,
     "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日簽到"),
     "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("沒有更多會員卡"),
     "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("沒有更多數據了"),
     "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
     "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
     "menpaihao" : MessageLookupByLibrary.simpleMessage("請輸入門牌號"),
-    "mi" : m18,
+    "mi" : m19,
     "mingxi" : MessageLookupByLibrary.simpleMessage("明細"),
     "morenpaixu" : MessageLookupByLibrary.simpleMessage("默認排序"),
     "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暫無星店活動"),
@@ -300,7 +305,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "nindingweigongnengweikaiqi" : MessageLookupByLibrary.simpleMessage("您定位功能開關未開啟，請點擊去開啟定位"),
     "nindingweiquanxianweiyunxu" : MessageLookupByLibrary.simpleMessage("您未开启位置权限，请点击确定申请权限"),
     "ninweidenglu" : MessageLookupByLibrary.simpleMessage("您未登錄，請點擊去登錄"),
-    "ninyilianxuqiandaotian" : m19,
+    "ninyilianxuqiandaotian" : m20,
     "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一個訂單需要前往門店領取"),
     "ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一個新訂單"),
     "paizhao" : MessageLookupByLibrary.simpleMessage("拍照"),
@@ -310,7 +315,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "peisongfuwu" : MessageLookupByLibrary.simpleMessage("配送服務"),
     "peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"),
     "phone_error" : MessageLookupByLibrary.simpleMessage("手機格式錯誤"),
-    "pinglun_" : m20,
+    "pinglun" : MessageLookupByLibrary.simpleMessage("評論"),
+    "pinglun_" : m21,
     "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
     "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介紹"),
     "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登錄既同意"),
@@ -348,12 +354,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部訂單"),
     "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兌換"),
     "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全場通用"),
-    "quanchangzhe" : m21,
+    "quanchangzhe" : m22,
     "quantian" : MessageLookupByLibrary.simpleMessage("全天"),
     "quanxian" : MessageLookupByLibrary.simpleMessage("權限"),
     "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("權限設置"),
     "qucanhao" : MessageLookupByLibrary.simpleMessage("取餐號"),
-    "qudanhao" : m22,
+    "qudanhao" : m23,
     "qudenglu" : MessageLookupByLibrary.simpleMessage("去登錄"),
     "queding" : MessageLookupByLibrary.simpleMessage("確定"),
     "queren" : MessageLookupByLibrary.simpleMessage("确认"),
@@ -373,9 +379,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"),
     "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("熱門文章視頻"),
     "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("熱門文章視頻清單"),
-    "ren" : m23,
+    "ren" : m24,
     "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任務中心"),
-    "resend_in_seconds" : m24,
+    "resend_in_seconds" : m25,
     "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
     "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兌換積分"),
     "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("點擊淨弼，進入積分商城，點擊你想兌換的領商品，進入商品詳情後點擊下方兌換，即可兌換哦~"),
@@ -392,7 +398,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已發貨"),
     "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"),
     "shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加載"),
-    "shangpinjifen" : m25,
+    "shangpinjifen" : m26,
     "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品詳情"),
     "shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等級"),
     "shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娛樂"),
@@ -401,7 +407,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shezhi" : MessageLookupByLibrary.simpleMessage("設置"),
     "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("釋放加載更多"),
     "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("釋放刷新"),
-    "shifujifen" : m26,
+    "shifujifen" : m27,
     "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("實名認證"),
     "shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
     "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@@ -424,7 +430,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
     "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人地址"),
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"),
-    "sui" : m27,
+    "sui" : m28,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"),
     "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
     "tingchewei" : MessageLookupByLibrary.simpleMessage("停車位"),
@@ -438,7 +444,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "waimai" : MessageLookupByLibrary.simpleMessage("外賣"),
     "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
     "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
-    "wancheng_" : m28,
+    "wancheng_" : m29,
     "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"),
     "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日資訊後自動生成 "),
     "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日資訊得專屬優惠劵 "),
@@ -452,6 +458,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "weixinzhifu" : MessageLookupByLibrary.simpleMessage("微信支付"),
     "weizhitishixinxi" : MessageLookupByLibrary.simpleMessage("為了向您推薦附近的門店資訊，推薦您在使用HISAPP時讓我們使用位置資訊"),
     "wentijian" : MessageLookupByLibrary.simpleMessage("問題件"),
+    "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章詳情"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未領取"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的會員等級"),
@@ -465,7 +472,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
     "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流狀態:"),
     "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下單時間"),
-    "xiadanshijian_" : m29,
+    "xiadanshijian_" : m30,
     "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
     "xiangce" : MessageLookupByLibrary.simpleMessage("相冊"),
     "xiangji" : MessageLookupByLibrary.simpleMessage("相機"),
@@ -478,8 +485,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
     "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"),
+    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("下載完成"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"),
-    "xihuan_" : m30,
+    "xihuan_" : m31,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"),
     "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系統通知"),
@@ -487,7 +495,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"),
-    "yiduihuanjian" : m31,
+    "yiduihuanjian" : m32,
     "yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"),
     "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"),
     "yikexiao" : MessageLookupByLibrary.simpleMessage("已核銷"),
@@ -500,7 +508,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集團聯盟店會員點餐"),
     "yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"),
     "yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
-    "yingyeshijian" : m32,
+    "yingyeshijian" : m33,
     "yinshi" : MessageLookupByLibrary.simpleMessage("飲食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"),
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隱私協議》"),
@@ -528,13 +536,13 @@ class MessageLookup extends MessageLookupByLibrary {
     "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("優惠券領取"),
     "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("優惠金額無法累積積分，訂單撤銷或其他原因造成的未成功支付的訂單，無法獲得對應的積分。"),
     "youkedenglu" : MessageLookupByLibrary.simpleMessage("遊客登錄"),
-    "youxiaoqi" : m33,
+    "youxiaoqi" : m34,
     "youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
-    "youxiaoqizhi" : m34,
+    "youxiaoqizhi" : m35,
     "yuan" : MessageLookupByLibrary.simpleMessage("元"),
-    "yuan_" : m35,
+    "yuan_" : m36,
     "yue" : MessageLookupByLibrary.simpleMessage("餘額"),
-    "yue_" : m36,
+    "yue_" : m37,
     "yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"),
     "yunfei" : MessageLookupByLibrary.simpleMessage("運費"),
     "yuyan" : MessageLookupByLibrary.simpleMessage("語言"),
@@ -566,6 +574,6 @@ class MessageLookup extends MessageLookupByLibrary {
     "zitishijian" : MessageLookupByLibrary.simpleMessage("自提時間"),
     "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"),
     "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"),
-    "zuozhe" : m37
+    "zuozhe" : m38
   };
 }
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
index 3902fa63..6ea3cf70 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -4735,6 +4735,66 @@ class S {
     );
   }
 
+  /// `下载完成`
+  String get xiazaiwancheng {
+    return Intl.message(
+      '下载完成',
+      name: 'xiazaiwancheng',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `到评论列表顶部`
+  String get daopinglunliebiaodingbu {
+    return Intl.message(
+      '到评论列表顶部',
+      name: 'daopinglunliebiaodingbu',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `点赞喜欢{xihuan}`
+  String dianzanxihuan_(Object xihuan) {
+    return Intl.message(
+      '点赞喜欢$xihuan',
+      name: 'dianzanxihuan_',
+      desc: '',
+      args: [xihuan],
+    );
+  }
+
+  /// `文章`
+  String get wenzhang {
+    return Intl.message(
+      '文章',
+      name: 'wenzhang',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `活动`
+  String get huodong {
+    return Intl.message(
+      '活动',
+      name: 'huodong',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `评论`
+  String get pinglun {
+    return Intl.message(
+      '评论',
+      name: 'pinglun',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `并使用本机号码登录`
   String get privacy_policy4 {
     return Intl.message(
diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart
index d730d76a..30c53306 100644
--- a/lib/home/home_page.dart
+++ b/lib/home/home_page.dart
@@ -2,7 +2,6 @@ import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.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/home/home_view/home_banner.dart';
@@ -18,15 +17,7 @@ import 'package:huixiang/retrofit/data/goods.dart';
 import 'package:huixiang/retrofit/data/page.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/utils/event_type.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/classic_header.dart';
-import 'package:huixiang/view_widget/custom_image.dart';
-import 'package:huixiang/view_widget/hot_item.dart';
-import 'package:huixiang/view_widget/item_title.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:huixiang/view_widget/login_tips.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -62,7 +53,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
     });
   }
 
-  SwiperController controller = SwiperController();
+  final SwiperController controller = SwiperController();
 
   List<BannerData> bannerData = [];
   List<Brand> brandData = [];
@@ -74,10 +65,10 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
     EasyLoading.show(status: S.of(context).zhengzaijiazai);
 
     final SharedPreferences value = await SharedPreferences.getInstance();
-    apiService = ApiService(Dio(),
-        context: context, token: value.getString('token'), showLoading: false);
+    apiService = ApiService(Dio(), context: context, token: value.getString('token'), showLoading: false);
 
-    BaseData brand = await apiService.queryHomeBrand().catchError((onError) {
+    final BaseData brand =
+        await apiService.queryHomeBrand().catchError((onError) {
       refreshController.refreshFailed();
     });
     if (brand != null && brand.isSuccess) {
@@ -88,7 +79,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
       founder = Founder.fromJson(brand.data["founder"]);
     }
 
-    BaseData<PageInfo<Article>> article = await apiService.queryArticle({
+    final BaseData<PageInfo<Article>> article = await apiService.queryArticle({
       "pageNum": 1,
       "pageSize": 3,
       "searchKey": "",
@@ -102,7 +93,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
       articles.addAll(article.data.list);
     }
 
-    BaseData<PageInfo<Goods>> goodsData = await apiService.creditGoods({
+    final BaseData<PageInfo<Goods>> goodsData = await apiService.creditGoods({
       "orderDesc": true,
       "orderType": 1,
       "pageNum": 1,
@@ -116,7 +107,8 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
       gooods.addAll(goodsData.data.list);
     }
 
-    BaseData<PageInfo<BannerData>> baseData = await apiService.queryBanner({
+    final BaseData<PageInfo<BannerData>> baseData =
+        await apiService.queryBanner({
       "model": {"type": "HOME_PAGE"},
     }).catchError((onError) {
       refreshController.refreshFailed();
@@ -162,14 +154,19 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
                 children: [
                   ///banner
                   HomeBanner(bannerData, controller),
+
                   ///签到
                   SignView(),
+
                   ///热门文章
                   HotArticle(articles),
+
                   ///创始人故事
                   FounderStore(founder),
+
                   ///品牌介绍
                   BrandView(brandData),
+
                   ///积分商城
                   HomeIntegralStore(gooods, callback),
                 ],
diff --git a/lib/home/home_view/brand_view.dart b/lib/home/home_view/brand_view.dart
index eff1deea..76a51cea 100644
--- a/lib/home/home_view/brand_view.dart
+++ b/lib/home/home_view/brand_view.dart
@@ -23,6 +23,9 @@ class BrandView extends StatefulWidget {
 }
 
 class _BrandView extends State<BrandView> {
+
+  final SwiperController swiperController = SwiperController();
+
   @override
   Widget build(BuildContext context) {
     return Column(
@@ -41,10 +44,11 @@ class _BrandView extends State<BrandView> {
       height: 90.h,
       margin: EdgeInsets.only(bottom: 18.h),
       child: Swiper(
-        physics: BouncingScrollPhysics(),
+        controller: swiperController,
         viewportFraction: 0.32,
         scale: 0.7,
-        loop: true,
+        autoplay: true,
+        physics: BouncingScrollPhysics(),
         itemBuilder: (context, position) {
           return Container(
             margin: EdgeInsets.symmetric(horizontal: 3.w, vertical: 15.h),
@@ -56,7 +60,7 @@ class _BrandView extends State<BrandView> {
                   offset: Offset(0, 2),
                   blurRadius: 5,
                   spreadRadius: 0,
-                )
+                ),
               ],
               borderRadius: BorderRadius.circular(8),
             ),
diff --git a/lib/home/main_home_page.dart b/lib/home/main_home_page.dart
index 40eac444..c37cbc6c 100644
--- a/lib/home/main_home_page.dart
+++ b/lib/home/main_home_page.dart
@@ -49,67 +49,64 @@ class _MainHomePage extends State<MainHomePage>
   Widget build(BuildContext context) {
     super.build(context);
     return DefaultTabController(
-        length: 3,
-        child: Scaffold(
-          appBar: MyAppBar(
-            background: Color(0xFFFAFAFA),
-            toolbarHeight: 50.h,
-            leading: false,
-            action: Container(
-              margin: EdgeInsets.only(right: 17.w),
-              child: GestureDetector(
-                onTap: () {
-                  // Navigator.of(context).pushNamed("/router/msg_page");
-                  Navigator.of(context).pushNamed('/router/system_msg_page');
-                },
-                child: Image.asset(
-                  "assets/image/icon_notices.png",
-                  width: 24,
-                  height: 24,
-                ),
-              ),
-            ),
-            titleChild: PreferredSize(
-              preferredSize: Size(double.infinity, 38.h),
-              child: TabBar(
-                controller: tabcontroller,
-                automaticIndicatorColorAdjustment: true,
-                isScrollable: true,
-                indicatorWeight: 2,
-                indicatorColor: Color(0xFF39B54A),
-                labelPadding: EdgeInsets.only(left: 8.w, right: 8.w),
-                indicatorSize: TabBarIndicatorSize.label,
-                unselectedLabelStyle: TextStyle(
-                  fontSize: 15.sp,
-                  fontWeight: FontWeight.w400,
-                ),
-                labelStyle: TextStyle(
-                  color: Colors.black,
-                  fontSize: 18.sp,
-                  fontWeight: FontWeight.bold,
-                ),
-                labelColor: Colors.black,
-                tabs: [
-                  MyTab(text: S.of(context).shouye),
-                  MyTab(
-                    text: S.of(context).huodongliebiao,
-                  ),
-                  MyTab(
-                    text: S.of(context).jifenshangcheng,
-                  ),
-                ],
+      length: 3,
+      child: Scaffold(
+        appBar: MyAppBar(
+          background: Color(0xFFFAFAFA),
+          toolbarHeight: 50.h,
+          leading: false,
+          brightness: Brightness.light,
+          action: Container(
+            margin: EdgeInsets.only(right: 17.w),
+            child: GestureDetector(
+              onTap: () {
+                Navigator.of(context).pushNamed('/router/system_msg_page');
+              },
+              child: Image.asset(
+                "assets/image/icon_notices.png",
+                width: 24,
+                height: 24,
               ),
             ),
           ),
-          body: Container(
-            padding: EdgeInsets.only(bottom: 76.h),
-            child: TabBarView(
-              physics: BouncingScrollPhysics(),
-              children: _widgetOptions,
+          titleChild: PreferredSize(
+            preferredSize: Size(double.infinity, 38.h),
+            child: TabBar(
               controller: tabcontroller,
+              automaticIndicatorColorAdjustment: true,
+              isScrollable: true,
+              indicatorWeight: 2,
+              indicatorColor: Color(0xFF39B54A),
+              labelPadding: EdgeInsets.only(left: 8.w, right: 8.w),
+              indicatorSize: TabBarIndicatorSize.label,
+              unselectedLabelStyle: TextStyle(
+                fontSize: 15.sp,
+                fontWeight: FontWeight.w400,
+              ),
+              labelStyle: TextStyle(
+                color: Colors.black,
+                fontSize: 18.sp,
+                fontWeight: FontWeight.bold,
+              ),
+              labelColor: Colors.black,
+              tabs: [
+                MyTab(text: S.of(context).shouye),
+                MyTab(text: S.of(context).huodongliebiao),
+                MyTab(text: S.of(context).jifenshangcheng),
+              ],
             ),
           ),
-        ));
+        ),
+        body: Container(
+          padding: EdgeInsets.only(bottom: 76.h),
+          child: TabBarView(
+            physics: BouncingScrollPhysics(),
+            children: _widgetOptions,
+            controller: tabcontroller,
+          ),
+        ),
+      ),
+    );
   }
 
   @override
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 15f2d11a..a910cede 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -490,6 +490,13 @@
   "qianshou": "已签收",
   "wentijian": "问题件",
   "zanwupinglun": "暂无评论，快来评论吧",
+  "xiazaiwancheng": "下载完成",
+  "zhengzaixiazaizhong": "正在下载中...",
+  "daopinglunliebiaodingbu": "到评论列表顶部",
+  "dianzanxihuan_": "点赞喜欢{xihuan}",
+  "wenzhang": "文章",
+  "huodong": "活动",
+  "pinglun": "评论",
 
 
 
diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb
index 50248d68..c0f6adf4 100644
--- a/lib/l10n/intl_zh_CN.arb
+++ b/lib/l10n/intl_zh_CN.arb
@@ -492,6 +492,13 @@
   "qianshou": "已签收",
   "wentijian": "问题件",
   "zanwupinglun": "暂无评论，快来评论吧",
+  "xiazaiwancheng": "下载完成",
+  "zhengzaixiazaizhong": "正在下载中...",
+  "daopinglunliebiaodingbu": "到评论列表顶部",
+  "dianzanxihuan_": "点赞喜欢{xihuan}",
+  "wenzhang": "文章",
+  "huodong": "活动",
+  "pinglun": "评论",
 
 
 
diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb
index 50248d68..c0f6adf4 100644
--- a/lib/l10n/intl_zh_Hans_CN.arb
+++ b/lib/l10n/intl_zh_Hans_CN.arb
@@ -492,6 +492,13 @@
   "qianshou": "已签收",
   "wentijian": "问题件",
   "zanwupinglun": "暂无评论，快来评论吧",
+  "xiazaiwancheng": "下载完成",
+  "zhengzaixiazaizhong": "正在下载中...",
+  "daopinglunliebiaodingbu": "到评论列表顶部",
+  "dianzanxihuan_": "点赞喜欢{xihuan}",
+  "wenzhang": "文章",
+  "huodong": "活动",
+  "pinglun": "评论",
 
 
 
diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb
index 9653ae4c..70407e33 100644
--- a/lib/l10n/intl_zh_Hant_CN.arb
+++ b/lib/l10n/intl_zh_Hant_CN.arb
@@ -486,6 +486,14 @@
   "qianshou": "已簽收",
   "wentijian": "問題件",
   "zanwupinglun": "暫無評論，快去評論吧～",
+  "xiazaiwancheng": "下載完成",
+  "zhengzaixiazaizhong": "正在下載中...",
+  "daopinglunliebiaodingbu": "到評論列表頂部",
+  "dianzanxihuan_": "點贊喜歡{xihuan}",
+  "wenzhang": "文章",
+  "huodong": "活動",
+  "pinglun": "評論",
+
 
 
   "privacy_policy4": "并使用本機號碼登錄"
diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb
index 7f0b67d5..49731c18 100644
--- a/lib/l10n/intl_zh_TW.arb
+++ b/lib/l10n/intl_zh_TW.arb
@@ -484,6 +484,14 @@
   "qianshou": "已簽收",
   "wentijian": "問題件",
   "zanwupinglun": "暫無評論，快去評論吧～",
+  "xiazaiwancheng": "下載完成",
+  "zhengzaixiazaizhong": "正在下載中...",
+  "daopinglunliebiaodingbu": "到評論列表頂部",
+  "dianzanxihuan_": "點贊喜歡{xihuan}",
+  "wenzhang": "文章",
+  "huodong": "活動",
+  "pinglun": "評論",
+
 
 
   "privacy_policy4": "并使用本機號碼登錄"
diff --git a/lib/main.dart b/lib/main.dart
index b149fae3..5bbbfa8b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -6,6 +6,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bmflocation/bdmap_location_flutter_plugin.dart';
+
 // import 'package:flutter_bugly/flutter_bugly.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -94,7 +95,7 @@ void main() async {
   // FlutterBugly.init(androidAppId: "204f207673",iOSAppId: "8bb92ba0f6");
 }
 
-XgFlutterPlugin xgFlutterPlugin = XgFlutterPlugin();
+final XgFlutterPlugin xgFlutterPlugin = XgFlutterPlugin();
 
 initSdk() async {
   ///ios 调用startXg前需要调用此方法
@@ -151,12 +152,10 @@ class MyApp extends StatelessWidget {
             bodyText2: TextStyle(fontSize: 16.sp),
           ),
         ),
-        // locale: locale,
         localeResolutionCallback: (locale, supportedLocales) {
           print("locale: $locale");
           print("supportedLocales: $supportedLocales");
-          return appLocale ?? locale
-              /*Locale.fromSubtags(languageCode: 'zh', countryCode: 'TW')*/;
+          return appLocale ?? locale;
         },
         localizationsDelegates: [
           GlobalMaterialLocalizations.delegate,
@@ -171,8 +170,6 @@ class MyApp extends StatelessWidget {
         },
         supportedLocales: S.delegate.supportedLocales,
         home: (isFirst ?? true) ? GuidePage() : LoginPage(),
-        // home: MainPage(),
-        //EasyLoading.init();
         builder: EasyLoading.init(
           builder: (context, widget) {
             return MediaQuery(
@@ -241,20 +238,14 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
   '/router/treaty_page': (context, {arguments}) => TreatyPage(),
   '/router/union_detail_page': (context, {arguments}) =>
       UnionDetailsPage(arguments: arguments),
-  '/router/web_page': (context, {arguments}) =>
-      WebPage(arguments: arguments),
+  '/router/web_page': (context, {arguments}) => WebPage(arguments: arguments),
   '/router/integral_store_page': (context, {arguments}) =>
-      IntegralStoreDetailsPage(
-        arguments: arguments,
-      ),
-  '/router/exchange_order_page': (context, {arguments}) => ExchangeOrderPage(
-        arguments: arguments,
-      ),
+      IntegralStoreDetailsPage(arguments: arguments),
+  '/router/exchange_order_page': (context, {arguments}) =>
+      ExchangeOrderPage(arguments: arguments),
   '/router/store_selector_page': (context, {arguments}) => StoreSelectorPage(),
   '/router/exchange_order_success_page': (context, {arguments}) =>
-      ExchangeOrderSuccessPage(
-        arguments: arguments,
-      ),
+      ExchangeOrderSuccessPage(arguments: arguments),
   '/router/mine_vip_level_page': (context, {arguments}) =>
       MineVipLevelPage(arguments: arguments),
   '/router/exchange_history_page': (context, {arguments}) =>
@@ -268,9 +259,8 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
       OrderDetailPage(arguments: arguments),
   '/router/recharge_page': (context, {arguments}) => RechargePage(),
   '/router/hot_article_page': (context, {arguments}) => HotArticlePage(),
-  '/router/address_edit_page': (context, {arguments}) => EditAddressPage(
-        arguments: arguments,
-      ),
+  '/router/address_edit_page': (context, {arguments}) =>
+      EditAddressPage(arguments: arguments),
   '/router/address_map_page': (context, {arguments}) => AddressMapPage(),
   '/router/logistics_information_page': (context, {arguments}) =>
       LogisticsInformationPage(arguments: arguments),
@@ -280,12 +270,9 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
   '/router/video_playback_page': (context, {arguments}) => VideoPlaybackPage(),
   '/router/roll_center_page': (context, {arguments}) => RollCenterPage(),
   '/router/edit_remarks_page': (context, {arguments}) => EditRemarksPage(),
-  '/router/edit_name': (context, {arguments}) => EditName(
-        arguments: arguments,
-      ),
-  '/router/location_map': (context, {arguments}) => LocationMap(
-        arguments: arguments,
-      ),
+  '/router/edit_name': (context, {arguments}) => EditName(arguments: arguments),
+  '/router/location_map': (context, {arguments}) =>
+      LocationMap(arguments: arguments),
   // '/router/hot_article_details_page': (context, {arguments}) => HotArticleDetailsPage(),
   // '/router/ui_test': (context, {arguments}) => UITest(),
 };
diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart
index e20417bf..6b555edb 100644
--- a/lib/mine/mine_page.dart
+++ b/lib/mine/mine_page.dart
@@ -4,6 +4,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/main.dart';
 import 'package:huixiang/retrofit/data/base_data.dart';
@@ -43,8 +44,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
   _toUserInfo() async {
     SharedPreferences shared = await SharedPreferences.getInstance();
     if (shared.getString("token") == null || shared.getString("token") == "") {
-      Navigator.of(context)
-          .pushNamed('/router/login_page', arguments: {"login": "login"});
+      Navigator.of(context).pushNamed('/router/login_page', arguments: {"login": "login"});
       return;
     }
     await Navigator.of(context).pushNamed('/router/user_info_page');
@@ -128,7 +128,6 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
           header: MyHeader(),
           physics: BouncingScrollPhysics(),
           onRefresh: () {
-            // queryUserInfo
             setState(() {});
           },
           child: SingleChildScrollView(
@@ -164,8 +163,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
                                     userInfo.memberRankVo != null)
                                 ? userInfo.memberRankVo.rankOrigin
                                 : 0,
-                            createTime:
-                                (userInfo != null) ? userInfo.createTime : "",
+                            createTime: (userInfo != null) ? userInfo.createTime : "",
                           ),
 
                           /// 订单或会员卡
diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart
index 73b003d5..b2f1078d 100644
--- a/lib/retrofit/retrofit_api.dart
+++ b/lib/retrofit/retrofit_api.dart
@@ -122,17 +122,6 @@ abstract class ApiService {
     return _ApiService(dio, baseUrl: baseUrl);
   }
 
-  static showDialog(context) async {
-    dynamic ddd = await showCupertinoDialog(
-      context: context,
-      barrierDismissible: false,
-      builder: (context) {
-        return LoginTips();
-      },
-    );
-    print("ddd: $ddd");
-  }
-
   static void p(String msg) {
     //因为String的length是字符数量不是字节数量所以为了防止中文字符过多，
     //  把4*1024的MAX字节打印长度改为1000字符数
diff --git a/lib/union/union_details_page.dart b/lib/union/union_details_page.dart
index 2ae6b2e8..d5b3cc1e 100644
--- a/lib/union/union_details_page.dart
+++ b/lib/union/union_details_page.dart
@@ -15,7 +15,10 @@ import 'package:huixiang/retrofit/data/store_info.dart';
 import 'package:huixiang/retrofit/data/user_entity.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/union/union_view/store_activity.dart';
+import 'package:huixiang/union/union_view/store_info.dart';
+import 'package:huixiang/union/union_view/union_coupon.dart';
+import 'package:huixiang/union/union_view/vip.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/utils/min.dart';
 import 'package:huixiang/view_widget/classic_header.dart';
@@ -29,7 +32,6 @@ import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class UnionDetailsPage extends StatefulWidget {
   final Map<String, dynamic> arguments;
@@ -108,227 +110,17 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
                     physics: NeverScrollableScrollPhysics(),
                     child: Column(
                       children: [
-                        AspectRatio(
-                          aspectRatio: 1,
-                          child: Container(
-                            margin: EdgeInsets.fromLTRB(16, 20, 16, 8),
-                            padding: EdgeInsets.fromLTRB(10, 20, 10, 14),
-                            decoration: BoxDecoration(
-                              color: Colors.white,
-                              borderRadius: BorderRadius.circular(8),
-                              boxShadow: [
-                                BoxShadow(
-                                  color: Colors.black.withAlpha(25),
-                                  offset: Offset(0, 1),
-                                  blurRadius: 12,
-                                  spreadRadius: 0,
-                                ),
-                              ],
-                            ),
-                            child: Column(
-                              mainAxisAlignment: MainAxisAlignment.spaceAround,
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                AspectRatio(
-                                  aspectRatio: 1.8,
-                                  child: buildSwiper(),
-                                ),
-                                Expanded(
-                                  child: Container(
-                                    margin: EdgeInsets.only(
-                                      left: 10.w,
-                                      right: 10.w,
-                                      top: 16.h,
-                                    ),
-                                    child: Column(
-                                      mainAxisAlignment:
-                                          MainAxisAlignment.spaceBetween,
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      children: [
-                                        Row(
-                                          children: [
-                                            Text(
-                                              storeInfo != null
-                                                  ? storeInfo.storeName
-                                                  : "",
-                                              style: TextStyle(
-                                                fontSize: 16.sp,
-                                                color: Colors.black,
-                                                fontWeight: MyFontWeight.medium,
-                                              ),
-                                            ),
-                                            Expanded(
-                                              child: Container(
-                                                alignment:
-                                                    Alignment.centerRight,
-                                                child: Text(
-                                                  S.of(context).ren(
-                                                        storeInfo != null
-                                                            ? storeInfo
-                                                                .perCapitaConsumption
-                                                            : "",
-                                                      ),
-                                                  style: TextStyle(
-                                                    fontSize: 14.sp,
-                                                    fontWeight: MyFontWeight.regular,
-                                                    color: Color(0xFF353535),
-                                                  ),
-                                                ),
-                                              ),
-                                            ),
-                                          ],
-                                        ),
-                                        Text(
-                                          storeInfo != null
-                                              ? storeInfo.address
-                                              : "",
-                                          maxLines: 2,
-                                          textAlign: TextAlign.justify,
-                                          style: TextStyle(
-                                            color: Color(0xFF353535),
-                                            fontWeight: MyFontWeight.regular,
-                                            fontSize: 12.sp,
-                                          ),
-                                        ),
-                                        Row(
-                                          children: itemServer(
-                                            storeInfo != null
-                                                ? storeInfo.businessService
-                                                : "",
-                                          ),
-                                        ),
-                                        Row(
-                                          mainAxisAlignment:
-                                              MainAxisAlignment.spaceBetween,
-                                          crossAxisAlignment:
-                                              CrossAxisAlignment.end,
-                                          children: [
-                                            Expanded(
-                                              child: Text(
-                                                S.of(context).yingyeshijian(storeInfo ==
-                                                        null
-                                                    ? ""
-                                                    : (storeInfo.openStartTime ==
-                                                                null &&
-                                                            storeInfo
-                                                                    .openEndTime ==
-                                                                null)
-                                                        ? S.of(context).quantian
-                                                        : "${storeInfo.openStartTime.substring(0, storeInfo.openStartTime.lastIndexOf(":"))} "
-                                                            "- ${storeInfo.openEndTime.substring(0, storeInfo.openEndTime.lastIndexOf(":"))}"),
-                                                style: TextStyle(
-                                                  color: Color(0xFF353535),
-                                                  fontWeight: MyFontWeight.regular,
-                                                  fontSize: 12.sp,
-                                                ),
-                                              ),
-                                            ),
-                                            SizedBox(
-                                              width: 16.w,
-                                            ),
-                                            InkWell(
-                                              onTap: () {
-                                                if (storeInfo == null ||
-                                                    storeInfo.latitude ==
-                                                        null ||
-                                                    storeInfo.longitude ==
-                                                        null ||
-                                                    storeInfo.latitude == "" ||
-                                                    storeInfo.longitude == "")
-                                                  return;
-                                                Navigator.of(context).pushNamed(
-                                                    '/router/location_map',
-                                                    arguments: {
-                                                      "lat": storeInfo.latitude,
-                                                      "lng":
-                                                          storeInfo.longitude,
-                                                      "storeName":
-                                                          storeInfo.storeName,
-                                                    });
-                                              },
-                                              child: Image.asset(
-                                                "assets/image/icon_union_location.png",
-                                                width: 24.w,
-                                                height: 24.h,
-                                              ),
-                                            ),
-                                            SizedBox(
-                                              width: 16.w,
-                                            ),
-                                            InkWell(
-                                              onTap: () {
-                                                showCallMobile();
-                                              },
-                                              child: Image.asset(
-                                                "assets/image/icon_union_call.png",
-                                                width: 24,
-                                                height: 24,
-                                              ),
-                                            ),
-                                          ],
-                                        ),
-                                      ],
-                                    ),
-                                  ),
-                                  flex: 1,
-                                ),
-                              ],
-                            ),
-                          ),
-                        ),
-                        buildVip(),
-                        Container(
-                          margin: EdgeInsets.only(top: 10.h, bottom: 10.h),
-                          child: ItemTitle(
-                            text: S.of(context).youhuiquan,
-                            imgPath: "assets/image/icon_union_coupons.png",
-                          ),
-                        ),
-                        (storeInfo != null && storeInfo.couponVOList != null)
-                            ? buildCoupon()
-                            : Container(
-                                width: double.infinity,
-                                height: 50.h,
-                                alignment: Alignment.center,
-                                child: Text(
-                                  S.of(context).zanwuyouhuiquankelingqu,
-                                  style: TextStyle(
-                                    fontSize: 14.sp,
-                                    fontWeight: MyFontWeight.semi_bold,
-                                    color: Color(0xFFA0A0A0),
-                                  ),
-                                ),
-                              ),
-                        Container(
-                          margin: EdgeInsets.only(top: 20.h, bottom: 20.h),
-                          child: ItemTitle(
-                            text: S.of(context).xindianhuodong,
-                            imgPath: "assets/image/icon_union_start_store.png",
-                          ),
-                        ),
-                        (activitys != null && activitys.length > 0)
-                            ? Container(
-                                margin: EdgeInsets.only(bottom: 30.h),
-                                child: AspectRatio(
-                                  aspectRatio: 1.55,
-                                  child: buildSwiper2Bottom(),
-                                ),
-                              )
-                            : Container(
-                                width: double.infinity,
-                                height: 30.h,
-                                margin: EdgeInsets.only(bottom: 30.h),
-                                alignment: Alignment.center,
-                                child: Text(
-                                  S.of(context).muqianzanwuxingdianhuodong,
-                                  style: TextStyle(
-                                    fontSize: 14.sp,
-                                    fontWeight: MyFontWeight.semi_bold,
-                                    color: Color(0xFFA0A0A0),
-                                  ),
-                                ),
-                              ),
+                        ///门店信息
+                        StoreInfos(storeInfo),
+
+                        ///门店对应VIP信息
+                        Vip(storeInfo, _receiveVip, isReceive),
+
+                        ///门店对应优惠券
+                        UnionCoupon(storeInfo, _receiveCoupon),
+
+                        /// 门店对应的活动
+                        StoreActivity(widget.arguments, activitys),
                       ],
                     ),
                   ),
@@ -381,356 +173,8 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
     }
   }
 
-  Widget buildVip() {
-    return Container(
-      margin: EdgeInsets.symmetric(
-          vertical: (storeInfo != null && storeInfo.isVip) ? 12.h : 20.h,
-          horizontal: 16.w),
-      padding: EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        image: DecorationImage(
-          fit: BoxFit.fill,
-          image: AssetImage("assets/image/icon_vip_bg.png"),
-        ),
-      ),
-      child: (storeInfo != null && storeInfo.isVip)
-          ? Column(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              mainAxisSize: MainAxisSize.max,
-              children: [
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceAround,
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.baseline,
-                      textBaseline: TextBaseline.alphabetic,
-                      children: [
-                        Text(
-                          S.of(context).huiyuanyue,
-                          style: TextStyle(
-                            fontSize: 16.sp,
-                            fontWeight: MyFontWeight.medium,
-                            color: Colors.white,
-                          ),
-                        ),
-                        SizedBox(
-                          width: 8.w,
-                        ),
-                        Text(
-                          "¥${(storeInfo != null && storeInfo.memberSource != null) ? storeInfo.memberSource.balance : ""}",
-                          style: TextStyle(
-                            fontSize: 14.sp,
-                            fontWeight: MyFontWeight.medium,
-                            color: Colors.white,
-                          ),
-                        ),
-                      ],
-                    ),
-                    Container(
-                      color: Colors.white,
-                      width: 1.w,
-                      height: 20.h,
-                    ),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.baseline,
-                      textBaseline: TextBaseline.alphabetic,
-                      children: [
-                        Text(
-                          S.of(context).huiyuanjifen,
-                          style: TextStyle(
-                            fontSize: 16.sp,
-                            fontWeight: MyFontWeight.medium,
-                            color: Colors.white,
-                          ),
-                        ),
-                        SizedBox(
-                          width: 8.w,
-                        ),
-                        Text(
-                          (storeInfo != null && storeInfo.memberSource != null)
-                              ? "${storeInfo.memberSource.integral}"
-                              : "",
-                          style: TextStyle(
-                            fontSize: 14.sp,
-                            fontWeight: MyFontWeight.medium,
-                            color: Colors.white,
-                          ),
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
-                SizedBox(
-                  height: 10.h,
-                ),
-                Text(
-                  S.of(context).gongxinichengweibendianhuiyuan,
-                  style: TextStyle(
-                    fontSize: 10.sp,
-                    fontWeight: MyFontWeight.medium,
-                    color: Color(0xFFEDC98E),
-                  ),
-                )
-              ],
-            )
-          : Row(
-              children: [
-                Expanded(
-                  child: Column(
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Image.asset(
-                        "assets/image/icon_vip.png",
-                        width: 36.w,
-                        height: 20.h,
-                      ),
-                      SizedBox(
-                        height: 2.h,
-                      ),
-                      Text(
-                        S.of(context).chengweidianpuzhuanshuhuiyuan,
-                        style: TextStyle(
-                          fontSize: 10.sp,
-                          color: Color(0xCFFFFFFF),
-                          fontWeight: MyFontWeight.semi_bold,
-                        ),
-                      ),
-                    ],
-                  ),
-                  flex: 1,
-                ),
-                InkWell(
-                  onTap: () {
-                    receiveVip();
-                  },
-                  child: RoundButton(
-                    text: isReceive
-                        ? S.of(context).dianwolingqu
-                        : S.of(context).yilingqu,
-                    textColor: isReceive ? Colors.white : Color(0xFF484D66),
-                    backgroup: isReceive ? Color(0xFF242B45) : Colors.white,
-                    padding:
-                        EdgeInsets.symmetric(vertical: 5.h, horizontal: 16.w),
-                    radius: 14,
-                  ),
-                ),
-              ],
-            ),
-    );
-  }
-
-  bool isReceive = true;
-
-  Widget buildCoupon() {
-    return Container(
-      height: 109.h,
-      child: ListView.builder(
-        itemCount: (storeInfo != null && storeInfo.couponVOList != null)
-            ? storeInfo.couponVOList.length
-            : 0,
-        physics: BouncingScrollPhysics(parent: PageScrollPhysics()),
-        scrollDirection: Axis.horizontal,
-        itemBuilder: (context, position) {
-          return Container(
-            width: MediaQuery.of(context).size.width * 0.784,
-            margin: EdgeInsets.only(left: 6.w),
-            child: AspectRatio(
-              aspectRatio: 2.86,
-              child: Stack(
-                children: [
-                  Image.asset(
-                    "assets/image/icon_union_coupons_bg.png",
-                    fit: BoxFit.fill,
-                    width: double.infinity,
-                    height: double.infinity,
-                  ),
-                  Container(
-                    padding: EdgeInsets.only(
-                      left: 24.w,
-                      right: 24.w,
-                      bottom: 17.h,
-                      top: 11.h,
-                    ),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      crossAxisAlignment: CrossAxisAlignment.center,
-                      children: [
-                        Container(
-                          margin: EdgeInsets.only(left: 5),
-                          child: Text.rich(TextSpan(children: [
-                            TextSpan(
-                              text: (storeInfo != null &&
-                                      storeInfo.couponVOList != null &&
-                                      storeInfo
-                                              .couponVOList[position].bizType ==
-                                          1)
-                                  ? "¥"
-                                  : "",
-                              style: TextStyle(
-                                fontSize: 22.sp,
-                                color: Color(0xFFFF7A1A),
-                                fontWeight: MyFontWeight.semi_bold,
-                              ),
-                            ),
-                            TextSpan(
-                              text: (storeInfo != null &&
-                                      storeInfo.couponVOList != null &&
-                                      storeInfo
-                                              .couponVOList[position].bizType ==
-                                          1)
-                                  ? "${double.tryParse(storeInfo.couponVOList[position].discountAmount).toInt()}"
-                                  : (storeInfo != null &&
-                                          storeInfo.couponVOList != null &&
-                                          storeInfo.couponVOList[position]
-                                                  .bizType ==
-                                              5)
-                                      ? S.of(context).duihuanquan
-                                      : "${storeInfo.couponVOList[position].discountPercent ~/ 10}折",
-                              style: TextStyle(
-                                fontSize: 36.sp,
-                                color: Color(0xFFFF7A1A),
-                                fontWeight: MyFontWeight.semi_bold,
-                              ),
-                            ),
-                          ])),
-                          alignment: Alignment.center,
-                        ),
-                        Container(
-                          margin: EdgeInsets.only(
-                            top: 12.h,
-                            bottom: 12.h,
-                            left: 15.w,
-                            right: 24.w,
-                          ),
-                          child: MySeparator(
-                            width: 1.w,
-                            height: 5.h,
-                            color: Color(0xFF979797),
-                          ),
-                        ),
-                        Expanded(
-                          child: Container(
-                            margin: EdgeInsets.only(
-                              bottom: 12.h,
-                              top: 12.h,
-                            ),
-                            child: Column(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Text(
-                                  (storeInfo != null &&
-                                          storeInfo.couponVOList != null)
-                                      ? storeInfo
-                                          .couponVOList[position].couponName
-                                      : "",
-                                  maxLines: 1,
-                                  overflow: TextOverflow.ellipsis,
-                                  style: TextStyle(
-                                    fontSize: 10.sp,
-                                    fontWeight: MyFontWeight.semi_bold,
-                                    color: Color(0xFF727272),
-                                  ),
-                                ),
-                                Text(
-                                  (storeInfo != null &&
-                                          storeInfo.couponVOList != null)
-                                      ? (storeInfo.couponVOList[position]
-                                                  .bizType ==
-                                              1
-                                          ? S.of(context).manlijiandaijinquan(
-                                              double.tryParse(storeInfo
-                                                      .couponVOList[position]
-                                                      .fullAmount)
-                                                  .toInt(),
-                                              double.tryParse(storeInfo
-                                                      .couponVOList[position]
-                                                      .discountAmount)
-                                                  .toInt())
-                                          : S.of(context).quanchangzhe(storeInfo
-                                              .couponVOList[position]
-                                              .discountPercent))
-                                      : "",
-                                  overflow: TextOverflow.ellipsis,
-                                  style: TextStyle(
-                                    fontSize: 12.sp,
-                                    fontWeight: MyFontWeight.semi_bold,
-                                    color: Color(0xFFFF7A1A),
-                                  ),
-                                ),
-                                Text(
-                                  S.of(context).youxiaoqizhi(
-                                        (storeInfo != null &&
-                                                storeInfo.couponVOList !=
-                                                    null &&
-                                                // storeInfo.couponVOList[position].useStartTime != null &&
-                                                storeInfo.couponVOList[position]
-                                                        .useEndTime !=
-                                                    null)
-                                            // ? "${storeInfo.couponVOList[position].useStartTime.replaceAll("-", ".").split(" ")[0]}-${storeInfo.couponVOList[position].useEndTime.replaceAll("-", ".").split(" ")[0]}"
-                                            ? "${storeInfo.couponVOList[position].useEndTime.replaceAll("-", ".").split(" ")[0]}"
-                                            : "",
-                                      ),
-                                  overflow: TextOverflow.ellipsis,
-                                  maxLines: 1,
-                                  style: TextStyle(
-                                    fontSize: 8.sp,
-                                    color: Color(0xFFA29E9E),
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-                        ),
-                        InkWell(
-                          onTap: () {
-                            if (storeInfo != null &&
-                                storeInfo.couponVOList != null &&
-                                storeInfo.couponVOList[position].status == 0) {
-                              receiveCoupon(
-                                  storeInfo.couponVOList[position].id);
-                            }
-                          },
-                          child: Container(
-                            height: 25.h,
-                            child: RoundButton(
-                              text: (storeInfo != null &&
-                                      storeInfo.couponVOList != null &&
-                                      storeInfo.couponVOList[position].status >
-                                          0)
-                                  ? S.of(context).yilingqu
-                                  : S.of(context).lingqu,
-                              textColor: Colors.white,
-                              backgroup: (storeInfo != null &&
-                                      storeInfo.couponVOList != null &&
-                                      storeInfo.couponVOList[position].status >
-                                          0)
-                                  ? Colors.grey
-                                  : Color(0xFF32A060),
-                              padding: EdgeInsets.symmetric(
-                                  horizontal: 8.w, vertical: 4.h),
-                              fontSize: 12.sp,
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          );
-        },
-      ),
-    );
-  }
-
   ///领取优惠券
-  receiveCoupon(couponId) async {
+  _receiveCoupon(couponId) async {
     BaseData baseData = await apiService.receiveCoupon(couponId);
     if (baseData != null && baseData.isSuccess) {
       queryStoreInfo();
@@ -749,8 +193,10 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
     );
   }
 
+  bool isReceive = true;
+
   ///领取VIP
-  receiveVip() async {
+  _receiveVip() async {
     BaseData baseData = await apiService.minLogin(storeInfo.id);
     if (baseData != null && baseData.isSuccess) {
       SmartDialog.showToast(S.of(context).lingquchenggong,
@@ -761,169 +207,6 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
     }
   }
 
-  Widget buildSwiper2Bottom() {
-    return Container(
-      child: Swiper(
-        viewportFraction: 0.95,
-        loop: false,
-        itemBuilder: (context, position) {
-          return InkWell(
-            onTap: () {
-              if (widget.arguments["source"] != null &&
-                  widget.arguments["source"] == activitys[position].id) {
-                Navigator.of(context).pop();
-              } else {
-                Navigator.of(context).pushNamed('/router/web_page',
-                    arguments: {
-                      "activityId": activitys[position].id,
-                      "source": widget.arguments["id"]
-                    });
-              }
-            },
-            child: Container(
-              margin: EdgeInsets.symmetric(horizontal: 5.w),
-              decoration: BoxDecoration(
-                color: Colors.white,
-                borderRadius: BorderRadius.circular(8),
-                boxShadow: [
-                  BoxShadow(
-                    color: Color(0x0D000000),
-                    offset: Offset(0, 3),
-                    blurRadius: 14,
-                    spreadRadius: 0,
-                  )
-                ],
-              ),
-              child: Stack(
-                children: [
-                  Container(
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisSize: MainAxisSize.max,
-                      children: [
-                        MImage(
-                          (activitys != null && activitys.length > position)
-                              ? activitys[position].coverImg
-                              : "",
-                          aspectRatio: 2.2,
-                          radius: BorderRadius.vertical(
-                            top: Radius.circular(8),
-                          ),
-                          fit: BoxFit.cover,
-                          errorSrc: "assets/image/default_2_1.png",
-                          fadeSrc: "assets/image/default_2_1.png",
-                        ),
-                        Container(
-                          padding: EdgeInsets.all(8),
-                          child: Column(
-                            mainAxisAlignment: MainAxisAlignment.start,
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Text(
-                                (activitys != null &&
-                                        activitys.length > position)
-                                    ? activitys[position].storeName
-                                    : "",
-                                style: TextStyle(
-                                  fontSize: 14.sp,
-                                  fontWeight: MyFontWeight.semi_bold,
-                                  color: Color(0xFF000000),
-                                ),
-                              ),
-                              SizedBox(
-                                height: 4.h,
-                              ),
-                              Text(
-                                (activitys != null &&
-                                        activitys.length > position)
-                                    ? activitys[position].mainTitle
-                                    : "",
-                                style: TextStyle(
-                                  fontSize: 12.sp,
-                                  fontWeight: MyFontWeight.semi_bold,
-                                  color: Color(0xFF727272),
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  Positioned(
-                    top: 0,
-                    right: 0,
-                    child: Container(
-                      padding: EdgeInsets.symmetric(
-                        vertical: 4.h,
-                        horizontal: 8.w,
-                      ),
-                      decoration: BoxDecoration(
-                        color: Colors.black.withAlpha(76),
-                        borderRadius: BorderRadius.only(
-                          bottomLeft: Radius.circular(8),
-                          topRight: Radius.circular(8),
-                        ),
-                      ),
-                      child: Text(
-                        (activitys != null && activitys.length > position)
-                            ? activitys[position].startTime.split(" ")[0]
-                            : "",
-                        style: TextStyle(
-                          fontWeight: MyFontWeight.semi_bold,
-                          fontSize: 12.sp,
-                          color: Color(0xD9FFFFFF),
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          );
-        },
-        itemCount:
-            (activitys != null && activitys.length > 0) ? activitys.length : 0,
-      ),
-    );
-  }
-
-  Widget buildSwiper() {
-    return Container(
-      child: Swiper(
-          pagination: SwiperPagination(
-            alignment: Alignment.bottomCenter,
-            builder: DotSwiperPaginationBuilder(
-              size: 8.w,
-              activeSize: 8.w,
-              space: 5.w,
-              activeColor: Colors.white,
-              color: Colors.white.withAlpha(76),
-            ),
-          ),
-          itemBuilder: (context, position) {
-            return Container(
-              margin: EdgeInsets.only(left: 10.w, right: 10.w),
-              child: MImage(
-                (storeInfo != null &&
-                        storeInfo.bannerList != null &&
-                        position < storeInfo.bannerList.length)
-                    ? storeInfo.bannerList[position].imgUrl
-                    : "",
-                fit: BoxFit.cover,
-                radius: BorderRadius.circular(4),
-                errorSrc: "assets/image/default_2_1.png",
-                fadeSrc: "assets/image/default_2_1.png",
-              ),
-            );
-          },
-          itemCount: (storeInfo != null && storeInfo.bannerList != null)
-              ? storeInfo.bannerList.length
-              : 1),
-    );
-  }
-
   printMin() async {
     String miniAppId = storeInfo.mini.miniAppId;
     debugPrint("print isExistsApp: ${await Min.isExistsApp(miniAppId)}");
@@ -972,13 +255,6 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
         await Min.reloadWgt(miniAppId, filePath);
       }
     }
-//baseURL : 'http://192.168.10.130:8765/app/',  // 本地
-//baseURL : 'http://192.168.10.236:8766/app/',  // 本地
-// baseURL : 'https://pos-test.api.lotus-wallet.com/app/', //测试
-// baseURL : 'https://pos.api.lotus-wallet.com/app/', //线上
-// socketUrl: 'ws://192.168.10.130:9999/cart',  // 本地
-// socketUrl : 'wss://pos-test.api.lotus-wallet.com:10005/cart', //测试
-// socketUrl : 'wss://pos.api.lotus-wallet.com:10015/cart', //线上
 
     SharedPreferences sharedPreferences = await SharedPreferences.getInstance();
     String nickname = sharedPreferences.getString("nick");
@@ -1008,7 +284,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
   }
 
   double progressValue = 0;
-  String downText = "正在下载中...";
+  String downText = S.current.zhengzaixiazaizhong;
 
   downloadWgt(appid, savePath) async {
     downText = S.of(context).zhengzaixiazaizhong;
@@ -1019,7 +295,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
       EasyLoading.showProgress(progressValue, status: downText);
     });
     if (response.statusCode == 200) {
-      downText = "下载完成";
+      downText = S.of(context).xiazaiwancheng;
       EasyLoading.showProgress(progressValue, status: downText);
       SharedPreferences.getInstance().then((value) {
         value.setStringList(
@@ -1037,64 +313,4 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
     });
   }
 
-  List<Widget> itemServer(String businessService) {
-    if (businessService == null || businessService == "") return [];
-    var list = businessService.split(",");
-    return list
-        .map((e) => Container(
-              margin: EdgeInsets.only(right: 8.w),
-              child: RoundButton(
-                height: 14.h * AppUtils.textScale(context),
-                text: "$e",
-                backgroup: Color(0xFFFF7A1A),
-                padding: EdgeInsets.only(
-                  left: 2.w,
-                  right: 2.w,
-                ),
-                fontSize: 10.sp,
-                textColor: Colors.white,
-              ),
-            ))
-        .toList();
-  }
-
-  showCallMobile() {
-    showCupertinoModalPopup(
-        context: context,
-        builder: (context) {
-          return CupertinoActionSheet(
-            title: Text(S.of(context).bodadianhua),
-            actions: [
-              if (storeInfo != null &&
-                  storeInfo.headMobile != null &&
-                  storeInfo.headMobile != "")
-                CupertinoActionSheetAction(
-                  child: Text(storeInfo.headMobile),
-                  onPressed: () {
-                    callMobile(storeInfo.headMobile);
-                    Navigator.of(context).pop();
-                  },
-                  isDefaultAction: true,
-                  isDestructiveAction: false,
-                ),
-            ],
-            cancelButton: CupertinoActionSheetAction(
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
-              child: Text(S.of(context).quxiao),
-              isDestructiveAction: true,
-            ),
-          );
-        });
-  }
-
-  callMobile(mobile) async {
-    String url = "tel:$mobile";
-    if (await canLaunch(url)) {
-      await launch(url);
-    } else {
-      throw 'Could not launch $url';
-    }
-  }
 }
diff --git a/lib/union/union_view/store_activity.dart b/lib/union/union_view/store_activity.dart
new file mode 100644
index 00000000..bdf24aab
--- /dev/null
+++ b/lib/union/union_view/store_activity.dart
@@ -0,0 +1,195 @@
+
+
+
+import 'package:flutter/material.dart';
+import 'package:flutter_swiper/flutter_swiper.dart';
+import 'package:huixiang/generated/l10n.dart';
+import 'package:huixiang/retrofit/data/activity.dart';
+import 'package:huixiang/utils/font_weight.dart';
+import 'package:huixiang/view_widget/custom_image.dart';
+import 'package:huixiang/view_widget/item_title.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class StoreActivity extends StatefulWidget {
+
+  final Map arguments;
+  final List<Activity> activitys;
+
+  StoreActivity(this.arguments, this.activitys);
+
+  @override
+  State<StatefulWidget> createState() {
+    return _StoreActivity();
+  }
+
+}
+
+class _StoreActivity extends State<StoreActivity> {
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Container(
+          margin: EdgeInsets.only(top: 20.h, bottom: 20.h),
+          child: ItemTitle(
+            text: S.of(context).xindianhuodong,
+            imgPath: "assets/image/icon_union_start_store.png",
+          ),
+        ),
+        (widget.activitys != null && widget.activitys.length > 0)
+            ? Container(
+          margin: EdgeInsets.only(bottom: 30.h),
+          child: AspectRatio(
+            aspectRatio: 1.55,
+            child: buildSwiper2Bottom(),
+          ),
+        )
+            : Container(
+          width: double.infinity,
+          height: 30.h,
+          margin: EdgeInsets.only(bottom: 30.h),
+          alignment: Alignment.center,
+          child: Text(
+            S.of(context).muqianzanwuxingdianhuodong,
+            style: TextStyle(
+              fontSize: 14.sp,
+              fontWeight: MyFontWeight.semi_bold,
+              color: Color(0xFFA0A0A0),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+
+  Widget buildSwiper2Bottom() {
+    return Container(
+      child: Swiper(
+        viewportFraction: 0.95,
+        loop: false,
+        itemBuilder: (context, position) {
+          return InkWell(
+            onTap: () {
+              if (widget.arguments["source"] != null &&
+                  widget.arguments["source"] == widget.activitys[position].id) {
+                Navigator.of(context).pop();
+              } else {
+                Navigator.of(context).pushNamed('/router/web_page',
+                    arguments: {
+                      "activityId": widget.activitys[position].id,
+                      "source": widget.arguments["id"]
+                    });
+              }
+            },
+            child: Container(
+              margin: EdgeInsets.symmetric(horizontal: 5.w),
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.circular(8),
+                boxShadow: [
+                  BoxShadow(
+                    color: Color(0x0D000000),
+                    offset: Offset(0, 3),
+                    blurRadius: 14,
+                    spreadRadius: 0,
+                  )
+                ],
+              ),
+              child: Stack(
+                children: [
+                  Container(
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisSize: MainAxisSize.max,
+                      children: [
+                        MImage(
+                          (widget.activitys != null && widget.activitys.length > position)
+                              ? widget.activitys[position].coverImg
+                              : "",
+                          aspectRatio: 2.2,
+                          radius: BorderRadius.vertical(
+                            top: Radius.circular(8),
+                          ),
+                          fit: BoxFit.cover,
+                          errorSrc: "assets/image/default_2_1.png",
+                          fadeSrc: "assets/image/default_2_1.png",
+                        ),
+                        Container(
+                          padding: EdgeInsets.all(8),
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.start,
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                (widget.activitys != null &&
+                                    widget.activitys.length > position)
+                                    ? widget.activitys[position].storeName
+                                    : "",
+                                style: TextStyle(
+                                  fontSize: 14.sp,
+                                  fontWeight: MyFontWeight.semi_bold,
+                                  color: Color(0xFF000000),
+                                ),
+                              ),
+                              SizedBox(
+                                height: 4.h,
+                              ),
+                              Text(
+                                (widget.activitys != null &&
+                                    widget.activitys.length > position)
+                                    ? widget.activitys[position].mainTitle
+                                    : "",
+                                style: TextStyle(
+                                  fontSize: 12.sp,
+                                  fontWeight: MyFontWeight.semi_bold,
+                                  color: Color(0xFF727272),
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  Positioned(
+                    top: 0,
+                    right: 0,
+                    child: Container(
+                      padding: EdgeInsets.symmetric(
+                        vertical: 4.h,
+                        horizontal: 8.w,
+                      ),
+                      decoration: BoxDecoration(
+                        color: Colors.black.withAlpha(76),
+                        borderRadius: BorderRadius.only(
+                          bottomLeft: Radius.circular(8),
+                          topRight: Radius.circular(8),
+                        ),
+                      ),
+                      child: Text(
+                        (widget.activitys != null && widget.activitys.length > position)
+                            ? widget.activitys[position].startTime.split(" ")[0]
+                            : "",
+                        style: TextStyle(
+                          fontWeight: MyFontWeight.semi_bold,
+                          fontSize: 12.sp,
+                          color: Color(0xD9FFFFFF),
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          );
+        },
+        itemCount:
+        (widget.activitys != null && widget.activitys.length > 0) ? widget.activitys.length : 0,
+      ),
+    );
+  }
+
+
+}
\ No newline at end of file
diff --git a/lib/union/union_view/store_info.dart b/lib/union/union_view/store_info.dart
new file mode 100644
index 00000000..64ad292a
--- /dev/null
+++ b/lib/union/union_view/store_info.dart
@@ -0,0 +1,299 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_swiper/flutter_swiper.dart';
+import 'package:huixiang/generated/l10n.dart';
+import 'package:huixiang/retrofit/data/store_info.dart';
+import 'package:huixiang/utils/flutter_utils.dart';
+import 'package:huixiang/utils/font_weight.dart';
+import 'package:huixiang/view_widget/custom_image.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:huixiang/view_widget/round_button.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class StoreInfos extends StatefulWidget {
+
+  final StoreInfo storeInfo;
+
+  StoreInfos(this.storeInfo);
+
+  @override
+  State<StatefulWidget> createState() {
+    return _StoreInfos();
+  }
+
+}
+
+class _StoreInfos extends State<StoreInfos> {
+  @override
+  Widget build(BuildContext context) {
+    return AspectRatio(
+      aspectRatio: 1,
+      child: Container(
+        margin: EdgeInsets.fromLTRB(16, 20, 16, 8),
+        padding: EdgeInsets.fromLTRB(10, 20, 10, 14),
+        decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.circular(8),
+          boxShadow: [
+            BoxShadow(
+              color: Colors.black.withAlpha(25),
+              offset: Offset(0, 1),
+              blurRadius: 12,
+              spreadRadius: 0,
+            ),
+          ],
+        ),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.spaceAround,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            AspectRatio(
+              aspectRatio: 1.8,
+              child: buildSwiper(),
+            ),
+            Expanded(
+              child: Container(
+                margin: EdgeInsets.only(
+                  left: 10.w,
+                  right: 10.w,
+                  top: 16.h,
+                ),
+                child: Column(
+                  mainAxisAlignment:
+                  MainAxisAlignment.spaceBetween,
+                  crossAxisAlignment:
+                  CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Text(
+                          widget.storeInfo != null
+                              ? widget.storeInfo.storeName
+                              : "",
+                          style: TextStyle(
+                            fontSize: 16.sp,
+                            color: Colors.black,
+                            fontWeight: MyFontWeight.medium,
+                          ),
+                        ),
+                        Expanded(
+                          child: Container(
+                            alignment:
+                            Alignment.centerRight,
+                            child: Text(
+                              S.of(context).ren(
+                                widget.storeInfo != null
+                                    ? widget.storeInfo
+                                    .perCapitaConsumption
+                                    : "",
+                              ),
+                              style: TextStyle(
+                                fontSize: 14.sp,
+                                fontWeight: MyFontWeight.regular,
+                                color: Color(0xFF353535),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                    Text(
+                      widget.storeInfo != null
+                          ? widget.storeInfo.address
+                          : "",
+                      maxLines: 2,
+                      textAlign: TextAlign.justify,
+                      style: TextStyle(
+                        color: Color(0xFF353535),
+                        fontWeight: MyFontWeight.regular,
+                        fontSize: 12.sp,
+                      ),
+                    ),
+                    Row(
+                      children: itemServer(
+                        widget.storeInfo != null
+                            ? widget.storeInfo.businessService
+                            : "",
+                      ),
+                    ),
+                    Row(
+                      mainAxisAlignment:
+                      MainAxisAlignment.spaceBetween,
+                      crossAxisAlignment:
+                      CrossAxisAlignment.end,
+                      children: [
+                        Expanded(
+                          child: Text(
+                            S.of(context).yingyeshijian(widget.storeInfo ==
+                                null
+                                ? ""
+                                : (widget.storeInfo.openStartTime ==
+                                null &&
+                                widget.storeInfo
+                                    .openEndTime ==
+                                    null)
+                                ? S.of(context).quantian
+                                : "${widget.storeInfo.openStartTime.substring(0, widget.storeInfo.openStartTime.lastIndexOf(":"))} "
+                                "- ${widget.storeInfo.openEndTime.substring(0, widget.storeInfo.openEndTime.lastIndexOf(":"))}"),
+                            style: TextStyle(
+                              color: Color(0xFF353535),
+                              fontWeight: MyFontWeight.regular,
+                              fontSize: 12.sp,
+                            ),
+                          ),
+                        ),
+                        SizedBox(
+                          width: 16.w,
+                        ),
+                        InkWell(
+                          onTap: () {
+                            if (widget.storeInfo == null ||
+                                widget.storeInfo.latitude ==
+                                    null ||
+                                widget.storeInfo.longitude ==
+                                    null ||
+                                widget.storeInfo.latitude == "" ||
+                                widget.storeInfo.longitude == "")
+                              return;
+                            Navigator.of(context).pushNamed(
+                                '/router/location_map',
+                                arguments: {
+                                  "lat": widget.storeInfo.latitude,
+                                  "lng":
+                                  widget.storeInfo.longitude,
+                                  "storeName":
+                                  widget.storeInfo.storeName,
+                                });
+                          },
+                          child: Image.asset(
+                            "assets/image/icon_union_location.png",
+                            width: 24.w,
+                            height: 24.h,
+                          ),
+                        ),
+                        SizedBox(
+                          width: 16.w,
+                        ),
+                        InkWell(
+                          onTap: () {
+                            showCallMobile();
+                          },
+                          child: Image.asset(
+                            "assets/image/icon_union_call.png",
+                            width: 24,
+                            height: 24,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+              flex: 1,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget buildSwiper() {
+    return Container(
+      child: Swiper(
+          pagination: SwiperPagination(
+            alignment: Alignment.bottomCenter,
+            builder: DotSwiperPaginationBuilder(
+              size: 8.w,
+              activeSize: 8.w,
+              space: 5.w,
+              activeColor: Colors.white,
+              color: Colors.white.withAlpha(76),
+            ),
+          ),
+          itemBuilder: (context, position) {
+            return Container(
+              margin: EdgeInsets.only(left: 10.w, right: 10.w),
+              child: MImage(
+                (widget.storeInfo != null &&
+                    widget.storeInfo.bannerList != null &&
+                    position < widget.storeInfo.bannerList.length)
+                    ? widget.storeInfo.bannerList[position].imgUrl
+                    : "",
+                fit: BoxFit.cover,
+                radius: BorderRadius.circular(4),
+                errorSrc: "assets/image/default_2_1.png",
+                fadeSrc: "assets/image/default_2_1.png",
+              ),
+            );
+          },
+          itemCount: (widget.storeInfo != null && widget.storeInfo.bannerList != null)
+              ? widget.storeInfo.bannerList.length
+              : 1),
+    );
+  }
+
+
+  List<Widget> itemServer(String businessService) {
+    if (businessService == null || businessService == "") return [];
+    var list = businessService.split(",");
+    return list
+        .map((e) => Container(
+      margin: EdgeInsets.only(right: 8.w),
+      child: RoundButton(
+        height: 14.h * AppUtils.textScale(context),
+        text: "$e",
+        backgroup: Color(0xFFFF7A1A),
+        padding: EdgeInsets.only(
+          left: 2.w,
+          right: 2.w,
+        ),
+        fontSize: 10.sp,
+        textColor: Colors.white,
+      ),
+    ))
+        .toList();
+  }
+
+  showCallMobile() {
+    showCupertinoModalPopup(
+        context: context,
+        builder: (context) {
+          return CupertinoActionSheet(
+            title: Text(S.of(context).bodadianhua),
+            actions: [
+              if (widget.storeInfo != null &&
+                  widget.storeInfo.headMobile != null &&
+                  widget.storeInfo.headMobile != "")
+                CupertinoActionSheetAction(
+                  child: Text(widget.storeInfo.headMobile),
+                  onPressed: () {
+                    callMobile(widget.storeInfo.headMobile);
+                    Navigator.of(context).pop();
+                  },
+                  isDefaultAction: true,
+                  isDestructiveAction: false,
+                ),
+            ],
+            cancelButton: CupertinoActionSheetAction(
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              child: Text(S.of(context).quxiao),
+              isDestructiveAction: true,
+            ),
+          );
+        });
+  }
+
+  callMobile(mobile) async {
+    String url = "tel:$mobile";
+    if (await canLaunch(url)) {
+      await launch(url);
+    } else {
+      throw 'Could not launch $url';
+    }
+  }
+
+}
+
+
diff --git a/lib/union/union_view/union_coupon.dart b/lib/union/union_view/union_coupon.dart
new file mode 100644
index 00000000..4bb696ff
--- /dev/null
+++ b/lib/union/union_view/union_coupon.dart
@@ -0,0 +1,264 @@
+
+
+
+
+import 'package:flutter/material.dart';
+import 'package:huixiang/generated/l10n.dart';
+import 'package:huixiang/retrofit/data/store_info.dart';
+import 'package:huixiang/utils/font_weight.dart';
+import 'package:huixiang/view_widget/item_title.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:huixiang/view_widget/round_button.dart';
+import 'package:huixiang/view_widget/separator.dart';
+
+class UnionCoupon extends StatefulWidget {
+
+  final StoreInfo storeInfo;
+  final Function(String id) receiveCoupon;
+  UnionCoupon(this.storeInfo, this.receiveCoupon);
+
+  @override
+  State<StatefulWidget> createState() {
+    return _UnionCoupon();
+  }
+
+}
+
+class _UnionCoupon extends State<UnionCoupon> {
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Container(
+          margin: EdgeInsets.only(top: 10.h, bottom: 10.h),
+          child: ItemTitle(
+            text: S.of(context).youhuiquan,
+            imgPath: "assets/image/icon_union_coupons.png",
+          ),
+        ),
+        (widget.storeInfo != null && widget.storeInfo.couponVOList != null)
+            ? buildCoupon()
+            : Container(
+          width: double.infinity,
+          height: 50.h,
+          alignment: Alignment.center,
+          child: Text(
+            S.of(context).zanwuyouhuiquankelingqu,
+            style: TextStyle(
+              fontSize: 14.sp,
+              fontWeight: MyFontWeight.semi_bold,
+              color: Color(0xFFA0A0A0),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+
+  Widget buildCoupon() {
+    return Container(
+      height: 109.h,
+      child: ListView.builder(
+        itemCount: (widget.storeInfo != null && widget.storeInfo.couponVOList != null)
+            ? widget.storeInfo.couponVOList.length
+            : 0,
+        physics: BouncingScrollPhysics(parent: PageScrollPhysics()),
+        scrollDirection: Axis.horizontal,
+        itemBuilder: (context, position) {
+          return Container(
+            width: MediaQuery.of(context).size.width * 0.784,
+            margin: EdgeInsets.only(left: 6.w),
+            child: AspectRatio(
+              aspectRatio: 2.86,
+              child: Stack(
+                children: [
+                  Image.asset(
+                    "assets/image/icon_union_coupons_bg.png",
+                    fit: BoxFit.fill,
+                    width: double.infinity,
+                    height: double.infinity,
+                  ),
+                  Container(
+                    padding: EdgeInsets.only(
+                      left: 24.w,
+                      right: 24.w,
+                      bottom: 17.h,
+                      top: 11.h,
+                    ),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        Container(
+                          margin: EdgeInsets.only(left: 5),
+                          child: Text.rich(TextSpan(children: [
+                            TextSpan(
+                              text: (widget.storeInfo != null &&
+                                  widget.storeInfo.couponVOList != null &&
+                                  widget.storeInfo
+                                      .couponVOList[position].bizType ==
+                                      1)
+                                  ? "¥"
+                                  : "",
+                              style: TextStyle(
+                                fontSize: 22.sp,
+                                color: Color(0xFFFF7A1A),
+                                fontWeight: MyFontWeight.semi_bold,
+                              ),
+                            ),
+                            TextSpan(
+                              text: (widget.storeInfo != null &&
+                                  widget.storeInfo.couponVOList != null &&
+                                  widget.storeInfo
+                                      .couponVOList[position].bizType ==
+                                      1)
+                                  ? "${double.tryParse(widget.storeInfo.couponVOList[position].discountAmount).toInt()}"
+                                  : (widget.storeInfo != null &&
+                                  widget.storeInfo.couponVOList != null &&
+                                  widget.storeInfo.couponVOList[position]
+                                      .bizType ==
+                                      5)
+                                  ? S.of(context).duihuanquan
+                                  : "${widget.storeInfo.couponVOList[position].discountPercent ~/ 10}折",
+                              style: TextStyle(
+                                fontSize: 36.sp,
+                                color: Color(0xFFFF7A1A),
+                                fontWeight: MyFontWeight.semi_bold,
+                              ),
+                            ),
+                          ])),
+                          alignment: Alignment.center,
+                        ),
+                        Container(
+                          margin: EdgeInsets.only(
+                            top: 12.h,
+                            bottom: 12.h,
+                            left: 15.w,
+                            right: 24.w,
+                          ),
+                          child: MySeparator(
+                            width: 1.w,
+                            height: 5.h,
+                            color: Color(0xFF979797),
+                          ),
+                        ),
+                        Expanded(
+                          child: Container(
+                            margin: EdgeInsets.only(
+                              bottom: 12.h,
+                              top: 12.h,
+                            ),
+                            child: Column(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(
+                                  (widget.storeInfo != null &&
+                                      widget.storeInfo.couponVOList != null)
+                                      ? widget.storeInfo
+                                      .couponVOList[position].couponName
+                                      : "",
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: TextStyle(
+                                    fontSize: 10.sp,
+                                    fontWeight: MyFontWeight.semi_bold,
+                                    color: Color(0xFF727272),
+                                  ),
+                                ),
+                                Text(
+                                  (widget.storeInfo != null &&
+                                      widget.storeInfo.couponVOList != null)
+                                      ? (widget.storeInfo.couponVOList[position]
+                                      .bizType ==
+                                      1
+                                      ? S.of(context).manlijiandaijinquan(
+                                      double.tryParse(widget.storeInfo
+                                          .couponVOList[position]
+                                          .fullAmount)
+                                          .toInt(),
+                                      double.tryParse(widget.storeInfo
+                                          .couponVOList[position]
+                                          .discountAmount)
+                                          .toInt())
+                                      : S.of(context).quanchangzhe(widget.storeInfo
+                                      .couponVOList[position]
+                                      .discountPercent))
+                                      : "",
+                                  overflow: TextOverflow.ellipsis,
+                                  style: TextStyle(
+                                    fontSize: 12.sp,
+                                    fontWeight: MyFontWeight.semi_bold,
+                                    color: Color(0xFFFF7A1A),
+                                  ),
+                                ),
+                                Text(
+                                  S.of(context).youxiaoqizhi(
+                                    (widget.storeInfo != null &&
+                                        widget.storeInfo.couponVOList !=
+                                            null &&
+                                        // widget.storeInfo.couponVOList[position].useStartTime != null &&
+                                        widget.storeInfo.couponVOList[position]
+                                            .useEndTime !=
+                                            null)
+                                    // ? "${widget.storeInfo.couponVOList[position].useStartTime.replaceAll("-", ".").split(" ")[0]}-${widget.storeInfo.couponVOList[position].useEndTime.replaceAll("-", ".").split(" ")[0]}"
+                                        ? "${widget.storeInfo.couponVOList[position].useEndTime.replaceAll("-", ".").split(" ")[0]}"
+                                        : "",
+                                  ),
+                                  overflow: TextOverflow.ellipsis,
+                                  maxLines: 1,
+                                  style: TextStyle(
+                                    fontSize: 8.sp,
+                                    color: Color(0xFFA29E9E),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                        InkWell(
+                          onTap: () {
+                            if (widget.storeInfo != null &&
+                                widget.storeInfo.couponVOList != null &&
+                                widget.storeInfo.couponVOList[position].status == 0) {
+                              widget.receiveCoupon(
+                                  widget.storeInfo.couponVOList[position].id);
+                            }
+                          },
+                          child: Container(
+                            height: 25.h,
+                            child: RoundButton(
+                              text: (widget.storeInfo != null &&
+                                  widget.storeInfo.couponVOList != null &&
+                                  widget.storeInfo.couponVOList[position].status >
+                                      0)
+                                  ? S.of(context).yilingqu
+                                  : S.of(context).lingqu,
+                              textColor: Colors.white,
+                              backgroup: (widget.storeInfo != null &&
+                                  widget.storeInfo.couponVOList != null &&
+                                  widget.storeInfo.couponVOList[position].status >
+                                      0)
+                                  ? Colors.grey
+                                  : Color(0xFF32A060),
+                              padding: EdgeInsets.symmetric(
+                                  horizontal: 8.w, vertical: 4.h),
+                              fontSize: 12.sp,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+
+}
\ No newline at end of file
diff --git a/lib/union/union_view/vip.dart b/lib/union/union_view/vip.dart
new file mode 100644
index 00000000..485d2005
--- /dev/null
+++ b/lib/union/union_view/vip.dart
@@ -0,0 +1,170 @@
+
+
+
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:huixiang/generated/l10n.dart';
+import 'package:huixiang/retrofit/data/store_info.dart';
+import 'package:huixiang/utils/font_weight.dart';
+import 'package:huixiang/view_widget/round_button.dart';
+
+class Vip extends StatefulWidget {
+
+  final StoreInfo storeInfo;
+  final Function receiveVip;
+  final bool isReceive;
+  Vip(this.storeInfo, this.receiveVip, this.isReceive);
+
+  @override
+  State<StatefulWidget> createState() {
+    return _Vip();
+  }
+
+}
+
+class _Vip extends State<Vip> {
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: EdgeInsets.symmetric(
+          vertical: (widget.storeInfo != null && widget.storeInfo.isVip) ? 12.h : 20.h,
+          horizontal: 16.w),
+      padding: EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        image: DecorationImage(
+          fit: BoxFit.fill,
+          image: AssetImage("assets/image/icon_vip_bg.png"),
+        ),
+      ),
+      child: (widget.storeInfo != null && widget.storeInfo.isVip)
+          ? Column(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        mainAxisSize: MainAxisSize.max,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceAround,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.baseline,
+                textBaseline: TextBaseline.alphabetic,
+                children: [
+                  Text(
+                    S.of(context).huiyuanyue,
+                    style: TextStyle(
+                      fontSize: 16.sp,
+                      fontWeight: MyFontWeight.medium,
+                      color: Colors.white,
+                    ),
+                  ),
+                  SizedBox(
+                    width: 8.w,
+                  ),
+                  Text(
+                    "¥${(widget.storeInfo != null && widget.storeInfo.memberSource != null) ? widget.storeInfo.memberSource.balance : ""}",
+                    style: TextStyle(
+                      fontSize: 14.sp,
+                      fontWeight: MyFontWeight.medium,
+                      color: Colors.white,
+                    ),
+                  ),
+                ],
+              ),
+              Container(
+                color: Colors.white,
+                width: 1.w,
+                height: 20.h,
+              ),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.baseline,
+                textBaseline: TextBaseline.alphabetic,
+                children: [
+                  Text(
+                    S.of(context).huiyuanjifen,
+                    style: TextStyle(
+                      fontSize: 16.sp,
+                      fontWeight: MyFontWeight.medium,
+                      color: Colors.white,
+                    ),
+                  ),
+                  SizedBox(
+                    width: 8.w,
+                  ),
+                  Text(
+                    (widget.storeInfo != null && widget.storeInfo.memberSource != null)
+                        ? "${widget.storeInfo.memberSource.integral}"
+                        : "",
+                    style: TextStyle(
+                      fontSize: 14.sp,
+                      fontWeight: MyFontWeight.medium,
+                      color: Colors.white,
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+          SizedBox(
+            height: 10.h,
+          ),
+          Text(
+            S.of(context).gongxinichengweibendianhuiyuan,
+            style: TextStyle(
+              fontSize: 10.sp,
+              fontWeight: MyFontWeight.medium,
+              color: Color(0xFFEDC98E),
+            ),
+          )
+        ],
+      )
+          : Row(
+        children: [
+          Expanded(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Image.asset(
+                  "assets/image/icon_vip.png",
+                  width: 36.w,
+                  height: 20.h,
+                ),
+                SizedBox(
+                  height: 2.h,
+                ),
+                Text(
+                  S.of(context).chengweidianpuzhuanshuhuiyuan,
+                  style: TextStyle(
+                    fontSize: 10.sp,
+                    color: Color(0xCFFFFFFF),
+                    fontWeight: MyFontWeight.semi_bold,
+                  ),
+                ),
+              ],
+            ),
+            flex: 1,
+          ),
+          InkWell(
+            onTap: () {
+              widget.receiveVip();
+            },
+            child: RoundButton(
+              text: widget.isReceive
+                  ? S.of(context).dianwolingqu
+                  : S.of(context).yilingqu,
+              textColor: widget.isReceive ? Colors.white : Color(0xFF484D66),
+              backgroup: widget.isReceive ? Color(0xFF242B45) : Colors.white,
+              padding:
+              EdgeInsets.symmetric(vertical: 5.h, horizontal: 16.w),
+              radius: 14,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+}
\ No newline at end of file
diff --git a/lib/view_widget/login_tips_dialog.dart b/lib/view_widget/login_tips_dialog.dart
index e2d4199f..f3b6e43f 100644
--- a/lib/view_widget/login_tips_dialog.dart
+++ b/lib/view_widget/login_tips_dialog.dart
@@ -1,6 +1,3 @@
-
-
-
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -40,7 +37,7 @@ class LoginTipsDialog {
               arguments: {"login": "login"});
         },
       ),
-      onDismiss: (){
+      onDismiss: () {
         isShow = false;
       },
       clickBgDismissTemp: false,
diff --git a/lib/web/web_page.dart b/lib/web/web_page.dart
index 2e6436a5..58810e97 100644
--- a/lib/web/web_page.dart
+++ b/lib/web/web_page.dart
@@ -49,6 +49,7 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
   final GlobalKey commentKey = GlobalKey();
   final GlobalKey inputKey = GlobalKey();
   final ScrollController scrollController = ScrollController();
+  final TextEditingController commentTextController = TextEditingController();
 
   @override
   void initState() {
@@ -118,6 +119,8 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
       "relationalType": 1
     }).catchError((error) {});
     if (baseData != null && baseData.isSuccess) {
+      commentKey.currentState.initState();
+      commentTextController.text = "";
       _toComment();
     }
   }
@@ -193,6 +196,7 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
         }
         activity.liked = !activity.liked;
       }
+      commentKey.currentState.setState(() {});
     } else {
       SmartDialog.showToast(baseData.msg, alignment: Alignment.center);
     }
@@ -272,6 +276,7 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
               article,
               isKeyBoardShow,
               commentFocus,
+              commentTextController,
               _toComment,
               _queryMemberComment,
               _queryInformationLikes,
@@ -292,7 +297,7 @@ class _WebPage extends State<WebPage> with WidgetsBindingObserver {
     BaseData baseData = await apiService.delComment(
         widget.arguments["activityId"] ?? widget.arguments["articleId"]);
     if (baseData != null && baseData.isSuccess) {
-      commentKey.currentState.setState(() {});
+      commentKey.currentState.initState();
     }
   }
 
diff --git a/lib/web/web_view/comment_list.dart b/lib/web/web_view/comment_list.dart
index 2a9e9c60..f85f3399 100644
--- a/lib/web/web_view/comment_list.dart
+++ b/lib/web/web_view/comment_list.dart
@@ -52,8 +52,7 @@ class _CommentList extends State<CommentList> {
       LoginTipsDialog().show(context);
       return;
     }
-    BaseData baseData =
-        await apiService.commentLike(id).catchError((onError) {});
+    BaseData baseData = await apiService.commentLike(id).catchError((error){});
     if (baseData != null && baseData.isSuccess) {
       memberList.forEach((element) {
         if (element.id == id) {
@@ -71,7 +70,6 @@ class _CommentList extends State<CommentList> {
 
   @override
   void initState() {
-    super.initState();
     queryMemberCommentList();
   }
 
@@ -136,8 +134,8 @@ class _CommentList extends State<CommentList> {
                           showPressMenu(memberList[position].createUser,
                               memberList[position]);
                         },
-                        child: commentItem(
-                            memberList[position], position, memberList.length),
+                        child: commentItem(memberList[position], position,
+                            memberList.length),
                       ),
                     );
                   },
@@ -235,7 +233,8 @@ class _CommentList extends State<CommentList> {
       // );
 
       SmartDialog.show(
-        widget: CommentMenu((type) {
+        widget: CommentMenu(
+          (type) {
             SmartDialog.dismiss();
             if (type == "huifu") {
               widget.reply(memberComment);
@@ -311,50 +310,53 @@ class _CommentList extends State<CommentList> {
                   ),
                   flex: 1,
                 ),
-                Container(
-                  alignment: Alignment.topRight,
-                  child: LikeButton(
-                    padding: EdgeInsets.all(10),
-                    circleSize: 16,
-                    circleColor: CircleColor(
-                      start: Color(0xff00ddff),
-                      end: Color(0xff0099cc),
-                    ),
-                    bubblesColor: BubblesColor(
-                      dotPrimaryColor: Color(0xff33b5e5),
-                      dotSecondaryColor: Color(0xff0099cc),
+                Tooltip(
+                  message: S.of(context).dianzanxihuan_(S.of(context).pinglun),
+                  child: Container(
+                    alignment: Alignment.topRight,
+                    child: LikeButton(
+                      padding: EdgeInsets.all(10),
+                      circleSize: 16,
+                      circleColor: CircleColor(
+                        start: Color(0xff00ddff),
+                        end: Color(0xff0099cc),
+                      ),
+                      bubblesColor: BubblesColor(
+                        dotPrimaryColor: Color(0xff33b5e5),
+                        dotSecondaryColor: Color(0xff0099cc),
+                      ),
+                      bubblesSize: 15,
+                      likeBuilder: (bool isLiked) {
+                        return isLiked
+                            ? Image.asset(
+                                "assets/image/icon_like.png",
+                                width: 16,
+                                height: 16,
+                              )
+                            : Image.asset(
+                                "assets/image/icon_like_h.png",
+                                width: 16,
+                                height: 16,
+                              );
+                      },
+                      isLiked: memberList.liked ?? false,
+                      onTap: (isLiked) async {
+                        await queryCommentLike(memberList.id);
+                        return (memberList == null || memberList.liked == null)
+                            ? false
+                            : memberList.liked;
+                      },
+                      likeCount: memberList.likes,
+                      countBuilder: (int count, bool isLiked, String text) {
+                        return Text(
+                          text,
+                          style: TextStyle(
+                            color: Color(0xFF1A1A1A),
+                            fontSize: 12.sp,
+                          ),
+                        );
+                      },
                     ),
-                    bubblesSize: 15,
-                    likeBuilder: (bool isLiked) {
-                      return isLiked
-                          ? Image.asset(
-                              "assets/image/icon_like.png",
-                              width: 16,
-                              height: 16,
-                            )
-                          : Image.asset(
-                              "assets/image/icon_like_h.png",
-                              width: 16,
-                              height: 16,
-                            );
-                    },
-                    isLiked: memberList.liked ?? false,
-                    onTap: (isLiked) async {
-                      await queryCommentLike(memberList.id);
-                      return (memberList == null || memberList.liked == null)
-                          ? false
-                          : memberList.liked;
-                    },
-                    likeCount: memberList.likes,
-                    countBuilder: (int count, bool isLiked, String text) {
-                      return Text(
-                        text,
-                        style: TextStyle(
-                          color: Color(0xFF1A1A1A),
-                          fontSize: 12.sp,
-                        ),
-                      );
-                    },
                   ),
                 ),
               ],
diff --git a/lib/web/web_view/input_comment.dart b/lib/web/web_view/input_comment.dart
index 2833ad87..a1e5dcfe 100644
--- a/lib/web/web_view/input_comment.dart
+++ b/lib/web/web_view/input_comment.dart
@@ -14,6 +14,7 @@ class InputComment extends StatefulWidget {
   final Function toComment;
   final Function(String text) queryMemberComment;
   final Function() queryInformationLikes;
+  final TextEditingController commentTextController;
 
   InputComment(
     Key key,
@@ -22,6 +23,7 @@ class InputComment extends StatefulWidget {
     this.article,
     this.isKeyBoardShow,
     this.commentFocus,
+    this.commentTextController,
     this.toComment,
     this.queryMemberComment,
     this.queryInformationLikes,
@@ -35,8 +37,6 @@ class InputComment extends StatefulWidget {
 
 class _InputComment extends State<InputComment> {
 
-  var commentTextController = TextEditingController();
-
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -73,7 +73,7 @@ class _InputComment extends State<InputComment> {
                       maxLines: 8,
                       minLines: 1,
                       focusNode: widget.commentFocus,
-                      controller: commentTextController,
+                      controller: widget.commentTextController,
                       decoration: InputDecoration(
                         border: InputBorder.none,
                         hintText: widget.hintText,
@@ -91,7 +91,7 @@ class _InputComment extends State<InputComment> {
           if (widget.isKeyBoardShow)
             GestureDetector(
               onTap: () {
-                var commentText = commentTextController.text;
+                var commentText = widget.commentTextController.text;
                 if (commentText == "") {
                   return;
                 }
@@ -112,64 +112,70 @@ class _InputComment extends State<InputComment> {
           if (!widget.isKeyBoardShow)
             InkWell(
               onTap: widget.toComment,
-              child: Container(
-                padding: EdgeInsets.only(left: 20.w, right: 10.w),
-                child: Image.asset(
-                  "assets/image/icon_comment.png",
-                  width: 24,
-                  height: 24,
+              child: Tooltip(
+                message: S.of(context).daopinglunliebiaodingbu,
+                child: Container(
+                  padding: EdgeInsets.only(left: 20.w, right: 10.w),
+                  child: Image.asset(
+                    "assets/image/icon_comment.png",
+                    width: 24,
+                    height: 24,
+                  ),
                 ),
               ),
             ),
           if (!widget.isKeyBoardShow)
-            LikeButton(
-              padding: EdgeInsets.all(10),
-              size: 24,
-              circleSize: 24,
-              circleColor: CircleColor(
-                start: Color(0xff00ddff),
-                end: Color(0xff0099cc),
-              ),
-              bubblesColor: BubblesColor(
-                dotPrimaryColor: Color(0xff33b5e5),
-                dotSecondaryColor: Color(0xff0099cc),
-              ),
-              bubblesSize: 24,
-              likeBuilder: (bool isLiked) {
-                return isLiked
-                    ? Image.asset(
-                        "assets/image/icon_like.png",
-                        width: 24,
-                        height: 24,
-                      )
-                    : Image.asset(
-                        "assets/image/icon_like_h.png",
-                        width: 24,
-                        height: 24,
-                      );
-              },
-              isLiked: (widget.activity != null
-                  ? widget.activity.liked
-                  : widget.article != null
-                      ? widget.article.liked
-                      : false),
-              onTap: (isLiked) async {
-                await widget.queryInformationLikes();
-                return (widget.activity != null
+            Tooltip(
+              message: S.of(context).dianzanxihuan_(widget.activity == null ? S.of(context).wenzhang : S.of(context).huodong),
+              child: LikeButton(
+                padding: EdgeInsets.all(10),
+                size: 24,
+                circleSize: 24,
+                circleColor: CircleColor(
+                  start: Color(0xff00ddff),
+                  end: Color(0xff0099cc),
+                ),
+                bubblesColor: BubblesColor(
+                  dotPrimaryColor: Color(0xff33b5e5),
+                  dotSecondaryColor: Color(0xff0099cc),
+                ),
+                bubblesSize: 24,
+                likeBuilder: (bool isLiked) {
+                  return isLiked
+                      ? Image.asset(
+                          "assets/image/icon_like.png",
+                          width: 24,
+                          height: 24,
+                        )
+                      : Image.asset(
+                          "assets/image/icon_like_h.png",
+                          width: 24,
+                          height: 24,
+                        );
+                },
+                isLiked: (widget.activity != null
                     ? widget.activity.liked
                     : widget.article != null
                         ? widget.article.liked
-                        : false);
-              },
-              countBuilder: (int count, bool isLiked, String text) {
-                return Text(
-                  text,
-                  style: TextStyle(
-                    color: Color(0xFF1A1A1A),
-                    fontSize: 12.sp,
-                  ),
-                );
-              },
+                        : false),
+                onTap: (isLiked) async {
+                  await widget.queryInformationLikes();
+                  return (widget.activity != null
+                      ? widget.activity.liked
+                      : widget.article != null
+                          ? widget.article.liked
+                          : false);
+                },
+                countBuilder: (int count, bool isLiked, String text) {
+                  return Text(
+                    text,
+                    style: TextStyle(
+                      color: Color(0xFF1A1A1A),
+                      fontSize: 12.sp,
+                    ),
+                  );
+                },
+              ),
             ),
         ],
       ),
diff --git a/pubspec.lock b/pubspec.lock
index ef77fc11..5ba6cbe2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -28,7 +28,7 @@ packages:
       name: args
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.0"
+    version: "1.6.0"
   async:
     dependency: transitive
     description:
@@ -427,6 +427,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.5.1"
+  font_awesome_flutter:
+    dependency: "direct main"
+    description:
+      name: font_awesome_flutter
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "9.1.0"
   glob:
     dependency: transitive
     description:
@@ -1112,7 +1119,7 @@ packages:
       name: yaml
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.1.0"
+    version: "2.2.1"
 sdks:
   dart: ">=2.13.0 <3.0.0"
   flutter: ">=2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 928d8713..f0a95151 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,20 +1,8 @@
 name: huixiang
 description: 一心回乡.
 
-# The following line prevents the package from being accidentally published to
-# pub.dev using `pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 version: 1.0.0+1
 
 environment:
@@ -92,8 +80,10 @@ dependencies:
   rive: ^0.6.8
   flare_flutter: ^3.0.2
 
+  font_awesome_flutter: ^9.1.0
 #  flutter_bugly: ^0.3.3
 
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
@@ -101,15 +91,20 @@ dev_dependencies:
   build_runner: ^1.11.5
   json_serializable: ^3.5.1
 
-
 flutter:
 
-  uses-material-design: true
-
   assets:
     - assets/image/
     - assets/map_style/
     - assets/riv/
+#    - assets/fonts/
+
+#  fonts:
+#    - family: iconfont
+#      fonts:
+#        - asset: assets/fonts/iconfont.ttf
+
+  uses-material-design: true
 
 flutter_intl:
   enabled: true