更改

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.6.0'
     repositories {
         maven {
             url 'https://maven.aliyun.com/repository/google'

lib/community/community_list.dart

@@ -3,6 +3,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:huixiang/community/photo_view_gallery_screen.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/base_data.dart';
 import 'package:huixiang/retrofit/data/comunity_comment.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
@@ -432,7 +433,7 @@ class _CommunityList extends State<CommunityList> {
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
                 Text(
-                  "确定要删除这条动态？",
+                  S.of(context).quedingyaoshanchudongtai,
                   style: TextStyle(
                     fontSize: 17.sp,
                     fontWeight: FontWeight.bold,
@@ -447,7 +448,7 @@ class _CommunityList extends State<CommunityList> {
                     Expanded(
                       child: InkWell(
                         child: BorderText(
-                          text: "取消",
+                          text:S.of(context).quxiao,
                           textColor: Color(0xFF32A060),
                           fontSize: 16.sp,
                           fontWeight: FontWeight.bold,
@@ -468,7 +469,7 @@ class _CommunityList extends State<CommunityList> {
                     Expanded(
                       child: InkWell(
                         child: RoundButton(
-                          text: "确定",
+                          text:S.of(context).queding,
                           textColor: Colors.white,
                           radius: 4,
                           padding: EdgeInsets.all(12),

lib/community/community_view/class_details.dart

@@ -253,7 +253,7 @@ class _ClassDetails extends State<ClassDetails> with WidgetsBindingObserver {
                                   children: [
                                     Expanded(
                                         child: Text(
-                                          "讲师:${course != null ? course.author.name : ""}",
+                                          "${S.of(context).jiangshi}:${course != null ? course.author.name : ""}",
                                           overflow: TextOverflow.ellipsis,
                                           maxLines: 2,
                                           style: TextStyle(
@@ -263,7 +263,7 @@ class _ClassDetails extends State<ClassDetails> with WidgetsBindingObserver {
                                           ),
                                         )),
                                     Text(
-                                      "播放次数:",
+                                      "${S.of(context).bofangcishu}:",
                                       style: TextStyle(
                                         fontSize: 12.sp,
                                         fontWeight: MyFontWeight.regular,

lib/community/community_view/community_dynamic.dart

@@ -701,7 +701,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
                 Text(
-                  "确定要删除这条动态？",
+                  S.of(context).quedingyaoshanchudongtai,
                   style: TextStyle(
                     fontSize: 17.sp,
                     fontWeight: FontWeight.bold,
@@ -716,7 +716,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
                     Expanded(
                       child: InkWell(
                         child: BorderText(
-                          text: "取消",
+                          text: S.of(context).quxiao,
                           textColor: Color(0xFF32A060),
                           fontSize: 16.sp,
                           fontWeight: FontWeight.bold,
@@ -737,7 +737,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
                     Expanded(
                       child: InkWell(
                         child: RoundButton(
-                          text: "确定",
+                          text: S.of(context).queding,
                           textColor: Colors.white,
                           radius: 4,
                           padding: EdgeInsets.all(12),
@@ -812,7 +812,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
                           width: 12,
                         ),
                         Text(
-                          "分享",
+                          S.of(context).fenxiang,
                           style: TextStyle(
                             fontSize: 17.sp,
                             fontWeight: MyFontWeight.medium,
@@ -851,7 +851,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
                         width: 15,
                       ),
                       Text(
-                        "举报该内容",
+                        S.of(context).jubaogaineirong,
                         style: TextStyle(
                           fontSize: 17.sp,
                           fontWeight: MyFontWeight.medium,

lib/community/community_view/home_class.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/collect_class_list.dart';
 import 'package:huixiang/retrofit/data/course_list.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
@@ -269,7 +270,7 @@ class _HomeClass extends State<HomeClass> {
                   ),
                   SizedBox(height: 2),
                   Text(
-                    "讲师:${collect.author.name}",
+                    "${S.of(context).jiangshi}:${collect.author.name}",
                     overflow: TextOverflow.ellipsis,
                     maxLines: 2,
                     style: TextStyle(

lib/community/headlines/activity_top_list.dart

@@ -2,15 +2,12 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/article.dart';
-import 'package:huixiang/retrofit/data/collect_class_list.dart';
-import 'package:huixiang/retrofit/data/course_list.dart';
-import 'package:huixiang/retrofit/data/headlines_list.dart';
 import 'package:huixiang/retrofit/retrofit_api.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/new_people_reward.dart';
 
 class ActivityTopList extends StatefulWidget {
   final List<Article> articleTop;
@@ -119,7 +116,7 @@ class _ActivityTopList extends State<ActivityTopList> {
                           ),
                           Expanded(
                             child: Text(
-                              "精选好文",
+                              S.of(context).jingxuanhaowen,
                               overflow: TextOverflow.ellipsis,
                               maxLines: 2,
                               style: TextStyle(

lib/community/headlines/article_list.dart

@@ -1,6 +1,7 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/article.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/utils/font_weight.dart';
@@ -45,7 +46,7 @@ class _ArticleList extends State<ArticleList> {
             Padding(
                 padding: EdgeInsets.only(bottom: 12),
                 child: Text(
-                  "最新文章",
+                 S.of(context).zuixinwenzhang,
                   overflow: TextOverflow.ellipsis,
                   maxLines: 2,
                   style: TextStyle(

lib/community/headlines/article_page.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:huixiang/community/headlines/headlines_collection.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/main.dart';
 import 'package:huixiang/retrofit/data/article.dart';
 import 'package:huixiang/retrofit/data/banner.dart';
@@ -257,7 +258,7 @@ class _ArticlePage extends State<ArticlePage>
         width: double.infinity,
         margin: EdgeInsets.only(left: 16,bottom:5),
         child:Text(
-          "文章专栏",
+         S.of(context).wenzhangzhuanlan,
           overflow: TextOverflow.ellipsis,
           maxLines: 2,
           style: TextStyle(

lib/community/headlines/headlines_collection.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/article.dart';
 import 'package:huixiang/retrofit/data/collect_class_list.dart';
 import 'package:huixiang/retrofit/data/course_list.dart';
@@ -112,7 +113,7 @@ class _HeadlinesCollection extends State<HeadlinesCollection> {
                     color: Color(0xFF007EFF),
                   ),
                   child: Text(
-                    "专栏",
+                    S.of(context).zhuanlan,
                     style: TextStyle(
                       fontSize: 12.sp,
                       fontWeight: MyFontWeight.medium,

lib/community/headlines/headlines_column_details.dart

@@ -1,6 +1,7 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/article.dart';
 import 'package:huixiang/retrofit/data/base_data.dart';
 import 'package:huixiang/retrofit/data/headlines_list.dart';
@@ -205,7 +206,7 @@ class _HeadlinesColumnDetails extends State<HeadlinesColumnDetails>
                                             color: Color(0xFF007EFF),
                                           ),
                                           child: Text(
-                                            "专栏",
+                                            S.of(context).zhuanlan,
                                             style: TextStyle(
                                               fontSize: 12.sp,
                                               fontWeight: MyFontWeight.medium,
@@ -257,7 +258,7 @@ class _HeadlinesColumnDetails extends State<HeadlinesColumnDetails>
                                         Padding(
                                             padding: EdgeInsets.all(16),
                                             child: Text(
-                                              "简介:${headlinesListDetails?.introduce ?? ""}",
+                                              S.of(context).jianjie(headlinesListDetails?.introduce ?? ""),
                                               overflow: TextOverflow.ellipsis,
                                               maxLines: 2,
                                               style: TextStyle(

lib/community/release_dynamic.dart

@@ -69,7 +69,7 @@ class _ReleaseDynamic extends State<ReleaseDynamic> {
               borderRadius: BorderRadius.circular(4),
             ),
             child: Text(
-              "发布",
+              S.of(context).fabu,
               style: TextStyle(
                 color: isRelease ? Colors.white : Color(0xFFA0A0A0),
                 fontSize: 14.sp,

lib/community/report/report_notice.dart

@@ -2,6 +2,7 @@ import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
@@ -53,7 +54,7 @@ class _ReportNotice extends State<ReportNotice> {
                         alignment: Alignment.center,
                         padding: EdgeInsets.only(top: 14, bottom: 16),
                         child: Text(
-                          "投诉须知",
+                         S.of(context).toushuxuzhi,
                           style: TextStyle(
                             fontSize: 16.sp,
                             fontWeight: MyFontWeight.semi_bold,

lib/community/report/report_page.dart

@@ -4,6 +4,7 @@ import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/base_data.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/utils/font_weight.dart';
@@ -87,7 +88,7 @@ class _ReportPage extends State<ReportPage> {
                       TextSpan(
                         children: [
                           TextSpan(
-                            text: "举报",
+                            text:S.of(context).jubao,
                             style: TextStyle(
                               fontSize: 16.sp,
                               fontWeight: MyFontWeight.medium,
@@ -140,7 +141,7 @@ class _ReportPage extends State<ReportPage> {
                             maxLength: 100,
                             decoration: InputDecoration(
                               border: InputBorder.none,
-                              hintText: "请输入举报原因，以便我们更快定位问题，快速处理",
+                              hintText: S.of(context).jubaoyuanyin,
                               hintStyle: TextStyle(
                                 fontSize: 12.sp,
                                 height: 1.2,
@@ -169,7 +170,7 @@ class _ReportPage extends State<ReportPage> {
                             alignment: Alignment.bottomCenter,
                             margin: EdgeInsets.only(bottom: 25),
                             child: Text(
-                              "投诉须知",
+                              S.of(context).toushuxuzhi,
                               style: TextStyle(
                                 fontSize: 14.sp,
                                 fontWeight: MyFontWeight.regular,
@@ -194,7 +195,7 @@ class _ReportPage extends State<ReportPage> {
                             color: Color(0xFF319E5F),
                             alignment: Alignment.center,
                             child: Text(
-                              "提交",
+                              S.of(context).tijiao,
                               style: TextStyle(
                                 fontSize: 16.sp,
                                 fontWeight: MyFontWeight.semi_bold,

lib/community/report/report_success.dart

@@ -3,6 +3,7 @@ import 'dart:ui';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
@@ -56,7 +57,7 @@ class _ReportSuccess extends State<ReportSuccess> {
             Align(
               alignment: Alignment.center,
               child: Text(
-                "提交成功",
+                S.of(context).tijiaochenggong,
                 style: TextStyle(
                   fontSize: 21.sp,
                   fontWeight: FontWeight.bold,
@@ -70,7 +71,7 @@ class _ReportSuccess extends State<ReportSuccess> {
             RichText(
               textAlign: TextAlign.center,
               text: TextSpan(
-                  text: "您的举报正在等待人工审核，我们会在7~15个工作日处理，处理结果可在",
+                  text: S.of(context).jubaotishi,
                   style: TextStyle(
                     fontSize: 12.sp,
                     height: 1.5,
@@ -79,7 +80,7 @@ class _ReportSuccess extends State<ReportSuccess> {
                   ),
                   children: [
                     TextSpan(
-                      text: "系统消息",
+                      text:S.of(context).xitongxiaoxi,
                       recognizer: TapGestureRecognizer()
                         ..onTap = () {
                           Navigator.of(context)
@@ -119,7 +120,7 @@ class _ReportSuccess extends State<ReportSuccess> {
                     borderRadius: BorderRadius.circular(8),
                   ),
                   child: Text(
-                    "返回社群",
+                    S.of(context).fanhuishequn,
                     style: TextStyle(
                       fontSize: 16.sp,
                       fontWeight: FontWeight.bold,

lib/generated/intl/messages_en.dart

@@ -115,8 +115,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
     "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"),
     "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"),
+    "bianjigerenziliao" : MessageLookupByLibrary.simpleMessage("编辑个人资料"),
     "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"),
+    "biaoweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"),
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"),
+    "bofangcishu" : MessageLookupByLibrary.simpleMessage("播放次数"),
     "bojin" : MessageLookupByLibrary.simpleMessage("铂金"),
     "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
     "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持开票"),
@@ -139,6 +142,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"),
     "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员，享专属权益"),
     "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
+    "chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
     "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
     "chongzhizuixiaojine" : m1,
     "chuangjianshijian" : m2,
@@ -181,6 +185,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanhao" : MessageLookupByLibrary.simpleMessage("订单号"),
     "dingdanjiesuan" : MessageLookupByLibrary.simpleMessage("订单结算"),
     "dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"),
+    "dingdantongzhi" : MessageLookupByLibrary.simpleMessage("订单通知"),
     "dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("订单消息"),
     "dingdanyisongda" : MessageLookupByLibrary.simpleMessage("订单送达"),
     "dingdanyituikuan" : MessageLookupByLibrary.simpleMessage("订单已退款"),
@@ -188,6 +193,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanyizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"),
     "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
     "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
+    "dongtai" : MessageLookupByLibrary.simpleMessage("动态"),
     "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
     "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
     "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@@ -199,9 +205,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "duihuanquan" : MessageLookupByLibrary.simpleMessage("兑换券"),
     "duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("兑换商品详情"),
     "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"),
+    "fabu" : MessageLookupByLibrary.simpleMessage("发布"),
     "fangshier" : MessageLookupByLibrary.simpleMessage("方式二"),
     "fangshiyi" : MessageLookupByLibrary.simpleMessage("方式一"),
     "fanhuiduihuanlishi" : MessageLookupByLibrary.simpleMessage("返回兑换历史"),
+    "fanhuishequn" : MessageLookupByLibrary.simpleMessage("返回社群"),
+    "fanhuishouye" : MessageLookupByLibrary.simpleMessage("返回首页"),
     "fankui" : MessageLookupByLibrary.simpleMessage("反馈"),
     "fankuilizi" : MessageLookupByLibrary.simpleMessage("您可以在这里输入反馈内容,例如产品建议，功能异常等"),
     "fantizhongwen" : MessageLookupByLibrary.simpleMessage("繁体中文"),
@@ -212,6 +221,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "feishiwuduihuanma" : MessageLookupByLibrary.simpleMessage("非实物兑换吗"),
     "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非实物商品兑换后领取到卡包即可使用！"),
     "fensi" : MessageLookupByLibrary.simpleMessage("粉丝"),
+    "fenxiang" : MessageLookupByLibrary.simpleMessage("分享"),
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
     "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"),
     "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。"),
@@ -221,8 +231,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"),
     "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
     "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"),
+    "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更换背景"),
     "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"),
     "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"),
+    "gexingqianming" : MessageLookupByLibrary.simpleMessage("个性签名"),
     "gong" : MessageLookupByLibrary.simpleMessage("共"),
     "gongchuanghuiyuan" : MessageLookupByLibrary.simpleMessage("共创会员"),
     "gongjijian" : m6,
@@ -279,6 +291,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jiajifen" : m11,
     "jian" : MessageLookupByLibrary.simpleMessage("件"),
     "jiangli" : MessageLookupByLibrary.simpleMessage("奖励"),
+    "jiangshi" : MessageLookupByLibrary.simpleMessage("讲师"),
     "jianjie" : m12,
     "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"),
     "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"),
@@ -293,15 +306,22 @@ class MessageLookup extends MessageLookupByLibrary {
     "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("净弼积分商城"),
     "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
     "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
+    "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"),
     "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),
     "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"),
     "jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"),
     "jinxingbangdingfuka" : MessageLookupByLibrary.simpleMessage("进行绑定副卡"),
+    "jinxingfukabangding" : MessageLookupByLibrary.simpleMessage("进行副卡绑定"),
+    "jinxingzhanghaozhuxiao" : MessageLookupByLibrary.simpleMessage("进行账号注销"),
     "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"),
     "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"),
     "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集团创始人"),
     "jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"),
     "jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"),
+    "jubao" : MessageLookupByLibrary.simpleMessage("举报"),
+    "jubaogaineirong" : MessageLookupByLibrary.simpleMessage("举报该内容"),
+    "jubaotishi" : MessageLookupByLibrary.simpleMessage("您的举报正在等待人工审核，我们会在7~15个工作日处理，处理结果可在"),
+    "jubaoyuanyin" : MessageLookupByLibrary.simpleMessage("请输入举报原因，以便我们更快定位问题，快速处理"),
     "jujue" : MessageLookupByLibrary.simpleMessage("拒绝"),
     "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
     "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
@@ -322,6 +342,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"),
     "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
     "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即开通"),
+    "lijilingqu" : MessageLookupByLibrary.simpleMessage("立即领取"),
     "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"),
     "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"),
     "lingqu" : MessageLookupByLibrary.simpleMessage("领取"),
@@ -379,6 +400,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隐私服务》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本机号码登录"),
     "qiandao" : MessageLookupByLibrary.simpleMessage("签到"),
+    "qiandaodejifen" : MessageLookupByLibrary.simpleMessage("签到得积分"),
     "qiandaolingjifen" : MessageLookupByLibrary.simpleMessage("签到领积分"),
     "qiandaolingqujinfen" : MessageLookupByLibrary.simpleMessage("签到领取积分"),
     "qiandaowancheng" : MessageLookupByLibrary.simpleMessage("签到完成"),
@@ -422,12 +444,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "qudanhao" : m23,
     "qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"),
     "queding" : MessageLookupByLibrary.simpleMessage("确定"),
+    "quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("确定要删除这条动态？"),
     "queren" : MessageLookupByLibrary.simpleMessage("确认"),
     "querenbangding" : MessageLookupByLibrary.simpleMessage("确认绑定"),
     "querenchongzhi" : MessageLookupByLibrary.simpleMessage("确认充值"),
     "querenduihuan" : MessageLookupByLibrary.simpleMessage("确认兑换"),
     "querenshouhuo" : MessageLookupByLibrary.simpleMessage("确认收货"),
     "querenyaoshanchudangqianpinglunma" : MessageLookupByLibrary.simpleMessage("确认要删除当前评论？"),
+    "querenzhuxiao" : MessageLookupByLibrary.simpleMessage("确认注销"),
     "quhexiao" : MessageLookupByLibrary.simpleMessage("去核销"),
     "quhuozhong" : MessageLookupByLibrary.simpleMessage("取货中"),
     "qujianma" : MessageLookupByLibrary.simpleMessage("取件码"),
@@ -451,6 +475,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何签到?"),
     "ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.点击净弼，进入首页，点击上方的去签到。\n2.点击我的，进入我的页面，点击上方的积分详情，进入后即可签到。"),
     "ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款，请您提前准备好订单号/取单号，并与门店人员进行联系"),
+    "saoma" : MessageLookupByLibrary.simpleMessage("扫码"),
     "saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("扫码识别，关注公众号"),
     "send_code" : MessageLookupByLibrary.simpleMessage("发送验证"),
     "shanchu" : MessageLookupByLibrary.simpleMessage("删除"),
@@ -495,13 +520,16 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
     "sui" : m28,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
+    "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
     "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
     "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
+    "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"),
     "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"),
     "tixian" : MessageLookupByLibrary.simpleMessage("提现"),
     "tongyibingjixu" : MessageLookupByLibrary.simpleMessage("同意并继续"),
     "tongzhi" : MessageLookupByLibrary.simpleMessage("通知"),
     "tongzhitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以及时收到我们的活动信息，推荐您在使用HISAPP时打开通知的接收"),
+    "toushuxuzhi" : MessageLookupByLibrary.simpleMessage("投书须知"),
     "touxiang" : MessageLookupByLibrary.simpleMessage("头像"),
     "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登录"),
     "tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"),
@@ -529,8 +557,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "wentijian" : MessageLookupByLibrary.simpleMessage("问题件"),
     "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章详情"),
+    "wenzhangzhuanlan" : MessageLookupByLibrary.simpleMessage("文章专栏"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未领取"),
     "wodechengjiu" : MessageLookupByLibrary.simpleMessage("我的成就"),
+    "wodedingdan" : MessageLookupByLibrary.simpleMessage("我的订单"),
     "wodedongtai" : MessageLookupByLibrary.simpleMessage("我的动态"),
     "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的会员等级"),
@@ -569,9 +599,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
     "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"),
     "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
+    "xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用户名"),
     "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"),
     "xuanji" : MessageLookupByLibrary.simpleMessage("选集"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
+    "yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"),
     "yaoqingrenshoujihao_" : m32,
     "yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀请完成"),
     "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
@@ -635,12 +667,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "zaituzhong" : MessageLookupByLibrary.simpleMessage("运输中"),
     "zaixiankefu" : MessageLookupByLibrary.simpleMessage("在线客服"),
     "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暂不支持线上点餐"),
+    "zanweijiesuo" : MessageLookupByLibrary.simpleMessage("暂未解锁"),
+    "zanweikaifang" : MessageLookupByLibrary.simpleMessage("暂未开放"),
     "zanweikaitong" : MessageLookupByLibrary.simpleMessage("暂未开通"),
     "zanwupinglun" : MessageLookupByLibrary.simpleMessage("暂无评论，快来评论吧"),
     "zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暂无线上门店"),
     "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暂无优惠券可领取"),
     "zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("账号授权"),
     "zhanghaoxinxi" : MessageLookupByLibrary.simpleMessage("账号信息"),
+    "zhanghaozhuxiaoshuoming" : MessageLookupByLibrary.simpleMessage("账号注销说明"),
     "zhanghuyue" : MessageLookupByLibrary.simpleMessage("账户余额"),
     "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫骑手"),
     "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加载"),
@@ -654,12 +689,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhizuowancheng" : MessageLookupByLibrary.simpleMessage("制作完成"),
     "zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
     "zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"),
+    "zhuanlan" : MessageLookupByLibrary.simpleMessage("专栏"),
+    "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:注销帐号后不可恢复，相关数据和信息会永久删除。"),
     "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
     "ziti" : MessageLookupByLibrary.simpleMessage("自提"),
     "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),
     "zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型：自提兑换券"),
     "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"),
     "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"),
+    "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
     "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"),
     "zuozhe" : m39
   };

lib/generated/intl/messages_zh_CN.dart

@@ -115,8 +115,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
     "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"),
     "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"),
+    "bianjigerenziliao" : MessageLookupByLibrary.simpleMessage("编辑个人资料"),
     "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"),
+    "biaoweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"),
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"),
+    "bofangcishu" : MessageLookupByLibrary.simpleMessage("播放次数"),
     "bojin" : MessageLookupByLibrary.simpleMessage("铂金"),
     "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
     "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持开票"),
@@ -139,6 +142,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"),
     "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员，享专属权益"),
     "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
+    "chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
     "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
     "chongzhizuixiaojine" : m1,
     "chuangjianshijian" : m2,
@@ -181,6 +185,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanhao" : MessageLookupByLibrary.simpleMessage("订单号"),
     "dingdanjiesuan" : MessageLookupByLibrary.simpleMessage("订单结算"),
     "dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"),
+    "dingdantongzhi" : MessageLookupByLibrary.simpleMessage("订单通知"),
     "dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("订单消息"),
     "dingdanyisongda" : MessageLookupByLibrary.simpleMessage("订单送达"),
     "dingdanyituikuan" : MessageLookupByLibrary.simpleMessage("订单已退款"),
@@ -188,6 +193,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanyizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"),
     "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
     "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
+    "dongtai" : MessageLookupByLibrary.simpleMessage("动态"),
     "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
     "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
     "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@@ -199,9 +205,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "duihuanquan" : MessageLookupByLibrary.simpleMessage("兑换券"),
     "duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("兑换商品详情"),
     "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"),
+    "fabu" : MessageLookupByLibrary.simpleMessage("发布"),
     "fangshier" : MessageLookupByLibrary.simpleMessage("方式二"),
     "fangshiyi" : MessageLookupByLibrary.simpleMessage("方式一"),
     "fanhuiduihuanlishi" : MessageLookupByLibrary.simpleMessage("返回兑换历史"),
+    "fanhuishequn" : MessageLookupByLibrary.simpleMessage("返回社群"),
+    "fanhuishouye" : MessageLookupByLibrary.simpleMessage("返回首页"),
     "fankui" : MessageLookupByLibrary.simpleMessage("反馈"),
     "fankuilizi" : MessageLookupByLibrary.simpleMessage("您可以在这里输入反馈内容,例如产品建议，功能异常等"),
     "fantizhongwen" : MessageLookupByLibrary.simpleMessage("繁体中文"),
@@ -212,6 +221,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "feishiwuduihuanma" : MessageLookupByLibrary.simpleMessage("非实物兑换吗"),
     "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非实物商品兑换后领取到卡包即可使用！"),
     "fensi" : MessageLookupByLibrary.simpleMessage("粉丝"),
+    "fenxiang" : MessageLookupByLibrary.simpleMessage("分享"),
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
     "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"),
     "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。"),
@@ -221,8 +231,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"),
     "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
     "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"),
+    "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更换背景"),
     "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"),
     "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"),
+    "gexingqianming" : MessageLookupByLibrary.simpleMessage("个性签名"),
     "gong" : MessageLookupByLibrary.simpleMessage("共"),
     "gongchuanghuiyuan" : MessageLookupByLibrary.simpleMessage("共创会员"),
     "gongjijian" : m6,
@@ -277,6 +289,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jiajifen" : m11,
     "jian" : MessageLookupByLibrary.simpleMessage("件"),
     "jiangli" : MessageLookupByLibrary.simpleMessage("奖励"),
+    "jiangshi" : MessageLookupByLibrary.simpleMessage("讲师"),
     "jianjie" : m12,
     "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"),
     "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"),
@@ -291,15 +304,22 @@ class MessageLookup extends MessageLookupByLibrary {
     "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("净弼积分商城"),
     "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
     "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
+    "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"),
     "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),
     "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"),
     "jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"),
     "jinxingbangdingfuka" : MessageLookupByLibrary.simpleMessage("进行绑定副卡"),
+    "jinxingfukabangding" : MessageLookupByLibrary.simpleMessage("进行副卡绑定"),
+    "jinxingzhanghaozhuxiao" : MessageLookupByLibrary.simpleMessage("进行账号注销"),
     "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"),
     "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage(" 集团创办人"),
     "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集团创始人"),
     "jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"),
     "jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"),
+    "jubao" : MessageLookupByLibrary.simpleMessage("举报"),
+    "jubaogaineirong" : MessageLookupByLibrary.simpleMessage("举报该内容"),
+    "jubaotishi" : MessageLookupByLibrary.simpleMessage("您的举报正在等待人工审核，我们会在7~15个工作日处理，处理结果可在"),
+    "jubaoyuanyin" : MessageLookupByLibrary.simpleMessage("请输入举报原因，以便我们更快定位问题，快速处理"),
     "jujue" : MessageLookupByLibrary.simpleMessage("拒绝"),
     "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
     "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
@@ -320,6 +340,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"),
     "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
     "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即开通"),
+    "lijilingqu" : MessageLookupByLibrary.simpleMessage("立即领取"),
     "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"),
     "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"),
     "lingqu" : MessageLookupByLibrary.simpleMessage("领取"),
@@ -377,6 +398,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隐私服务》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本机号码登录"),
     "qiandao" : MessageLookupByLibrary.simpleMessage("签到"),
+    "qiandaodejifen" : MessageLookupByLibrary.simpleMessage("签到得积分"),
     "qiandaolingjifen" : MessageLookupByLibrary.simpleMessage("签到领积分"),
     "qiandaolingqujinfen" : MessageLookupByLibrary.simpleMessage("签到领取积分"),
     "qiandaowancheng" : MessageLookupByLibrary.simpleMessage("签到完成"),
@@ -420,12 +442,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "qudanhao" : m23,
     "qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"),
     "queding" : MessageLookupByLibrary.simpleMessage("确定"),
+    "quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("确定要删除这条动态？"),
     "queren" : MessageLookupByLibrary.simpleMessage("确认"),
     "querenbangding" : MessageLookupByLibrary.simpleMessage("确认绑定"),
     "querenchongzhi" : MessageLookupByLibrary.simpleMessage("确认充值"),
     "querenduihuan" : MessageLookupByLibrary.simpleMessage("确认兑换"),
     "querenshouhuo" : MessageLookupByLibrary.simpleMessage("确认收货"),
     "querenyaoshanchudangqianpinglunma" : MessageLookupByLibrary.simpleMessage("确认要删除当前评论？"),
+    "querenzhuxiao" : MessageLookupByLibrary.simpleMessage("确认注销"),
     "quhexiao" : MessageLookupByLibrary.simpleMessage("去核销"),
     "quhuozhong" : MessageLookupByLibrary.simpleMessage("取货中"),
     "qujianma" : MessageLookupByLibrary.simpleMessage("取件码"),
@@ -449,6 +473,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何签到?"),
     "ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.点击净弼，进入首页，点击上方的去签到。\n2.点击我的，进入我的页面，点击上方的积分详情，进入后即可签到。"),
     "ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款，请您提前准备好订单号/取单号，并与门店人员进行联系"),
+    "saoma" : MessageLookupByLibrary.simpleMessage("扫码"),
     "saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("扫码识别，关注公众号"),
     "send_code" : MessageLookupByLibrary.simpleMessage("发送验证"),
     "shanchu" : MessageLookupByLibrary.simpleMessage("删除"),
@@ -493,13 +518,16 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
     "sui" : m28,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
+    "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
     "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
     "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
+    "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"),
     "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"),
     "tixian" : MessageLookupByLibrary.simpleMessage("提现"),
     "tongyibingjixu" : MessageLookupByLibrary.simpleMessage("同意并继续"),
     "tongzhi" : MessageLookupByLibrary.simpleMessage("通知"),
     "tongzhitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以及时收到我们的活动信息，推荐您在使用HISAPP时打开通知的接收"),
+    "toushuxuzhi" : MessageLookupByLibrary.simpleMessage("投书须知"),
     "touxiang" : MessageLookupByLibrary.simpleMessage("头像"),
     "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登录"),
     "tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"),
@@ -527,8 +555,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "wentijian" : MessageLookupByLibrary.simpleMessage("问题件"),
     "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章详情"),
+    "wenzhangzhuanlan" : MessageLookupByLibrary.simpleMessage("文章专栏"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未领取"),
     "wodechengjiu" : MessageLookupByLibrary.simpleMessage("我的成就"),
+    "wodedingdan" : MessageLookupByLibrary.simpleMessage("我的订单"),
     "wodedongtai" : MessageLookupByLibrary.simpleMessage("我的动态"),
     "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的会员等级"),
@@ -567,9 +597,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
     "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"),
     "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
+    "xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用户名"),
     "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"),
     "xuanji" : MessageLookupByLibrary.simpleMessage("选集"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
+    "yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"),
     "yaoqingrenshoujihao_" : m32,
     "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
@@ -632,10 +664,13 @@ class MessageLookup extends MessageLookupByLibrary {
     "zaituzhong" : MessageLookupByLibrary.simpleMessage("运输中"),
     "zaixiankefu" : MessageLookupByLibrary.simpleMessage("在线客服"),
     "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暂不支持线上点餐"),
+    "zanweijiesuo" : MessageLookupByLibrary.simpleMessage("暂未解锁"),
+    "zanweikaifang" : MessageLookupByLibrary.simpleMessage("暂未开放"),
     "zanwupinglun" : MessageLookupByLibrary.simpleMessage("暂无评论，快来评论吧"),
     "zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暂无线上门店"),
     "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暂无优惠券可领取"),
     "zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("账号授权"),
+    "zhanghaozhuxiaoshuoming" : MessageLookupByLibrary.simpleMessage("账号注销说明"),
     "zhanghuyue" : MessageLookupByLibrary.simpleMessage("账户余额"),
     "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫骑手"),
     "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加载"),
@@ -649,12 +684,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhizuowancheng" : MessageLookupByLibrary.simpleMessage("制作完成"),
     "zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
     "zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"),
+    "zhuanlan" : MessageLookupByLibrary.simpleMessage("专栏"),
+    "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:注销帐号后不可恢复，相关数据和信息会永久删除。"),
     "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
     "ziti" : MessageLookupByLibrary.simpleMessage("自提"),
     "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),
     "zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型：自提兑换券"),
     "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"),
     "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"),
+    "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
     "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"),
     "zuozhe" : m39
   };

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -115,8 +115,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
     "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"),
     "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"),
+    "bianjigerenziliao" : MessageLookupByLibrary.simpleMessage("编辑个人资料"),
     "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"),
+    "biaoweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"),
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"),
+    "bofangcishu" : MessageLookupByLibrary.simpleMessage("播放次数"),
     "bojin" : MessageLookupByLibrary.simpleMessage("铂金"),
     "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
     "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持开票"),
@@ -139,6 +142,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"),
     "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员，享专属权益"),
     "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
+    "chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
     "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
     "chongzhizuixiaojine" : m1,
     "chuangjianshijian" : m2,
@@ -181,6 +185,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanhao" : MessageLookupByLibrary.simpleMessage("订单号"),
     "dingdanjiesuan" : MessageLookupByLibrary.simpleMessage("订单结算"),
     "dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"),
+    "dingdantongzhi" : MessageLookupByLibrary.simpleMessage("订单通知"),
     "dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("订单消息"),
     "dingdanyisongda" : MessageLookupByLibrary.simpleMessage("订单送达"),
     "dingdanyituikuan" : MessageLookupByLibrary.simpleMessage("订单已退款"),
@@ -188,6 +193,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanyizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"),
     "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
     "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
+    "dongtai" : MessageLookupByLibrary.simpleMessage("动态"),
     "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
     "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
     "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@@ -199,9 +205,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "duihuanquan" : MessageLookupByLibrary.simpleMessage("兑换券"),
     "duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("兑换商品详情"),
     "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"),
+    "fabu" : MessageLookupByLibrary.simpleMessage("发布"),
     "fangshier" : MessageLookupByLibrary.simpleMessage("方式二"),
     "fangshiyi" : MessageLookupByLibrary.simpleMessage("方式一"),
     "fanhuiduihuanlishi" : MessageLookupByLibrary.simpleMessage("返回兑换历史"),
+    "fanhuishequn" : MessageLookupByLibrary.simpleMessage("返回社群"),
+    "fanhuishouye" : MessageLookupByLibrary.simpleMessage("返回首页"),
     "fankui" : MessageLookupByLibrary.simpleMessage("反馈"),
     "fankuilizi" : MessageLookupByLibrary.simpleMessage("您可以在这里输入反馈内容,例如产品建议，功能异常等"),
     "fantizhongwen" : MessageLookupByLibrary.simpleMessage("繁体中文"),
@@ -212,6 +221,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "feishiwuduihuanma" : MessageLookupByLibrary.simpleMessage("非实物兑换吗"),
     "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非实物商品兑换后领取到卡包即可使用！"),
     "fensi" : MessageLookupByLibrary.simpleMessage("粉丝"),
+    "fenxiang" : MessageLookupByLibrary.simpleMessage("分享"),
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
     "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"),
     "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。"),
@@ -221,8 +231,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"),
     "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
     "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"),
+    "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更换背景"),
     "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"),
     "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"),
+    "gexingqianming" : MessageLookupByLibrary.simpleMessage("个性签名"),
     "gong" : MessageLookupByLibrary.simpleMessage("共"),
     "gongchuanghuiyuan" : MessageLookupByLibrary.simpleMessage("共创会员"),
     "gongjijian" : m6,
@@ -277,6 +289,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jiajifen" : m11,
     "jian" : MessageLookupByLibrary.simpleMessage("件"),
     "jiangli" : MessageLookupByLibrary.simpleMessage("奖励"),
+    "jiangshi" : MessageLookupByLibrary.simpleMessage("讲师"),
     "jianjie" : m12,
     "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"),
     "jiesuan" : MessageLookupByLibrary.simpleMessage("结算"),
@@ -291,15 +304,22 @@ class MessageLookup extends MessageLookupByLibrary {
     "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("净弼积分商城"),
     "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
     "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
+    "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"),
     "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),
     "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"),
     "jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"),
     "jinxingbangdingfuka" : MessageLookupByLibrary.simpleMessage("进行绑定副卡"),
+    "jinxingfukabangding" : MessageLookupByLibrary.simpleMessage("进行副卡绑定"),
+    "jinxingzhanghaozhuxiao" : MessageLookupByLibrary.simpleMessage("进行账号注销"),
     "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"),
     "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage(" 集团创办人"),
     "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集团创始人"),
     "jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"),
     "jixuzhifu" : MessageLookupByLibrary.simpleMessage("继续支付"),
+    "jubao" : MessageLookupByLibrary.simpleMessage("举报"),
+    "jubaogaineirong" : MessageLookupByLibrary.simpleMessage("举报该内容"),
+    "jubaotishi" : MessageLookupByLibrary.simpleMessage("您的举报正在等待人工审核，我们会在7~15个工作日处理，处理结果可在"),
+    "jubaoyuanyin" : MessageLookupByLibrary.simpleMessage("请输入举报原因，以便我们更快定位问题，快速处理"),
     "jujue" : MessageLookupByLibrary.simpleMessage("拒绝"),
     "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
     "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
@@ -320,6 +340,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"),
     "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
     "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即开通"),
+    "lijilingqu" : MessageLookupByLibrary.simpleMessage("立即领取"),
     "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"),
     "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"),
     "lingqu" : MessageLookupByLibrary.simpleMessage("领取"),
@@ -377,6 +398,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隐私服务》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本机号码登录"),
     "qiandao" : MessageLookupByLibrary.simpleMessage("签到"),
+    "qiandaodejifen" : MessageLookupByLibrary.simpleMessage("签到得积分"),
     "qiandaolingjifen" : MessageLookupByLibrary.simpleMessage("签到领积分"),
     "qiandaolingqujinfen" : MessageLookupByLibrary.simpleMessage("签到领取积分"),
     "qiandaowancheng" : MessageLookupByLibrary.simpleMessage("签到完成"),
@@ -420,12 +442,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "qudanhao" : m23,
     "qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"),
     "queding" : MessageLookupByLibrary.simpleMessage("确定"),
+    "quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("确定要删除这条动态？"),
     "queren" : MessageLookupByLibrary.simpleMessage("确认"),
     "querenbangding" : MessageLookupByLibrary.simpleMessage("确认绑定"),
     "querenchongzhi" : MessageLookupByLibrary.simpleMessage("确认充值"),
     "querenduihuan" : MessageLookupByLibrary.simpleMessage("确认兑换"),
     "querenshouhuo" : MessageLookupByLibrary.simpleMessage("确认收货"),
     "querenyaoshanchudangqianpinglunma" : MessageLookupByLibrary.simpleMessage("确认要删除当前评论？"),
+    "querenzhuxiao" : MessageLookupByLibrary.simpleMessage("确认注销"),
     "quhexiao" : MessageLookupByLibrary.simpleMessage("去核销"),
     "quhuozhong" : MessageLookupByLibrary.simpleMessage("取货中"),
     "qujianma" : MessageLookupByLibrary.simpleMessage("取件码"),
@@ -449,6 +473,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何签到?"),
     "ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.点击净弼，进入首页，点击上方的去签到。\n2.点击我的，进入我的页面，点击上方的积分详情，进入后即可签到。"),
     "ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款，请您提前准备好订单号/取单号，并与门店人员进行联系"),
+    "saoma" : MessageLookupByLibrary.simpleMessage("扫码"),
     "saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("扫码识别，关注公众号"),
     "send_code" : MessageLookupByLibrary.simpleMessage("发送验证"),
     "shanchu" : MessageLookupByLibrary.simpleMessage("删除"),
@@ -493,13 +518,16 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
     "sui" : m28,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
+    "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
     "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
     "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
+    "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"),
     "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"),
     "tixian" : MessageLookupByLibrary.simpleMessage("提现"),
     "tongyibingjixu" : MessageLookupByLibrary.simpleMessage("同意并继续"),
     "tongzhi" : MessageLookupByLibrary.simpleMessage("通知"),
     "tongzhitishixinxi" : MessageLookupByLibrary.simpleMessage("为了您可以及时收到我们的活动信息，推荐您在使用HISAPP时打开通知的接收"),
+    "toushuxuzhi" : MessageLookupByLibrary.simpleMessage("投书须知"),
     "touxiang" : MessageLookupByLibrary.simpleMessage("头像"),
     "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登录"),
     "tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"),
@@ -527,8 +555,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "wentijian" : MessageLookupByLibrary.simpleMessage("问题件"),
     "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章详情"),
+    "wenzhangzhuanlan" : MessageLookupByLibrary.simpleMessage("文章专栏"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未领取"),
     "wodechengjiu" : MessageLookupByLibrary.simpleMessage("我的成就"),
+    "wodedingdan" : MessageLookupByLibrary.simpleMessage("我的订单"),
     "wodedongtai" : MessageLookupByLibrary.simpleMessage("我的动态"),
     "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的会员等级"),
@@ -567,9 +597,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
     "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系统消息"),
     "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
+    "xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用户名"),
     "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"),
     "xuanji" : MessageLookupByLibrary.simpleMessage("选集"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
+    "yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"),
     "yaoqingrenshoujihao_" : m32,
     "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
@@ -632,10 +664,13 @@ class MessageLookup extends MessageLookupByLibrary {
     "zaituzhong" : MessageLookupByLibrary.simpleMessage("运输中"),
     "zaixiankefu" : MessageLookupByLibrary.simpleMessage("在线客服"),
     "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暂不支持线上点餐"),
+    "zanweijiesuo" : MessageLookupByLibrary.simpleMessage("暂未解锁"),
+    "zanweikaifang" : MessageLookupByLibrary.simpleMessage("暂未开放"),
     "zanwupinglun" : MessageLookupByLibrary.simpleMessage("暂无评论，快来评论吧"),
     "zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暂无线上门店"),
     "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暂无优惠券可领取"),
     "zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("账号授权"),
+    "zhanghaozhuxiaoshuoming" : MessageLookupByLibrary.simpleMessage("账号注销说明"),
     "zhanghuyue" : MessageLookupByLibrary.simpleMessage("账户余额"),
     "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫骑手"),
     "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加载"),
@@ -649,12 +684,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhizuowancheng" : MessageLookupByLibrary.simpleMessage("制作完成"),
     "zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
     "zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"),
+    "zhuanlan" : MessageLookupByLibrary.simpleMessage("专栏"),
+    "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:注销帐号后不可恢复，相关数据和信息会永久删除。"),
     "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
     "ziti" : MessageLookupByLibrary.simpleMessage("自提"),
     "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),
     "zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型：自提兑换券"),
     "zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"),
     "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"),
+    "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
     "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"),
     "zuozhe" : m39
   };

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -116,6 +116,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("備注信息"),
     "bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"),
     "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("標為已讀"),
+    "biaoweiyidu" : MessageLookupByLibrary.simpleMessage("標爲已讀"),
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("撥打電話"),
     "bojin" : MessageLookupByLibrary.simpleMessage("铂金"),
     "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回鄉"),
@@ -139,6 +140,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市選擇"),
     "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成為專屬會員，享專屬權益"),
     "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
+    "chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
     "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
     "chongzhizuixiaojine" : m1,
     "chuangjianshijian" : m2,
@@ -181,6 +183,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanhao" : MessageLookupByLibrary.simpleMessage("訂單號"),
     "dingdanjiesuan" : MessageLookupByLibrary.simpleMessage("訂單結算"),
     "dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"),
+    "dingdantongzhi" : MessageLookupByLibrary.simpleMessage("訂單通知"),
     "dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("訂單消息"),
     "dingdanyisongda" : MessageLookupByLibrary.simpleMessage("訂單送達"),
     "dingdanyituikuan" : MessageLookupByLibrary.simpleMessage("訂單已退款"),
@@ -188,6 +191,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanyizhifu" : MessageLookupByLibrary.simpleMessage("訂單已支付"),
     "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
     "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
+    "dongtai" : MessageLookupByLibrary.simpleMessage("動態"),
     "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
     "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
     "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@@ -199,9 +203,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "duihuanquan" : MessageLookupByLibrary.simpleMessage("兌換券"),
     "duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("兑换商品详情"),
     "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"),
+    "fabu" : MessageLookupByLibrary.simpleMessage("發佈"),
     "fangshier" : MessageLookupByLibrary.simpleMessage("方式二"),
     "fangshiyi" : MessageLookupByLibrary.simpleMessage("方式一"),
     "fanhuiduihuanlishi" : MessageLookupByLibrary.simpleMessage("返回兌換歷史"),
+    "fanhuishequn" : MessageLookupByLibrary.simpleMessage("返回社群"),
+    "fanhuishouye" : MessageLookupByLibrary.simpleMessage("返回首頁"),
     "fankui" : MessageLookupByLibrary.simpleMessage("反饋"),
     "fankuilizi" : MessageLookupByLibrary.simpleMessage("您可以在這裡輸入迴響內容，例如產品建議,功能异常等"),
     "fantizhongwen" : MessageLookupByLibrary.simpleMessage("繁体中文"),
@@ -212,6 +219,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "feishiwuduihuanma" : MessageLookupByLibrary.simpleMessage("非實物兌換碼"),
     "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非實物商品！"),
     "fensi" : MessageLookupByLibrary.simpleMessage("粉絲"),
+    "fenxiang" : MessageLookupByLibrary.simpleMessage("分享"),
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
     "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接點擊右上方的分享給到你想要邀請的人。"),
     "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("將邀請碼分享給好友，對方在一心回鄉App登入頁輸入邀請碼，即可邀請成功。"),
@@ -221,8 +229,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "geiwopingfen" : MessageLookupByLibrary.simpleMessage("給我評分"),
     "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
     "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多優惠券"),
+    "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更換背景"),
     "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"),
     "gerenxinxi" : MessageLookupByLibrary.simpleMessage("個人信息"),
+    "gexingqianming" : MessageLookupByLibrary.simpleMessage("個性簽名"),
     "gong" : MessageLookupByLibrary.simpleMessage("共"),
     "gongchuanghuiyuan" : MessageLookupByLibrary.simpleMessage("共创会员"),
     "gongjijian" : m6,
@@ -277,6 +287,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jiajifen" : m11,
     "jian" : MessageLookupByLibrary.simpleMessage("件"),
     "jiangli" : MessageLookupByLibrary.simpleMessage("獎勵"),
+    "jiangshi" : MessageLookupByLibrary.simpleMessage("講師"),
     "jianjie" : m12,
     "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加載失敗"),
     "jiesuan" : MessageLookupByLibrary.simpleMessage("結算"),
@@ -291,15 +302,22 @@ class MessageLookup extends MessageLookupByLibrary {
     "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("淨弼積分商城"),
     "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"),
     "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"),
+    "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精選好文"),
     "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),
     "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日會員任務"),
     "jinrushangdian" : MessageLookupByLibrary.simpleMessage("進入商店"),
     "jinxingbangdingfuka" : MessageLookupByLibrary.simpleMessage("進行綁定副卡"),
+    "jinxingfukabangding" : MessageLookupByLibrary.simpleMessage("進行副卡綁定"),
+    "jinxingzhanghaozhuxiao" : MessageLookupByLibrary.simpleMessage("進行賬號注銷"),
     "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("進行中的訂單"),
     "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"),
     "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集團創始人"),
     "jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"),
     "jixuzhifu" : MessageLookupByLibrary.simpleMessage("繼續支付"),
+    "jubao" : MessageLookupByLibrary.simpleMessage("舉報"),
+    "jubaogaineirong" : MessageLookupByLibrary.simpleMessage("舉報該内容"),
+    "jubaotishi" : MessageLookupByLibrary.simpleMessage("您的舉報正在等待人工稽核，我們會在7~15個工作日處理，處理結果可在"),
+    "jubaoyuanyin" : MessageLookupByLibrary.simpleMessage("請輸入舉報原因，以便我們更快定位問題，快速處理"),
     "jujue" : MessageLookupByLibrary.simpleMessage("拒絕"),
     "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
     "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
@@ -320,6 +338,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即參加"),
     "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
     "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即開通"),
+    "lijilingqu" : MessageLookupByLibrary.simpleMessage("立即領取"),
     "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即簽到"),
     "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即體驗"),
     "lingqu" : MessageLookupByLibrary.simpleMessage("領取"),
@@ -377,6 +396,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隱私服務》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本機號碼登錄"),
     "qiandao" : MessageLookupByLibrary.simpleMessage("簽到"),
+    "qiandaodejifen" : MessageLookupByLibrary.simpleMessage("簽到得積分"),
     "qiandaolingjifen" : MessageLookupByLibrary.simpleMessage("簽到領積分"),
     "qiandaolingqujinfen" : MessageLookupByLibrary.simpleMessage("簽到領取積分"),
     "qiandaowancheng" : MessageLookupByLibrary.simpleMessage("簽到完成"),
@@ -420,12 +440,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "qudanhao" : m23,
     "qudenglu" : MessageLookupByLibrary.simpleMessage("去登錄"),
     "queding" : MessageLookupByLibrary.simpleMessage("確定"),
+    "quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("確定要刪除這條動態？"),
     "queren" : MessageLookupByLibrary.simpleMessage("确认"),
     "querenbangding" : MessageLookupByLibrary.simpleMessage("確認綁定"),
     "querenchongzhi" : MessageLookupByLibrary.simpleMessage("確認充值"),
     "querenduihuan" : MessageLookupByLibrary.simpleMessage("确认兑换"),
     "querenshouhuo" : MessageLookupByLibrary.simpleMessage("確認收貨"),
     "querenyaoshanchudangqianpinglunma" : MessageLookupByLibrary.simpleMessage("確認要刪除當前評論嗎？"),
+    "querenzhuxiao" : MessageLookupByLibrary.simpleMessage("確認注銷"),
     "quhexiao" : MessageLookupByLibrary.simpleMessage("去核銷"),
     "quhuozhong" : MessageLookupByLibrary.simpleMessage("取貨中"),
     "qujianma" : MessageLookupByLibrary.simpleMessage("取件碼"),
@@ -449,6 +471,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何簽到?"),
     "ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.點擊淨弼，進入首頁，點擊上方的去簽到。\n2.點擊我的，進入我的頁面，點擊上方的積分詳情，進入後即可簽到。"),
     "ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款，請您提前準備好訂單號/取單號，並與門店人員進行聯繫"),
+    "saoma" : MessageLookupByLibrary.simpleMessage("掃碼"),
     "saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("掃碼識別，關注公眾號"),
     "send_code" : MessageLookupByLibrary.simpleMessage("發送驗證碼"),
     "shanchu" : MessageLookupByLibrary.simpleMessage("刪除"),
@@ -492,13 +515,16 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"),
     "sui" : m28,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"),
+    "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
     "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
     "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
+    "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"),
     "tingchewei" : MessageLookupByLibrary.simpleMessage("停車位"),
     "tixian" : MessageLookupByLibrary.simpleMessage("提現"),
     "tongyibingjixu" : MessageLookupByLibrary.simpleMessage("同意並繼續"),
     "tongzhi" : MessageLookupByLibrary.simpleMessage("通知"),
     "tongzhitishixinxi" : MessageLookupByLibrary.simpleMessage("為了您可以及時收到我們的活動資訊，推薦您在使用HISAPP時打開通知的接收 "),
+    "toushuxuzhi" : MessageLookupByLibrary.simpleMessage("投書須知"),
     "touxiang" : MessageLookupByLibrary.simpleMessage("頭像"),
     "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登錄"),
     "tuiguangma" : MessageLookupByLibrary.simpleMessage("推廣碼"),
@@ -526,8 +552,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "wentijian" : MessageLookupByLibrary.simpleMessage("問題件"),
     "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章詳情"),
+    "wenzhangzhuanlan" : MessageLookupByLibrary.simpleMessage("文章專欄"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未領取"),
     "wodechengjiu" : MessageLookupByLibrary.simpleMessage("我的成就"),
+    "wodedingdan" : MessageLookupByLibrary.simpleMessage("我的訂單"),
     "wodedongtai" : MessageLookupByLibrary.simpleMessage("我的動態"),
     "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的會員等級"),
@@ -566,9 +594,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系統通知"),
     "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系統消息"),
     "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
+    "xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用戶名"),
     "xuanguige" : MessageLookupByLibrary.simpleMessage("選規格"),
     "xuanji" : MessageLookupByLibrary.simpleMessage("選集"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"),
+    "yanzhengma" : MessageLookupByLibrary.simpleMessage("驗證碼"),
     "yaoqingrenshoujihao_" : m32,
     "yibangfuka" : MessageLookupByLibrary.simpleMessage("已綁副卡"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"),
@@ -631,11 +661,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "zaituzhong" : MessageLookupByLibrary.simpleMessage("運輸中"),
     "zaixiankefu" : MessageLookupByLibrary.simpleMessage("在線客服"),
     "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暫不支持線上點餐"),
+    "zanweijiesuo" : MessageLookupByLibrary.simpleMessage("暫未解鎖"),
+    "zanweikaifang" : MessageLookupByLibrary.simpleMessage("暂未开放"),
     "zanwupinglun" : MessageLookupByLibrary.simpleMessage("暫無評論，快去評論吧～"),
     "zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暫無綫上門店"),
     "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暫無優惠券可領取"),
     "zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("賬號授權"),
     "zhanghaoxinxi" : MessageLookupByLibrary.simpleMessage("賬號信息"),
+    "zhanghaozhuxiaoshuoming" : MessageLookupByLibrary.simpleMessage("賬號注銷説明"),
     "zhanghuyue" : MessageLookupByLibrary.simpleMessage("賬戶餘額"),
     "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫騎手"),
     "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加載"),
@@ -649,12 +682,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhizuowancheng" : MessageLookupByLibrary.simpleMessage("製作完成"),
     "zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
     "zhongwenjianti" : MessageLookupByLibrary.simpleMessage("中文簡體"),
+    "zhuanlan" : MessageLookupByLibrary.simpleMessage("專欄"),
+    "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒：註銷帳號後不可恢復，相關資料和資訊會永久删除。"),
     "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
     "ziti" : MessageLookupByLibrary.simpleMessage("自提"),
     "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),
     "zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型：自提兑换券"),
     "zitishijian" : MessageLookupByLibrary.simpleMessage("自提時間"),
     "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"),
+    "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
     "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"),
     "zuozhe" : m39
   };

lib/generated/intl/messages_zh_TW.dart

@@ -115,8 +115,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "beizhu" : MessageLookupByLibrary.simpleMessage("備注"),
     "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("備注信息"),
     "bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"),
+    "bianjigerenziliao" : MessageLookupByLibrary.simpleMessage("編輯個人資料"),
     "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("標為已讀"),
+    "biaoweiyidu" : MessageLookupByLibrary.simpleMessage("標爲已讀"),
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("撥打電話"),
+    "bofangcishu" : MessageLookupByLibrary.simpleMessage("播放次數"),
     "bojin" : MessageLookupByLibrary.simpleMessage("铂金"),
     "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回鄉"),
     "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持開票"),
@@ -139,6 +142,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市選擇"),
     "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成為專屬會員，享專屬權益"),
     "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
+    "chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
     "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
     "chongzhizuixiaojine" : m1,
     "chuangjianshijian" : m2,
@@ -181,6 +185,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanhao" : MessageLookupByLibrary.simpleMessage("訂單號"),
     "dingdanjiesuan" : MessageLookupByLibrary.simpleMessage("訂單結算"),
     "dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"),
+    "dingdantongzhi" : MessageLookupByLibrary.simpleMessage("訂單通知"),
     "dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("訂單消息"),
     "dingdanyisongda" : MessageLookupByLibrary.simpleMessage("訂單送達"),
     "dingdanyituikuan" : MessageLookupByLibrary.simpleMessage("訂單已退款"),
@@ -188,6 +193,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dingdanyizhifu" : MessageLookupByLibrary.simpleMessage("訂單已支付"),
     "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
     "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
+    "dongtai" : MessageLookupByLibrary.simpleMessage("動態"),
     "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
     "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
     "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@@ -199,9 +205,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "duihuanquan" : MessageLookupByLibrary.simpleMessage("兌換券"),
     "duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("兑换商品详情"),
     "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"),
+    "fabu" : MessageLookupByLibrary.simpleMessage("發佈"),
     "fangshier" : MessageLookupByLibrary.simpleMessage("方式二"),
     "fangshiyi" : MessageLookupByLibrary.simpleMessage("方式一"),
     "fanhuiduihuanlishi" : MessageLookupByLibrary.simpleMessage("返回兌換歷史"),
+    "fanhuishequn" : MessageLookupByLibrary.simpleMessage("返回社群"),
+    "fanhuishouye" : MessageLookupByLibrary.simpleMessage("返回首頁"),
     "fankui" : MessageLookupByLibrary.simpleMessage("反饋"),
     "fankuilizi" : MessageLookupByLibrary.simpleMessage("您可以在這裡輸入迴響內容，例如產品建議，功能异常等"),
     "fantizhongwen" : MessageLookupByLibrary.simpleMessage("繁体中文"),
@@ -212,6 +221,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "feishiwuduihuanma" : MessageLookupByLibrary.simpleMessage("非實物兌換碼"),
     "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("非實物商品！"),
     "fensi" : MessageLookupByLibrary.simpleMessage("粉絲"),
+    "fenxiang" : MessageLookupByLibrary.simpleMessage("分享"),
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
     "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接點擊右上方的分享給到你想要邀請的人。"),
     "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("將邀請碼分享給好友，對方在一心回鄉App登入頁輸入邀請碼，即可邀請成功。"),
@@ -221,8 +231,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "geiwopingfen" : MessageLookupByLibrary.simpleMessage("給我評分"),
     "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
     "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多優惠券"),
+    "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更換背景"),
     "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更換頭像"),
     "gerenxinxi" : MessageLookupByLibrary.simpleMessage("個人信息"),
+    "gexingqianming" : MessageLookupByLibrary.simpleMessage("個性簽名"),
     "gong" : MessageLookupByLibrary.simpleMessage("共"),
     "gongchuanghuiyuan" : MessageLookupByLibrary.simpleMessage("共创会员"),
     "gongjijian" : m6,
@@ -277,6 +289,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "jiajifen" : m11,
     "jian" : MessageLookupByLibrary.simpleMessage("件"),
     "jiangli" : MessageLookupByLibrary.simpleMessage("獎勵"),
+    "jiangshi" : MessageLookupByLibrary.simpleMessage("講師"),
     "jianjie" : m12,
     "jiazaishibai" : MessageLookupByLibrary.simpleMessage("加載失敗"),
     "jiesuan" : MessageLookupByLibrary.simpleMessage("結算"),
@@ -291,15 +304,22 @@ class MessageLookup extends MessageLookupByLibrary {
     "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("淨弼積分商城"),
     "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"),
     "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"),
+    "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精選好文"),
     "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),
     "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日會員任務"),
     "jinrushangdian" : MessageLookupByLibrary.simpleMessage("進入商店"),
     "jinxingbangdingfuka" : MessageLookupByLibrary.simpleMessage("進行綁定副卡"),
+    "jinxingfukabangding" : MessageLookupByLibrary.simpleMessage("進行副卡綁定"),
+    "jinxingzhanghaozhuxiao" : MessageLookupByLibrary.simpleMessage("進行賬號注銷"),
     "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("進行中的訂單"),
     "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"),
     "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集團創始人"),
     "jixuduihuan" : MessageLookupByLibrary.simpleMessage("继续兑换"),
     "jixuzhifu" : MessageLookupByLibrary.simpleMessage("繼續支付"),
+    "jubao" : MessageLookupByLibrary.simpleMessage("舉報"),
+    "jubaogaineirong" : MessageLookupByLibrary.simpleMessage("舉報該内容"),
+    "jubaotishi" : MessageLookupByLibrary.simpleMessage("您的舉報正在等待人工稽核，我們會在7~15個工作日處理，處理結果可在"),
+    "jubaoyuanyin" : MessageLookupByLibrary.simpleMessage("請輸入舉報原因，以便我們更快定位問題，快速處理"),
     "jujue" : MessageLookupByLibrary.simpleMessage("拒絕"),
     "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
     "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
@@ -320,6 +340,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即參加"),
     "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
     "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即開通"),
+    "lijilingqu" : MessageLookupByLibrary.simpleMessage("立即領取"),
     "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即簽到"),
     "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即體驗"),
     "lingqu" : MessageLookupByLibrary.simpleMessage("領取"),
@@ -377,6 +398,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隱私服務》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本機號碼登錄"),
     "qiandao" : MessageLookupByLibrary.simpleMessage("簽到"),
+    "qiandaodejifen" : MessageLookupByLibrary.simpleMessage("簽到得積分"),
     "qiandaolingjifen" : MessageLookupByLibrary.simpleMessage("簽到領積分"),
     "qiandaolingqujinfen" : MessageLookupByLibrary.simpleMessage("簽到領取積分"),
     "qiandaowancheng" : MessageLookupByLibrary.simpleMessage("簽到完成"),
@@ -420,12 +442,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "qudanhao" : m23,
     "qudenglu" : MessageLookupByLibrary.simpleMessage("去登錄"),
     "queding" : MessageLookupByLibrary.simpleMessage("確定"),
+    "quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("確定要刪除這條動態？"),
     "queren" : MessageLookupByLibrary.simpleMessage("确认"),
     "querenbangding" : MessageLookupByLibrary.simpleMessage("確認綁定"),
     "querenchongzhi" : MessageLookupByLibrary.simpleMessage("確認充值"),
     "querenduihuan" : MessageLookupByLibrary.simpleMessage("确认兑换"),
     "querenshouhuo" : MessageLookupByLibrary.simpleMessage("確認收貨"),
     "querenyaoshanchudangqianpinglunma" : MessageLookupByLibrary.simpleMessage("確認要刪除當前評論嗎？"),
+    "querenzhuxiao" : MessageLookupByLibrary.simpleMessage("確認注銷"),
     "quhexiao" : MessageLookupByLibrary.simpleMessage("去核銷"),
     "quhuozhong" : MessageLookupByLibrary.simpleMessage("取貨中"),
     "qujianma" : MessageLookupByLibrary.simpleMessage("取件碼"),
@@ -449,6 +473,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何簽到?"),
     "ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.點擊淨弼，進入首頁，點擊上方的去簽到。\n2.點擊我的，進入我的頁面，點擊上方的積分詳情，進入後即可簽到。"),
     "ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款，請您提前準備好訂單號/取單號，並與門店人員進行聯繫"),
+    "saoma" : MessageLookupByLibrary.simpleMessage("掃碼"),
     "saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("掃碼識別，關注公眾號"),
     "send_code" : MessageLookupByLibrary.simpleMessage("發送驗證碼"),
     "shanchu" : MessageLookupByLibrary.simpleMessage("刪除"),
@@ -493,13 +518,16 @@ class MessageLookup extends MessageLookupByLibrary {
     "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"),
     "sui" : m28,
     "tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"),
+    "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
     "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
     "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
+    "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"),
     "tingchewei" : MessageLookupByLibrary.simpleMessage("停車位"),
     "tixian" : MessageLookupByLibrary.simpleMessage("提現"),
     "tongyibingjixu" : MessageLookupByLibrary.simpleMessage("同意並繼續"),
     "tongzhi" : MessageLookupByLibrary.simpleMessage("通知"),
     "tongzhitishixinxi" : MessageLookupByLibrary.simpleMessage("為了您可以及時收到我們的活動資訊，推薦您在使用HISAPP時打開通知的接收 "),
+    "toushuxuzhi" : MessageLookupByLibrary.simpleMessage("投書須知"),
     "touxiang" : MessageLookupByLibrary.simpleMessage("頭像"),
     "tuichudenglu" : MessageLookupByLibrary.simpleMessage("退出登錄"),
     "tuiguangma" : MessageLookupByLibrary.simpleMessage("推廣碼"),
@@ -527,8 +555,10 @@ class MessageLookup extends MessageLookupByLibrary {
     "wentijian" : MessageLookupByLibrary.simpleMessage("問題件"),
     "wenzhang" : MessageLookupByLibrary.simpleMessage("文章"),
     "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("文章詳情"),
+    "wenzhangzhuanlan" : MessageLookupByLibrary.simpleMessage("文章專欄"),
     "weulingqu" : MessageLookupByLibrary.simpleMessage("未領取"),
     "wodechengjiu" : MessageLookupByLibrary.simpleMessage("我的成就"),
+    "wodedingdan" : MessageLookupByLibrary.simpleMessage("我的訂單"),
     "wodedongtai" : MessageLookupByLibrary.simpleMessage("我的動態"),
     "wodegongju" : MessageLookupByLibrary.simpleMessage("我的工具"),
     "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("我的會員等級"),
@@ -567,9 +597,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系統通知"),
     "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("系統消息"),
     "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("修改成功"),
+    "xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用戶名"),
     "xuanguige" : MessageLookupByLibrary.simpleMessage("選規格"),
     "xuanji" : MessageLookupByLibrary.simpleMessage("選集"),
     "xuni" : MessageLookupByLibrary.simpleMessage("虛擬"),
+    "yanzhengma" : MessageLookupByLibrary.simpleMessage("驗證碼"),
     "yaoqingrenshoujihao_" : m32,
     "yibangfuka" : MessageLookupByLibrary.simpleMessage("已綁副卡"),
     "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"),
@@ -632,11 +664,14 @@ class MessageLookup extends MessageLookupByLibrary {
     "zaituzhong" : MessageLookupByLibrary.simpleMessage("運輸中"),
     "zaixiankefu" : MessageLookupByLibrary.simpleMessage("在線客服"),
     "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暫不支持線上點餐"),
+    "zanweijiesuo" : MessageLookupByLibrary.simpleMessage("暫未解鎖"),
+    "zanweikaifang" : MessageLookupByLibrary.simpleMessage("暫未開放"),
     "zanwupinglun" : MessageLookupByLibrary.simpleMessage("暫無評論，快去評論吧～"),
     "zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暫無綫上門店"),
     "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暫無優惠券可領取"),
     "zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("賬號授權"),
     "zhanghaoxinxi" : MessageLookupByLibrary.simpleMessage("賬號信息"),
+    "zhanghaozhuxiaoshuoming" : MessageLookupByLibrary.simpleMessage("賬號注銷説明"),
     "zhanghuyue" : MessageLookupByLibrary.simpleMessage("賬戶餘額"),
     "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫騎手"),
     "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加載"),
@@ -650,12 +685,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhizuowancheng" : MessageLookupByLibrary.simpleMessage("製作完成"),
     "zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
     "zhongwenjianti" : MessageLookupByLibrary.simpleMessage("中文簡體"),
+    "zhuanlan" : MessageLookupByLibrary.simpleMessage("專欄"),
+    "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒：註銷帳號後不可恢復，相關資料和資訊會永久删除。"),
     "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
     "ziti" : MessageLookupByLibrary.simpleMessage("自提"),
     "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),
     "zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型：自提兑换券"),
     "zitishijian" : MessageLookupByLibrary.simpleMessage("自提時間"),
     "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"),
+    "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
     "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"),
     "zuozhe" : m39
   };

lib/generated/l10n.dart

@@ -5635,6 +5635,386 @@ class S {
     );
   }
 
+  /// `播放次数`
+  String get bofangcishu {
+    return Intl.message(
+      '播放次数',
+      name: 'bofangcishu',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `讲师`
+  String get jiangshi {
+    return Intl.message(
+      '讲师',
+      name: 'jiangshi',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `确定要删除这条动态？`
+  String get quedingyaoshanchudongtai {
+    return Intl.message(
+      '确定要删除这条动态？',
+      name: 'quedingyaoshanchudongtai',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `分享`
+  String get fenxiang {
+    return Intl.message(
+      '分享',
+      name: 'fenxiang',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `举报该内容`
+  String get jubaogaineirong {
+    return Intl.message(
+      '举报该内容',
+      name: 'jubaogaineirong',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `精选好文`
+  String get jingxuanhaowen {
+    return Intl.message(
+      '精选好文',
+      name: 'jingxuanhaowen',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `最新文章`
+  String get zuixinwenzhang {
+    return Intl.message(
+      '最新文章',
+      name: 'zuixinwenzhang',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `文章专栏`
+  String get wenzhangzhuanlan {
+    return Intl.message(
+      '文章专栏',
+      name: 'wenzhangzhuanlan',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `专栏`
+  String get zhuanlan {
+    return Intl.message(
+      '专栏',
+      name: 'zhuanlan',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `投书须知`
+  String get toushuxuzhi {
+    return Intl.message(
+      '投书须知',
+      name: 'toushuxuzhi',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `举报`
+  String get jubao {
+    return Intl.message(
+      '举报',
+      name: 'jubao',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `请输入举报原因，以便我们更快定位问题，快速处理`
+  String get jubaoyuanyin {
+    return Intl.message(
+      '请输入举报原因，以便我们更快定位问题，快速处理',
+      name: 'jubaoyuanyin',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `提交成功`
+  String get tijiaochenggong {
+    return Intl.message(
+      '提交成功',
+      name: 'tijiaochenggong',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `您的举报正在等待人工审核，我们会在7~15个工作日处理，处理结果可在`
+  String get jubaotishi {
+    return Intl.message(
+      '您的举报正在等待人工审核，我们会在7~15个工作日处理，处理结果可在',
+      name: 'jubaotishi',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `返回社群`
+  String get fanhuishequn {
+    return Intl.message(
+      '返回社群',
+      name: 'fanhuishequn',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `发布`
+  String get fabu {
+    return Intl.message(
+      '发布',
+      name: 'fabu',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `订单通知`
+  String get dingdantongzhi {
+    return Intl.message(
+      '订单通知',
+      name: 'dingdantongzhi',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `充值成功`
+  String get chongzhichenggong {
+    return Intl.message(
+      '充值成功',
+      name: 'chongzhichenggong',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `标为已读`
+  String get biaoweiyidu {
+    return Intl.message(
+      '标为已读',
+      name: 'biaoweiyidu',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `我的订单`
+  String get wodedingdan {
+    return Intl.message(
+      '我的订单',
+      name: 'wodedingdan',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `签到得积分`
+  String get qiandaodejifen {
+    return Intl.message(
+      '签到得积分',
+      name: 'qiandaodejifen',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `暂未开放`
+  String get zanweikaifang {
+    return Intl.message(
+      '暂未开放',
+      name: 'zanweikaifang',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `暂未解锁`
+  String get zanweijiesuo {
+    return Intl.message(
+      '暂未解锁',
+      name: 'zanweijiesuo',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `添加新副卡`
+  String get tianjiaxinfuka {
+    return Intl.message(
+      '添加新副卡',
+      name: 'tianjiaxinfuka',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `进行副卡绑定`
+  String get jinxingfukabangding {
+    return Intl.message(
+      '进行副卡绑定',
+      name: 'jinxingfukabangding',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `修改用户名`
+  String get xiugaiyonghuming {
+    return Intl.message(
+      '修改用户名',
+      name: 'xiugaiyonghuming',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `个性签名`
+  String get gexingqianming {
+    return Intl.message(
+      '个性签名',
+      name: 'gexingqianming',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `更换背景`
+  String get genghuanbeijing {
+    return Intl.message(
+      '更换背景',
+      name: 'genghuanbeijing',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `动态`
+  String get dongtai {
+    return Intl.message(
+      '动态',
+      name: 'dongtai',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `编辑个人资料`
+  String get bianjigerenziliao {
+    return Intl.message(
+      '编辑个人资料',
+      name: 'bianjigerenziliao',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `扫码`
+  String get saoma {
+    return Intl.message(
+      '扫码',
+      name: 'saoma',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `进行账号注销`
+  String get jinxingzhanghaozhuxiao {
+    return Intl.message(
+      '进行账号注销',
+      name: 'jinxingzhanghaozhuxiao',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `再次提醒:注销帐号后不可恢复，相关数据和信息会永久删除。`
+  String get zhuxiaotixing {
+    return Intl.message(
+      '再次提醒:注销帐号后不可恢复，相关数据和信息会永久删除。',
+      name: 'zhuxiaotixing',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `确认注销`
+  String get querenzhuxiao {
+    return Intl.message(
+      '确认注销',
+      name: 'querenzhuxiao',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `验证码`
+  String get yanzhengma {
+    return Intl.message(
+      '验证码',
+      name: 'yanzhengma',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `账号注销说明`
+  String get zhanghaozhuxiaoshuoming {
+    return Intl.message(
+      '账号注销说明',
+      name: 'zhanghaozhuxiaoshuoming',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `立即领取`
+  String get lijilingqu {
+    return Intl.message(
+      '立即领取',
+      name: 'lijilingqu',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `返回首页`
+  String get fanhuishouye {
+    return Intl.message(
+      '返回首页',
+      name: 'fanhuishouye',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `并使用本机号码登录`
   String get privacy_policy4 {
     return Intl.message(

lib/integral/integral_page.dart

@@ -12,8 +12,11 @@ import 'package:huixiang/retrofit/data/sign_info.dart';
 import 'package:huixiang/retrofit/data/user_info.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/utils/font_weight.dart';
+import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
+import 'package:huixiang/view_widget/my_footer.dart';
 import 'package:huixiang/view_widget/sign_in_widget.dart';
+import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'intergra_view/integral_task.dart';
@@ -33,6 +36,8 @@ class _IntegralPage extends State<IntegralPage> {
   UserInfo userInfo;
   List<Rank> ranks = [];
   int rankLevel = 1;
+  final ScrollController scrollController = ScrollController();
+  final RefreshController refreshController = RefreshController();
 
   querySignInfo() async {
     // EasyLoading.show(status: S.of(context).zhengzaijiazai);
@@ -51,6 +56,9 @@ class _IntegralPage extends State<IntegralPage> {
     if (rankData != null && rankData.isSuccess) {
       ranks.clear();
       ranks.addAll(rankData.data);
+      refreshController.refreshCompleted();
+    }else {
+      refreshController.refreshFailed();
     }
 
     if (userInfo != null &&
@@ -66,6 +74,7 @@ class _IntegralPage extends State<IntegralPage> {
         await apiService.signInInfo().catchError((onError) {});
     if (baseData != null && baseData.isSuccess) {
       signInfo = baseData.data;
+      refreshController.refreshCompleted();
     }
     EasyLoading.dismiss();
   }
@@ -118,27 +127,45 @@ class _IntegralPage extends State<IntegralPage> {
               ),
             ),
           ),
-          body: Container(
+          body:SmartRefresher(
-            child: SingleChildScrollView(
+            controller: refreshController,
-              physics: BouncingScrollPhysics(),
+            enablePullDown: true,
-              child: FutureBuilder(
+            enablePullUp: false,
-                future: querySignInfo(),
+            header: MyHeader(),
-                builder: (context, snap) {
+            footer: CustomFooter(
-                  return Column(
+              builder: (context, mode) {
-                    children: [
+                return MyFooter(mode);
-                      /// 上面的积分和VIP等级显示
+              },
-                      IntegralVip(rankLevel, signInfo, userInfo,"${ (signInfo?.signInList?.length ) ?? "0"}",
+            ),
-                      ((signInfo?.rewardList != null && signInfo.rewardList.length > (signInfo?.signInList?.length ?? 0)) ?
+            onRefresh:(){
-                      signInfo.rewardList[signInfo?.signInList?.length ?? 0]:0).toString()),
+              setState(() {
+                querySignInfo();
+              });
+            },
+            physics: BouncingScrollPhysics(),
+            scrollController: scrollController,
+            child: Container(
+              child: SingleChildScrollView(
+                physics: BouncingScrollPhysics(),
+                child: FutureBuilder(
+                  future: querySignInfo(),
+                  builder: (context, snap) {
+                    return Column(
+                      children: [
+                        /// 上面的积分和VIP等级显示
+                        IntegralVip(rankLevel, signInfo, userInfo,"${ (signInfo?.signInList?.length ) ?? "0"}",
+                            ((signInfo?.rewardList != null && signInfo.rewardList.length > (signInfo?.signInList?.length ?? 0)) ?
+                            signInfo.rewardList[signInfo?.signInList?.length ?? 0]:0).toString()),
 
-                      ///立即签到
+                        ///立即签到
-                      InForPoints(signInfo, _signIn),
+                        InForPoints(signInfo, _signIn),
 
-                      ///积分任务
+                        ///积分任务
-                      IntegralTask(signInfo),
+                        IntegralTask(signInfo),
-                    ],
+                      ],
-                  );
+                    );
-                },
+                  },
+                ),
               ),
             ),
           ),

lib/integral_store/integral_store_details_page.dart

@@ -12,7 +12,10 @@ import 'package:huixiang/retrofit/data/goods.dart';
 import 'package:huixiang/retrofit/data/user_info.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/utils/font_weight.dart';
+import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
+import 'package:huixiang/view_widget/my_footer.dart';
+import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
@@ -31,6 +34,8 @@ class _IntegralStoreDetailsPage extends State<IntegralStoreDetailsPage> {
   ApiService apiService;
   String points;
   int payType = 0;
+  final ScrollController scrollController = ScrollController();
+  final RefreshController refreshController = RefreshController();
 
   @override
   void initState() {
@@ -66,7 +71,10 @@ class _IntegralStoreDetailsPage extends State<IntegralStoreDetailsPage> {
             && double.tryParse(goods.oneMoney) != 0){
           payType = 3;
         }
+        refreshController.refreshCompleted();
       });
+    }else {
+      refreshController.refreshFailed();
     }
   }
 
@@ -77,40 +85,60 @@ class _IntegralStoreDetailsPage extends State<IntegralStoreDetailsPage> {
         child: Column(
           children: [
             Expanded(
-              child: SingleChildScrollView(
+              child: SmartRefresher(
+                controller: refreshController,
+                enablePullDown: true,
+                enablePullUp: false,
+                header: MyHeader(),
+                footer: CustomFooter(
+                  builder: (context, mode) {
+                    return MyFooter(mode);
+                  },
+                ),
+                onRefresh:(){
+                  setState(() {
+                    queryGoodsById();
+                  });
+                },
                 physics: BouncingScrollPhysics(),
-                child: Column(
+                scrollController: scrollController,
-                  mainAxisAlignment: MainAxisAlignment.start,
+                child: Container(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                  child: SingleChildScrollView(
-                  children: [
+                    physics: BouncingScrollPhysics(),
-                    buildProduct(),
+                    child: Column(
-                    Container(
+                      mainAxisAlignment: MainAxisAlignment.start,
-                      padding: EdgeInsets.fromLTRB(16.w, 32.h, 16.w, 16.h),
+                      crossAxisAlignment: CrossAxisAlignment.start,
-                      child: Text(
+                      children: [
-                        S.of(context).duihuanguize,
+                        buildProduct(),
-                        style: TextStyle(
+                        Container(
-                          fontWeight: MyFontWeight.semi_bold,
+                          padding: EdgeInsets.fromLTRB(16.w, 32.h, 16.w, 16.h),
-                          fontSize: 16.sp,
+                          child: Text(
-                          color: Color(0xFFFF7A1A),
+                            S.of(context).duihuanguize,
+                            style: TextStyle(
+                              fontWeight: MyFontWeight.semi_bold,
+                              fontSize: 16.sp,
+                              color: Color(0xFFFF7A1A),
+                            ),
+                          ),
                         ),
-                      ),
+                        if (goods?.detail != null &&
-                    ),
+                            goods.detail != "")
-                    if (goods?.detail != null &&
+                          Container(
-                        goods.detail != "")
+                            color: Colors.white,
-                      Container(
+                            child: Html(
-                        color: Colors.white,
+                              data: goods?.detail??"",
-                        child: Html(
+                              customImageRenders: {
-                          data: goods?.detail??"",
+                                networkSourceMatcher(): networkImageRender(
-                          customImageRenders: {
+                                  loadingWidget: () {
-                            networkSourceMatcher(): networkImageRender(
+                                    return Container();
-                              loadingWidget: () {
+                                  },
-                                return Container();
+                                ),
                               },
                             ),
-                          },
+                          ),
-                        ),
+                      ],
-                      ),
+                    ),
-                  ],
+                  ),
                 ),
               ),
               flex: 1,

lib/l10n/intl_en.arb

@@ -584,7 +584,47 @@
   "invite_code_error": "邀请码输入错误",
   "yaoqingwancheng": "邀请完成",
   "xuanji": "选集",
-
+  "bofangcishu": "播放次数",
+  "jiangshi" : "讲师",
+  "quedingyaoshanchudongtai": "确定要删除这条动态？",
+  "fenxiang": "分享",
+  "jubaogaineirong": "举报该内容",
+  "jingxuanhaowen": "精选好文",
+  "zuixinwenzhang": "最新文章",
+  "wenzhangzhuanlan": "文章专栏",
+  "zhuanlan": "专栏",
+  "toushuxuzhi": "投书须知",
+  "jubao": "举报",
+  "jubaoyuanyin": "请输入举报原因，以便我们更快定位问题，快速处理",
+  "tijiaochenggong": "提交成功",
+  "jubaotishi": "您的举报正在等待人工审核，我们会在7~15个工作日处理，处理结果可在",
+  "xitongxiaoxi": "系统消息",
+  "fanhuishequn": "返回社群",
+  "fabu": "发布",
+  "dingdantongzhi": "订单通知",
+  "chongzhichenggong" : "充值成功",
+  "biaoweiyidu": "标为已读",
+  "wodedingdan": "我的订单",
+  "qiandaodejifen": "签到得积分",
+  "chengjiuhuizhang": "成就徽章",
+  "zanweikaifang": "暂未开放",
+  "zanweijiesuo": "暂未解锁",
+  "tianjiaxinfuka": "添加新副卡",
+  "jinxingfukabangding": "进行副卡绑定",
+  "xiugaiyonghuming": "修改用户名",
+  "gexingqianming": "个性签名",
+  "chengjiu": "成就",
+  "genghuanbeijing": "更换背景",
+  "dongtai": "动态",
+  "bianjigerenziliao": "编辑个人资料",
+  "saoma": "扫码",
+  "jinxingzhanghaozhuxiao" : "进行账号注销",
+  "zhuxiaotixing": "再次提醒:注销帐号后不可恢复，相关数据和信息会永久删除。",
+  "querenzhuxiao": "确认注销",
+  "yanzhengma": "验证码",
+  "zhanghaozhuxiaoshuoming": "账号注销说明",
+  "lijilingqu": "立即领取",
+  "fanhuishouye": "返回首页",
 
 
 

lib/l10n/intl_zh_CN.arb

@@ -581,6 +581,47 @@
   "qingshuruyaoqingma": "请输入邀请码",
   "invite_code_error": "邀请码输入错误",
   "xuanji": "选集",
+  "bofangcishu": "播放次数",
+  "jiangshi" : "讲师",
+  "quedingyaoshanchudongtai": "确定要删除这条动态？",
+  "fenxiang": "分享",
+  "jubaogaineirong": "举报该内容",
+  "jingxuanhaowen": "精选好文",
+  "zuixinwenzhang": "最新文章",
+  "wenzhangzhuanlan": "文章专栏",
+  "zhuanlan": "专栏",
+  "toushuxuzhi": "投书须知",
+  "jubao": "举报",
+  "jubaoyuanyin": "请输入举报原因，以便我们更快定位问题，快速处理",
+  "tijiaochenggong": "提交成功",
+  "jubaotishi": "您的举报正在等待人工审核，我们会在7~15个工作日处理，处理结果可在",
+  "xitongxiaoxi": "系统消息",
+  "fanhuishequn": "返回社群",
+  "fabu": "发布",
+  "dingdantongzhi": "订单通知",
+  "chongzhichenggong" : "充值成功",
+  "biaoweiyidu": "标为已读",
+  "wodedingdan": "我的订单",
+  "qiandaodejifen": "签到得积分",
+  "chengjiuhuizhang": "成就徽章",
+  "zanweikaifang": "暂未开放",
+  "zanweijiesuo": "暂未解锁",
+  "tianjiaxinfuka": "添加新副卡",
+  "jinxingfukabangding": "进行副卡绑定",
+  "xiugaiyonghuming": "修改用户名",
+  "gexingqianming": "个性签名",
+  "chengjiu": "成就",
+  "genghuanbeijing": "更换背景",
+  "dongtai": "动态",
+  "bianjigerenziliao": "编辑个人资料",
+  "saoma": "扫码",
+  "jinxingzhanghaozhuxiao" : "进行账号注销",
+  "zhuxiaotixing": "再次提醒:注销帐号后不可恢复，相关数据和信息会永久删除。",
+  "querenzhuxiao": "确认注销",
+  "yanzhengma": "验证码",
+  "zhanghaozhuxiaoshuoming": "账号注销说明",
+  "lijilingqu": "立即领取",
+  "fanhuishouye": "返回首页",
 
 
 

lib/l10n/intl_zh_Hans_CN.arb

@@ -581,6 +581,47 @@
   "qingshuruyaoqingma": "请输入邀请码",
   "invite_code_error": "邀请码输入错误",
   "xuanji": "选集",
+  "bofangcishu": "播放次数",
+  "jiangshi" : "讲师",
+  "quedingyaoshanchudongtai": "确定要删除这条动态？",
+  "fenxiang": "分享",
+  "jubaogaineirong": "举报该内容",
+  "jingxuanhaowen": "精选好文",
+  "zuixinwenzhang": "最新文章",
+  "wenzhangzhuanlan": "文章专栏",
+  "zhuanlan": "专栏",
+  "toushuxuzhi": "投书须知",
+  "jubao": "举报",
+  "jubaoyuanyin": "请输入举报原因，以便我们更快定位问题，快速处理",
+  "tijiaochenggong": "提交成功",
+  "jubaotishi": "您的举报正在等待人工审核，我们会在7~15个工作日处理，处理结果可在",
+  "xitongxiaoxi": "系统消息",
+  "fanhuishequn": "返回社群",
+  "fabu": "发布",
+  "dingdantongzhi": "订单通知",
+  "chongzhichenggong" : "充值成功",
+  "biaoweiyidu": "标为已读",
+  "wodedingdan": "我的订单",
+  "qiandaodejifen": "签到得积分",
+  "chengjiuhuizhang": "成就徽章",
+  "zanweikaifang": "暂未开放",
+  "zanweijiesuo": "暂未解锁",
+  "tianjiaxinfuka": "添加新副卡",
+  "jinxingfukabangding": "进行副卡绑定",
+  "xiugaiyonghuming": "修改用户名",
+  "gexingqianming": "个性签名",
+  "chengjiu": "成就",
+  "genghuanbeijing": "更换背景",
+  "dongtai": "动态",
+  "bianjigerenziliao": "编辑个人资料",
+  "saoma": "扫码",
+  "jinxingzhanghaozhuxiao" : "进行账号注销",
+  "zhuxiaotixing": "再次提醒:注销帐号后不可恢复，相关数据和信息会永久删除。",
+  "querenzhuxiao": "确认注销",
+  "yanzhengma": "验证码",
+  "zhanghaozhuxiaoshuoming": "账号注销说明",
+  "lijilingqu": "立即领取",
+  "fanhuishouye": "返回首页",
 
 
 

lib/l10n/intl_zh_Hant_CN.arb

@@ -575,6 +575,45 @@
   "qingshuruyaoqingma": "請輸入邀請碼",
   "invite_code_error": "邀請碼輸入錯誤",
   "xuanji": "選集",
+  "jiangshi" : "講師",
+  "quedingyaoshanchudongtai": "確定要刪除這條動態？",
+  "fenxiang": "分享",
+  "jubaogaineirong": "舉報該内容",
+  "jingxuanhaowen": "精選好文",
+  "zuixinwenzhang": "最新文章",
+  "wenzhangzhuanlan": "文章專欄",
+  "zhuanlan": "專欄",
+  "toushuxuzhi": "投書須知",
+  "jubao": "舉報",
+  "jubaoyuanyin": "請輸入舉報原因，以便我們更快定位問題，快速處理",
+  "tijiaochenggong": "提交成功",
+  "jubaotishi": "您的舉報正在等待人工稽核，我們會在7~15個工作日處理，處理結果可在",
+  "xitongxiaoxi": "系統消息",
+  "fanhuishequn": "返回社群",
+  "fabu": "發佈",
+  "dingdantongzhi": "訂單通知",
+  "chongzhichenggong" : "充值成功",
+  "biaoweiyidu": "標爲已讀",
+  "wodedingdan": "我的訂單",
+  "qiandaodejifen": "簽到得積分",
+  "chengjiuhuizhang": "成就徽章",
+  "zanweikaifang": "暂未开放",
+  "zanweijiesuo": "暫未解鎖",
+  "tianjiaxinfuka": "添加新副卡",
+  "jinxingfukabangding": "進行副卡綁定",
+  "xiugaiyonghuming": "修改用戶名",
+  "gexingqianming": "個性簽名",
+  "chengjiu": "成就",
+  "genghuanbeijing": "更換背景",
+  "dongtai": "動態",
+  "saoma": "掃碼",
+  "jinxingzhanghaozhuxiao" : "進行賬號注銷",
+  "zhuxiaotixing": "再次提醒：註銷帳號後不可恢復，相關資料和資訊會永久删除。",
+  "querenzhuxiao": "確認注銷",
+  "yanzhengma": "驗證碼",
+  "zhanghaozhuxiaoshuoming": "賬號注銷説明",
+  "lijilingqu": "立即領取",
+  "fanhuishouye": "返回首頁",
 
 
 

lib/l10n/intl_zh_TW.arb

@@ -575,6 +575,49 @@
   "qingshuruyaoqingma": "請輸入邀請碼",
   "invite_code_error": "邀請碼輸入錯誤",
   "xuanji": "選集",
+  "bofangcishu": "播放次數",
+  "jiangshi" : "講師",
+  "quedingyaoshanchudongtai": "確定要刪除這條動態？",
+  "fenxiang": "分享",
+  "jubaogaineirong": "舉報該内容",
+  "jingxuanhaowen": "精選好文",
+  "zuixinwenzhang": "最新文章",
+  "wenzhangzhuanlan": "文章專欄",
+  "zhuanlan": "專欄",
+  "toushuxuzhi": "投書須知",
+  "jubao": "舉報",
+  "jubaoyuanyin": "請輸入舉報原因，以便我們更快定位問題，快速處理",
+  "tijiaochenggong": "提交成功",
+  "jubaotishi": "您的舉報正在等待人工稽核，我們會在7~15個工作日處理，處理結果可在",
+  "xitongxiaoxi": "系統消息",
+  "fanhuishequn": "返回社群",
+  "fabu": "發佈",
+  "dingdantongzhi": "訂單通知",
+  "chongzhichenggong" : "充值成功",
+  "biaoweiyidu": "標爲已讀",
+  "wodedingdan": "我的訂單",
+  "qiandaodejifen": "簽到得積分",
+  "chengjiuhuizhang": "成就徽章",
+  "zanweikaifang": "暫未開放",
+  "zanweijiesuo": "暫未解鎖",
+  "tianjiaxinfuka": "添加新副卡",
+  "jinxingfukabangding": "進行副卡綁定",
+  "xiugaiyonghuming": "修改用戶名",
+  "gexingqianming": "個性簽名",
+  "chengjiu": "成就",
+  "genghuanbeijing": "更換背景",
+  "dongtai": "動態",
+  "bianjigerenziliao": "編輯個人資料",
+  "saoma": "掃碼",
+  "jinxingzhanghaozhuxiao" : "進行賬號注銷",
+  "zhuxiaotixing": "再次提醒：註銷帳號後不可恢復，相關資料和資訊會永久删除。",
+  "querenzhuxiao": "確認注銷",
+  "yanzhengma": "驗證碼",
+  "zhanghaozhuxiaoshuoming": "賬號注銷説明",
+  "lijilingqu": "立即領取",
+  "fanhuishouye": "返回首頁",
+
+
 
 
 

lib/message/system_details.dart

@@ -139,7 +139,7 @@ class _SystemDetails extends State<SystemDetails> {
       appBar: MyAppBar(
         background: Colors.white,
         leadingColor: Colors.black,
-        title: (msgType == 2) ?"订单通知":(msgType == 3) ?"充值消息":(msgType == 4) ?"关注":(msgType == 5) ?"点赞":"评论",
+        title: (msgType == 2) ? S.of(context).dingdantongzhi:(msgType == 3) ? S.of(context).chongzhixiaoxi:(msgType == 4) ?"关注":(msgType == 5) ?"点赞":"评论",
         titleSize: 18.sp,
         titleColor: Colors.black,
       ),
@@ -406,7 +406,7 @@ class _SystemDetails extends State<SystemDetails> {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Text(
-                  "充值成功",
+                  S.of(context).chongzhichenggong,
                   style: TextStyle(
                     fontSize: 20.sp,
                     fontWeight: MyFontWeight.semi_bold,

lib/message/system_message.dart

@@ -147,7 +147,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
                 });
               },
               child: Text(
-                "标为已读",
+                S.of(context).biaojiweiyidu,
                 style: TextStyle(
                   fontSize: 16.sp,
                   fontWeight:MyFontWeight.semi_bold,

lib/mine/edit_name.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
@@ -22,7 +23,7 @@ class _EditName extends State<EditName> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: MyAppBar(
-        title: "修改用户名",
+        title: S.of(context).xiugaiyonghuming,
         titleColor: Colors.black,
         leadingColor: Colors.black,
         background: Colors.white,
@@ -39,7 +40,7 @@ class _EditName extends State<EditName> {
               }
             },
             child: Text(
-              "保存",
+              S.of(context).baocun,
               style: TextStyle(
                   color: Colors.black,
                   fontSize: 18.sp,

lib/mine/edit_signature.dart

@@ -25,7 +25,7 @@ class _EditSignature extends State<EditSignature> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: MyAppBar(
-        title: "个性签名",
+        title: S.of(context).gexingqianming,
         titleColor: Colors.black,
         leadingColor: Colors.black,
         action: Container(
@@ -40,7 +40,7 @@ class _EditSignature extends State<EditSignature> {
                 SmartDialog.showToast("请输入个性签名~", alignment: Alignment.center);
               }
             },
-            child:Container(
+            child: Container(
               width: 46.w,
               height: 24.h,
               alignment: Alignment.center,
@@ -48,10 +48,10 @@ class _EditSignature extends State<EditSignature> {
                   color: Color(0xFF319E5F),
                   borderRadius: BorderRadius.all(Radius.circular(4))),
               child: Text(
-                "保存",
+                S.of(context).baocun,
                 style: TextStyle(
                     color: Colors.white,
-                    fontSize:14.sp,
+                    fontSize: 14.sp,
                     fontWeight: FontWeight.bold),
               ),
             ),
@@ -94,6 +94,4 @@ class _EditSignature extends State<EditSignature> {
       ),
     );
   }
-
-
 }

lib/mine/invitation_record.dart

@@ -136,7 +136,6 @@ class _InvitationRecord extends State<InvitationRecord>
                     right: 16.w),
                 child: Column(
                   children: [
-
                     GestureDetector(
                         onTap: (){
                           Navigator.of(context).pop();

lib/mine/manage_address_page.dart

@@ -313,7 +313,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
                     Expanded(
                       child: InkWell(
                         child: RoundButton(
-                          text: "确定",
+                          text:S.of(context).queding,
                           textColor: Colors.white,
                           radius: 4,
                           padding: EdgeInsets.all(12),

lib/mine/mine_page.dart

@@ -432,7 +432,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
                         height: 4,
                       ),
                       Text(
-                        "成就",
+                        S.of(context).chengjiu,
                         style: TextStyle(
                           color: Color(0xFF000000),
                           fontSize: 14.sp,

lib/mine/mine_view/mine_order.dart

@@ -36,7 +36,7 @@ class _MineOrderView extends State<MineOrderView> {
           Container(
             padding: EdgeInsets.symmetric(vertical: 4.h),
             child: Text(
-              "我的订单",
+              S.of(context).wodedingdan,
               style: TextStyle(
                 color: Color(0xFF353535),
                 fontWeight: MyFontWeight.semi_bold,

lib/mine/mine_view/mine_view.dart

@@ -308,7 +308,7 @@ class _MineView extends State<MineView> {
                               height: 16.h,
                             ),
                             Text(
-                              "签到得积分",
+                              S.of(context).qiandaodejifen,
                               style: TextStyle(
                                 color: Colors.black,
                                 fontSize: 12.sp,

lib/mine/mine_vip/binding_assistant_card.dart

@@ -77,7 +77,7 @@ class _BindingAssistantCard extends State<BindingAssistantCard> {
                       Padding(
                         padding: EdgeInsets.only(left: 16, right: 16),
                         child: Text(
-                          "进行副卡绑定",
+                          S.of(context).jinxingfukabangding,
                           style: TextStyle(
                             color: Colors.black,
                             fontWeight: MyFontWeight.medium,
@@ -197,9 +197,9 @@ class _BindingAssistantCard extends State<BindingAssistantCard> {
           ),
           TextField(
             controller: controller,
-            enabled: start != "地址",
+            enabled: start != S.of(context).dizhi,
             keyboardType:
-                start == "电话" ? TextInputType.phone : TextInputType.text,
+                start == S.of(context).dianhua ? TextInputType.phone : TextInputType.text,
             decoration: InputDecoration(
               border: InputBorder.none,
               hintText: hide,

lib/mine/mine_vip/legal_right_details.dart

@@ -398,7 +398,7 @@ class _LegalRightDetails extends State<LegalRightDetails> {
                     Expanded(
                       child: InkWell(
                         child: BorderText(
-                          text: "取消",
+                          text: S.of(context).quxiao,
                           textColor: Color(0xFF32A060),
                           fontSize: 16.sp,
                           fontWeight: FontWeight.bold,
@@ -419,7 +419,7 @@ class _LegalRightDetails extends State<LegalRightDetails> {
                     Expanded(
                       child: InkWell(
                         child: RoundButton(
-                          text: "确定",
+                          text:S.of(context).queding,
                           textColor: Colors.white,
                           radius: 4,
                           padding: EdgeInsets.all(12),
@@ -487,7 +487,7 @@ class _LegalRightDetails extends State<LegalRightDetails> {
                               size: 10,
                             ),
                             Text(
-                              "暂未开放",
+                              S.of(context).zanweikaifang,
                               style: TextStyle(
                                 color: Color(0xFFFFDCA1),
                                 fontWeight: MyFontWeight.regular,
@@ -515,7 +515,7 @@ class _LegalRightDetails extends State<LegalRightDetails> {
                               size: 10,
                             ),
                             Text(
-                              "暂未解锁",
+                              S.of(context).zanweijiesuo,
                               style: TextStyle(
                                 color: Color(0xFFFFDCA1),
                                 fontWeight: MyFontWeight.regular,
@@ -659,7 +659,7 @@ class _LegalRightDetails extends State<LegalRightDetails> {
                     fit: BoxFit.cover,
                   ),
                   Text(
-                    "添加新副卡",
+                    S.of(context).tianjiaxinfuka,
                     style: TextStyle(
                       color: Color(0xFF79572D),
                       fontWeight: MyFontWeight.regular,

lib/mine/mine_vip/mine_attainment_page.dart

@@ -12,8 +12,10 @@ import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/utils/flutter_utils.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/badge_attainment_dialog.dart';
+import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
+import 'package:huixiang/view_widget/my_footer.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -37,6 +39,8 @@ class _MineAttainmentPage extends State<MineAttainmentPage> {
   List<AchievementDetailList> achievementDetail = [];
   int checkPosition = 0;
   SocialInfo infoNumber;
+  final ScrollController scrollController = ScrollController();
+  final RefreshController refreshController = RefreshController();
 
 
   @override
@@ -116,11 +120,17 @@ class _MineAttainmentPage extends State<MineAttainmentPage> {
     if (baseData != null && baseData.isSuccess) {
       setState(() {
         infoNumber = baseData.data;
+        refreshController.refreshCompleted();
       });
     }
     EasyLoading.dismiss();
   }
 
+  _onRefresh(){
+    queryAttainmentBadges();
+    querySocialInfo();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -139,91 +149,112 @@ class _MineAttainmentPage extends State<MineAttainmentPage> {
             background: Colors.transparent,
             leadingColor: Colors.black,
           ),
-          body: SingleChildScrollView(
+          body: SmartRefresher(
+            controller: refreshController,
+            enablePullDown: true,
+            enablePullUp: false,
+            header: MyHeader(),
+            footer: CustomFooter(
+              builder: (context, mode) {
+                return MyFooter(mode);
+              },
+            ),
+            onRefresh:(){
+              setState(() {
+                _onRefresh();
+              });
+            },
             physics: BouncingScrollPhysics(),
-            child: Column(
+            scrollController: scrollController,
-              children: [
+            child: Container(
-                SizedBox(height: 24),
+              child:
-                MImage(
+              SingleChildScrollView(
-                  userInfo?.headimg ?? "",
+                physics: BouncingScrollPhysics(),
-                  isCircle: true,
+                child: Column(
-                  width: 58,
+                  children: [
-                  height: 58,
+                    SizedBox(height: 24),
-                  fit: BoxFit.cover,
+                    MImage(
-                  errorSrc: "assets/image/default_user.webp",
+                      userInfo?.headimg ?? "",
-                  fadeSrc: "assets/image/default_user.webp",
+                      isCircle: true,
-                ),
+                      width: 58,
-                SizedBox(height: 8),
+                      height: 58,
-                Text(
+                      fit: BoxFit.cover,
-                  userInfo?.nickname ?? S.of(context).denglu,
+                      errorSrc: "assets/image/default_user.webp",
-                  style: TextStyle(
+                      fadeSrc: "assets/image/default_user.webp",
-                    fontSize: 16.sp,
+                    ),
-                    fontWeight: FontWeight.bold,
+                    SizedBox(height: 8),
-                    color: Color(0xFF353535),
+                    Text(
-                  ),
+                      userInfo?.nickname ?? S.of(context).denglu,
-                ),
+                      style: TextStyle(
-                SizedBox(height: 28),
+                        fontSize: 16.sp,
-                Container(
+                        fontWeight: FontWeight.bold,
-                  margin:
+                        color: Color(0xFF353535),
+                      ),
+                    ),
+                    SizedBox(height: 28),
+                    Container(
+                      margin:
                       EdgeInsets.only(left: 16, right: 16, top: 26, bottom: 8),
-                  padding: EdgeInsets.all(20),
+                      padding: EdgeInsets.all(20),
-                  decoration: BoxDecoration(
+                      decoration: BoxDecoration(
-                    color: Colors.white,
+                        color: Colors.white,
-                    boxShadow: [
+                        boxShadow: [
-                      BoxShadow(
+                          BoxShadow(
-                        color: Colors.black.withAlpha(12),
+                            color: Colors.black.withAlpha(12),
-                        offset: Offset(0, 3),
+                            offset: Offset(0, 3),
-                        blurRadius: 14,
+                            blurRadius: 14,
-                        spreadRadius: 0,
+                            spreadRadius: 0,
-                      )
+                          )
-                    ],
+                        ],
-                    borderRadius: BorderRadius.all(Radius.circular(8)),
+                        borderRadius: BorderRadius.all(Radius.circular(8)),
-                  ),
+                      ),
-                  child: Column(
+                      child: Column(
-                    mainAxisAlignment: MainAxisAlignment.spaceAround,
+                        mainAxisAlignment: MainAxisAlignment.spaceAround,
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                        crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Row(
                         children: [
-                          Text(
+                          Row(
-                            "成就徽章",
+                            children: [
-                            style: TextStyle(
+                              Text(
-                                fontWeight: MyFontWeight.medium,
+                                S.of(context).chengjiuhuizhang,
-                                fontSize: 14.sp,
+                                style: TextStyle(
-                                color: Color(0xFF353535)),
+                                    fontWeight: MyFontWeight.medium,
-                          ),
+                                    fontSize: 14.sp,
-                          SizedBox(width: 4),
+                                    color: Color(0xFF353535)),
-                          Text(
+                              ),
-                            "(",
+                              SizedBox(width: 4),
-                            style: TextStyle(
+                              Text(
-                                fontWeight: MyFontWeight.medium,
+                                "(",
-                                fontSize: 14,
+                                style: TextStyle(
-                                color: Color(0xFF353535)),
+                                    fontWeight: MyFontWeight.medium,
-                          ),
+                                    fontSize: 14,
-                          Text(
+                                    color: Color(0xFF353535)),
-                            infoNumber != null ? infoNumber.achievementNumber.toString() :"0",
+                              ),
-                            style: TextStyle(
+                              Text(
-                                fontWeight: MyFontWeight.medium,
+                                infoNumber != null ? infoNumber.achievementNumber.toString() :"0",
-                                fontSize: 14,
+                                style: TextStyle(
-                                color: Color(0xFF32A060)),
+                                    fontWeight: MyFontWeight.medium,
-                          ),
+                                    fontSize: 14,
-                          Text(
+                                    color: Color(0xFF32A060)),
-                            "/${vipBadgesList.length})",
+                              ),
-                            style: TextStyle(
+                              Text(
-                                fontWeight: MyFontWeight.medium,
+                                "/${vipBadgesList.length})",
-                                fontSize: 14,
+                                style: TextStyle(
-                                color: Color(0xFF353535)),
+                                    fontWeight: MyFontWeight.medium,
+                                    fontSize: 14,
+                                    color: Color(0xFF353535)),
+                              ),
+                            ],
                           ),
+                          SizedBox(height: 12),
+                          attainmentBadge(),
                         ],
                       ),
-                      SizedBox(height: 12),
+                    ),
-                      attainmentBadge(),
+                  ],
-                    ],
-                  ),
                 ),
-              ],
+              ),
             ),
-          )),
+          ),),
     );
   }
 
@@ -355,7 +386,7 @@ class _MineAttainmentPage extends State<MineAttainmentPage> {
                     crossAxisAlignment: CrossAxisAlignment.center,
                     children: [
                       Text(
-                        "奖励:",
+                        "${S.of(context).jiangli}:",
                         style: TextStyle(
                             fontWeight: MyFontWeight.regular,
                             fontSize: 12.sp,

lib/mine/personal_page.dart

@@ -375,7 +375,7 @@ class _PersonalPage extends State<PersonalPage> with WidgetsBindingObserver {
                                 color: Color(0x80000000),
                               ),
                               child: Text(
-                                "更换背景",
+                                S.of(context).genghuanbeijing,
                                 overflow: TextOverflow.ellipsis,
                                 style: TextStyle(
                                   fontSize: 12.sp,
@@ -536,7 +536,7 @@ class _PersonalPage extends State<PersonalPage> with WidgetsBindingObserver {
                                     height: 4,
                                   ),
                                   Text(
-                                    "动态",
+                                    S.of(context).dongtai,
                                     style: TextStyle(
                                       color: Color(0xFF353535),
                                       fontSize: 12.sp,
@@ -686,7 +686,7 @@ class _PersonalPage extends State<PersonalPage> with WidgetsBindingObserver {
                   ),
                 ),
                 child: Text(
-                  "编辑个人资料",
+                  S.of(context).bianjigerenziliao,
                   style: TextStyle(
                     fontSize: 12.sp,
                     fontWeight: MyFontWeight.regular,

lib/mine/release_page.dart

@@ -5,6 +5,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:huixiang/community/community_view/community_dynamic.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/article.dart';
 import 'package:huixiang/retrofit/data/base_data.dart';
 import 'package:huixiang/retrofit/data/comunity_comment.dart';
@@ -103,7 +104,7 @@ class _ReleasePage extends State<ReleasePage> {
           appBar: MyAppBar(
             background: Color(0xFFFFFFFF),
             leadingColor: Colors.black,
-            title: "动态",
+            title: S.of(context).dongtai,
             titleColor: Colors.black,
             titleSize: 18.sp,
           ),

lib/order/exchange_order_page.dart

@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -10,10 +9,8 @@ import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/base_data.dart';
 import 'package:huixiang/retrofit/data/user_info.dart';
 import 'package:huixiang/retrofit/data/wx_pay.dart';
-import 'package:huixiang/retrofit/min_api.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
 import 'package:huixiang/utils/font_weight.dart';
-import 'package:huixiang/utils/min.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
 import 'package:huixiang/view_widget/receiving_method_dialog.dart';

lib/retrofit/min_api.dart

@@ -28,12 +28,12 @@ part 'min_api.g.dart';
 // const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
 // const baseUrl = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
 
-// const base_url = "http://192.168.10.236:8765/app/";///费韬
+const base_url = "http://192.168.10.236:8765/app/";///费韬
-// const baseUrl = "http://192.168.10.236:8765/app/";///费韬
+const baseUrl = "http://192.168.10.236:8765/app/";///费韬
 
 
-const base_url = "http://192.168.10.104:8765/app/";///詹云久
+// const base_url = "http://192.168.10.132:8765/app/";///詹云久
-const baseUrl = "http://192.168.10.104:8765/app/";///詹云久
+// const baseUrl = "http://192.168.10.132:8765/app/";///詹云久
 
 
 // const base_url = "http://192.168.10.37:8766/app/";

lib/retrofit/min_api.g.dart

@@ -9,7 +9,7 @@ part of 'min_api.dart';
 class _MinApiService implements MinApiService {
   _MinApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'http://192.168.10.104:8765/app/';
+    baseUrl ??= 'http://192.168.10.236:8765/app/';
   }
 
   final Dio _dio;

lib/retrofit/retrofit_api.dart

@@ -64,15 +64,15 @@ part 'retrofit_api.g.dart';
 // const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 // const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 
-// const base_url = "http://192.168.10.236:8766/app/";   ///费韬
+const base_url = "http://192.168.10.236:8766/app/";   ///费韬
-// const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
+const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
 
 // const base_url = "http://192.168.10.37:8766/app/";
 // const baseUrl = "http://192.168.10.37:8766/app/";
 
 
-const base_url = "http://192.168.10.104:8766/app/";///詹云久
+// const base_url = "http://192.168.10.132:8766/app/";///詹云久
-const baseUrl = "http://192.168.10.104:8766/app/";///詹云久
+// const baseUrl = "http://192.168.10.132:8766/app/";///詹云久
 
 @RestApi(baseUrl: baseUrl)
 abstract class ApiService {

lib/retrofit/retrofit_api.g.dart

@@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
 class _ApiService implements ApiService {
   _ApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'http://192.168.10.104:8766/app/';
+    baseUrl ??= 'http://192.168.10.236:8766/app/';
   }
 
   final Dio _dio;

lib/setting/logout_ing.dart

@@ -168,7 +168,7 @@ class _LogoutIng extends State<LogoutIng> {
                       bottom: 4,
                     ),
                     child: Text(
-                      "进行帐号注销",
+                      S.of(context).jinxingzhanghaozhuxiao,
                       style: TextStyle(
                         fontSize: 21.sp,
                         fontWeight: MyFontWeight.semi_bold,
@@ -177,7 +177,7 @@ class _LogoutIng extends State<LogoutIng> {
                     ),
                   ),
                   Text(
-                    "再次提醒:注销帐号后不可恢复，相关数据和信息会永久删除。",
+                    S.of(context).zhuxiaotixing,
                     style: TextStyle(
                       fontSize: 14.sp,
                       height: 1.5,
@@ -227,7 +227,7 @@ class _LogoutIng extends State<LogoutIng> {
                       bottom: 16,
                     ),
                     child: Text(
-                      "验证码",
+                      S.of(context).yanzhengma,
                       style: TextStyle(
                         fontSize: 16.sp,
                         fontWeight: MyFontWeight.semi_bold,
@@ -315,7 +315,7 @@ class _LogoutIng extends State<LogoutIng> {
                         ? Color(0xFFD8D8D8)
                         : Color(0xFF32A060),
                     child: Text(
-                      "确认注销",
+                      S.of(context).querenzhuxiao,
                       style: TextStyle(
                         fontSize: 16.sp,
                         fontWeight: MyFontWeight.semi_bold,
@@ -393,7 +393,7 @@ class _LogoutIng extends State<LogoutIng> {
                 ),
                 if(balance != "0.00" && money != "0.00" || balance != "0.00" || money != "0.00")
                 Text(
-                  "平台余额:¥ $money",
+                  "${S.of(context).pingtaiyue}:¥ $money",
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     fontSize: 16.sp,
@@ -403,7 +403,7 @@ class _LogoutIng extends State<LogoutIng> {
                 ),
                 if(balance != "0.00" && money != "0.00" || balance != "0.00" || money != "0.00")
                 Text(
-                  "店铺余额:￥ $balance",
+                  "${S.of(context).dianpuyue}:￥ $balance",
                   textAlign: TextAlign.center,
                   style: TextStyle(
                     fontSize: 16.sp,

lib/setting/logout_page.dart

@@ -28,7 +28,7 @@ class _LogoutPage extends State<LogoutPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: MyAppBar(
-        title: "帐号注销说明",
+        title: S.of(context).zhanghaozhuxiaoshuoming,
         titleColor: Colors.black,
         titleSize: 18.sp,
         background: Colors.transparent,
@@ -245,7 +245,7 @@ class _LogoutPage extends State<LogoutPage> {
                     Expanded(
                       child: InkWell(
                         child: BorderText(
-                          text: "确认注销",
+                          text: S.of(context).querenzhuxiao,
                           textColor: Color(0xFF32A060),
                           fontSize: 16.sp,
                           fontWeight: FontWeight.bold,

lib/setting/treaty_page.dart

@@ -7,7 +7,6 @@ import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:webview_flutter/webview_flutter.dart';
-import 'package:webview_flutter/src/webview_cupertino.dart';
 
 class TreatyPage extends StatefulWidget {
   @override

lib/store/store_view/people_num.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:huixiang/view_widget/round_button.dart';
@@ -114,7 +115,7 @@ class _PeopleNumView extends State<PeopleNumView> {
                     height: 10,
                   ),
                   RoundButton(
-                    text: "确定",
+                    text: S.of(context).queding,
                     width: 130.w,
                     height: 34.h,
                     textColor: Colors.white,

lib/view_widget/cupertino_date_picker.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/utils/font_weight.dart';
 
 class CupertinoDatePickerWidget extends StatelessWidget {
@@ -48,7 +49,7 @@ class CupertinoDatePickerWidget extends StatelessWidget {
                   },
                   child: Container(
                     child: Text(
-                      "确认",
+                      S.of(context).queren,
                       style: TextStyle(
                           fontSize: 16,
                           fontWeight: MyFontWeight.semi_bold,

lib/view_widget/invite_success_dialog.dart

@@ -52,7 +52,7 @@ class _InviteSuccessDialog extends State<InviteSuccessDialog> {
                   ),
                   SizedBox(height: 9.h,),
                   Text(
-                    "邀请完成",
+                    S.of(context).yaoqingwancheng,
                     style: TextStyle(
                       color: Color(0xFF353535),
                       fontSize: 16.sp,

lib/view_widget/new_people_reward.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/retrofit/data/login_info.dart';
 import 'package:huixiang/utils/font_weight.dart';
 
@@ -60,7 +61,7 @@ class _NewPeopleReward extends State<NewPeopleReward> {
                     height: 40,
                     alignment: Alignment.center,
                     child: Text(
-                      "立即领取",
+                      S.of(context).lijilingqu,
                       style: TextStyle(
                         fontWeight: FontWeight.bold,
                         fontSize: 14.sp,

lib/view_widget/no_data_view.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/view_widget/round_button.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
@@ -52,7 +53,7 @@ class NoDataView extends StatelessWidget {
             Container(
               margin: EdgeInsets.symmetric(horizontal: 16.w),
               child: RoundButton(
-                text: "返回首页",
+                text: S.of(context).fanhuishouye,
                 textColor: Colors.white,
                 fontSize: 14.sp,
                 padding: EdgeInsets.all(12.w),

pubspec.lock

@@ -307,7 +307,7 @@ packages:
       name: fluwx
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.8.2"
+    version: "3.8.2+1"
   font_awesome_flutter:
     dependency: "direct main"
     description: