Merge branch 'dev' into wr_2023_business

android/app/src/main/AndroidManifest.xml

@@ -35,7 +35,7 @@
     </queries>
 
     <application
-        android:label="一心回乡"
+        android:label="海峡姐妹"
         android:name=".HxApplication"
         android:icon="@mipmap/ic_launcher">
         <activity

ios/zh-Hans.lproj/InfoPlist.strings

@@ -7,8 +7,8 @@
 */
 
 
-CFBundleName="一心回乡";
+CFBundleName="海峡姐妹";
-CFBundleDisplayName="一心回乡";
+CFBundleDisplayName="海峡姐妹";
 NSCameraUsageDescription="您的相机权限将用于更新头像使用";
 NSPhotoLibraryUsageDescription="您的照片信息将用于更新头像使用";
 NSLocationWhenInUseUsageDescription="您的定位位置信息将用于查看周围的门店";

lib/community/community_page.dart

@@ -28,10 +28,10 @@ class _CommunityPage extends State<CommunityPage>
 
   List<String> lables = [
     "关注",
-    "分享健康",
+    "广场",
-    "了解健康",
+    // "了解健康",
-    "学习健康",
+    "视频",
-    "关于回乡",
+    // "关于回乡",
     // "直播",
   ];
   ScrollPhysics b = BouncingScrollPhysics();
@@ -143,16 +143,16 @@ class _CommunityPage extends State<CommunityPage>
         child: TabBarView(
           physics: b,
           children: lables.map((e) {
-            if (e == "关于回乡") {
+            // if (e == "关于回乡") {
-              return BrandPage();
+            //   return BrandPage();
-            }else if(e == "了解健康"){
+            // } else if(e == "了解健康"){
-              return ArticlePage(onChildScroll);
+            //   return ArticlePage(onChildScroll);
-            }else if(e == "学习健康"){
+            // } else
+              if(e == "视频"){
               return CommunityCourse();
-            }
+            } else if(e == "广场"){
-            else if(e == "分享健康"){
               if (tuijian == null){
-                tuijian = CommunityChildPage(tuijianKey,"分享健康",onChildScroll,_toRelease);
+                tuijian = CommunityChildPage(tuijianKey,"广场",onChildScroll,_toRelease);
               }
               return tuijian;
             }else if(e == "关注"){

lib/generated/intl/messages_en.dart

@@ -133,7 +133,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"),
     "bofangcishu" : MessageLookupByLibrary.simpleMessage("播放次数"),
     "bojin" : MessageLookupByLibrary.simpleMessage("铂金"),
-    "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
+    "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
     "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持开票"),
     "canyingfuwu" : MessageLookupByLibrary.simpleMessage("餐饮服务"),
     "chakan" : MessageLookupByLibrary.simpleMessage("查看"),
@@ -251,7 +251,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
     "fenxiangjiankang" : MessageLookupByLibrary.simpleMessage("分享健康"),
     "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"),
-    "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。"),
+    "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友，对方在海峡姐妹App登录页输入邀请码，即可邀请成功。"),
     "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"),
     "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"),
     "fuliduihuan" : MessageLookupByLibrary.simpleMessage("福利兑换"),
@@ -274,7 +274,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "gongli" : m8,
     "gongxinchengwei" : MessageLookupByLibrary.simpleMessage("恭喜您成为"),
     "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成为本店的会员，快去享受超多会员权益吧。"),
-    "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"),
+    "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和海峡姐妹服务协议"),
     "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"),
     "guanyu" : MessageLookupByLibrary.simpleMessage("关于"),
     "guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("关于创始人"),
@@ -296,8 +296,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "huifu" : MessageLookupByLibrary.simpleMessage("回复"),
     "huifu_" : m9,
     "huixiangVIPka" : MessageLookupByLibrary.simpleMessage("回乡VIP卡"),
-    "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"),
+    "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("海峡钱包"),
-    "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
+    "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：海峡姐妹任意门店"),
     "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
     "huixiangvipkazhuanxiang" : MessageLookupByLibrary.simpleMessage("回乡VIP卡专享权益"),
     "huixiangxieyi" : MessageLookupByLibrary.simpleMessage("回乡VIP会员卡规则协议"),
@@ -416,15 +416,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"),
     "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的评论吧"),
     "login" : MessageLookupByLibrary.simpleMessage("登录"),
-    "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
+    "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到海峡姐妹"),
     "lvbiyue" : MessageLookupByLibrary.simpleMessage("绿币余额"),
     "lvbiyue_" : m18,
     "lvbizhifu" : MessageLookupByLibrary.simpleMessage("绿币支付"),
-    "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
+    "main_menu1" : MessageLookupByLibrary.simpleMessage("首页"),
-    "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
+    "main_menu2" : MessageLookupByLibrary.simpleMessage("门店"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"),
     "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
-    "main_menu5" : MessageLookupByLibrary.simpleMessage("回乡VIP"),
+    "main_menu5" : MessageLookupByLibrary.simpleMessage("hi"),
     "manlijiandaijinquan" : m19,
     "manyuankeyong" : m20,
     "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"),
@@ -467,7 +467,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
     "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"),
     "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"),
-    "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《一心回乡服务协议》"),
+    "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《海峡姐妹服务协议》"),
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隐私服务》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本机号码登录"),
     "qianbao" : MessageLookupByLibrary.simpleMessage("钱包"),
@@ -478,7 +478,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "qiandaowancheng" : MessageLookupByLibrary.simpleMessage("签到完成"),
     "qianjinmaiwei" : MessageLookupByLibrary.simpleMessage("前进麦味"),
     "qianshou" : MessageLookupByLibrary.simpleMessage("已签收"),
-    "qianwanghuixiangmendianduihuanhexiao" : MessageLookupByLibrary.simpleMessage("前往一心回乡旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品"),
+    "qianwanghuixiangmendianduihuanhexiao" : MessageLookupByLibrary.simpleMessage("前往海峡姐妹旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品"),
     "qinglihuancun" : MessageLookupByLibrary.simpleMessage("清理缓存"),
     "qingshurubeizhuyaoqiu" : MessageLookupByLibrary.simpleMessage("请输入备注要求"),
     "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("请输入充值金额"),
@@ -693,7 +693,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
     "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
     "xiedongtai" : MessageLookupByLibrary.simpleMessage("写动态"),
-    "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
+    "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("海峡姐妹用户隐私政策"),
     "xihuan_" : m35,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
     "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
@@ -741,7 +741,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隐私协议》"),
-    "yinsizhengce1" : MessageLookupByLibrary.simpleMessage("     感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡"),
+    "yinsizhengce1" : MessageLookupByLibrary.simpleMessage("     感谢您使用海峡姐妹APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读海峡姐妹"),
     "yinsizhengce2" : MessageLookupByLibrary.simpleMessage("     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。"),
     "yinzhang" : MessageLookupByLibrary.simpleMessage("印章"),
     "yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"),
@@ -758,7 +758,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("已完成订单"),
     "yixianghuiyuanquanyi" : MessageLookupByLibrary.simpleMessage("已享会员权益"),
     "yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("-已显示全部评论-"),
-    "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
+    "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
     "yiyoujifen" : MessageLookupByLibrary.simpleMessage("已有积分"),
     "yizhifu" : MessageLookupByLibrary.simpleMessage("已支付"),
     "yonghuming" : MessageLookupByLibrary.simpleMessage("用户名"),

lib/generated/intl/messages_en_US.dart

@@ -133,7 +133,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("Make a call"),
     "bofangcishu" : MessageLookupByLibrary.simpleMessage("Playback times"),
     "bojin" : MessageLookupByLibrary.simpleMessage("platinum"),
-    "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("going back home with one heart"),
+    "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("strait sisters"),
     "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("Invoicing is not supported"),
     "canyingfuwu" : MessageLookupByLibrary.simpleMessage("catering service"),
     "chakan" : MessageLookupByLibrary.simpleMessage("View"),
@@ -420,11 +420,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "lvbiyue" : MessageLookupByLibrary.simpleMessage("balance of green currency"),
     "lvbiyue_" : m18,
     "lvbizhifu" : MessageLookupByLibrary.simpleMessage("green payment"),
-    "main_menu1" : MessageLookupByLibrary.simpleMessage("Jing Bi"),
+    "main_menu1" : MessageLookupByLibrary.simpleMessage("Home"),
-    "main_menu2" : MessageLookupByLibrary.simpleMessage("Union"),
+    "main_menu2" : MessageLookupByLibrary.simpleMessage("Store"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("Organic Life"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("Association"),
     "main_menu4" : MessageLookupByLibrary.simpleMessage("Me"),
-    "main_menu5" : MessageLookupByLibrary.simpleMessage("VIP"),
+    "main_menu5" : MessageLookupByLibrary.simpleMessage("Hi"),
     "manlijiandaijinquan" : m19,
     "manyuankeyong" : m20,
     "meiriqiandao" : MessageLookupByLibrary.simpleMessage("Sign in every day"),

lib/generated/intl/messages_zh_CN.dart

@@ -133,7 +133,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"),
     "bofangcishu" : MessageLookupByLibrary.simpleMessage("播放次数"),
     "bojin" : MessageLookupByLibrary.simpleMessage("铂金"),
-    "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
+    "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
     "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持开票"),
     "canyingfuwu" : MessageLookupByLibrary.simpleMessage("餐饮服务"),
     "chakan" : MessageLookupByLibrary.simpleMessage("查看"),
@@ -251,7 +251,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
     "fenxiangjiankang" : MessageLookupByLibrary.simpleMessage("分享健康"),
     "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"),
-    "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。"),
+    "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友，对方在海峡姐妹App登录页输入邀请码，即可邀请成功。"),
     "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"),
     "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"),
     "fuliduihuan" : MessageLookupByLibrary.simpleMessage("福利兑换"),
@@ -274,7 +274,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "gongli" : m8,
     "gongxinchengwei" : MessageLookupByLibrary.simpleMessage("恭喜您成为"),
     "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成为本店的会员，快去享受超多会员权益吧。"),
-    "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"),
+    "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和海峡姐妹服务协议"),
     "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"),
     "guanyu" : MessageLookupByLibrary.simpleMessage("关于"),
     "guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("关于创始人"),
@@ -296,8 +296,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "huifu" : MessageLookupByLibrary.simpleMessage("回复"),
     "huifu_" : m9,
     "huixiangVIPka" : MessageLookupByLibrary.simpleMessage("回乡VIP卡"),
-    "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"),
+    "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("海峡钱包"),
-    "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
+    "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：海峡姐妹任意门店"),
     "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
     "huixiangvipkazhuanxiang" : MessageLookupByLibrary.simpleMessage("回乡VIP卡专享权益"),
     "huixiangxieyi" : MessageLookupByLibrary.simpleMessage("回乡VIP会员卡规则协议"),
@@ -416,15 +416,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"),
     "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的评论吧"),
     "login" : MessageLookupByLibrary.simpleMessage("登录"),
-    "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
+    "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到海峡姐妹"),
     "lvbiyue" : MessageLookupByLibrary.simpleMessage("绿币余额"),
     "lvbiyue_" : m18,
     "lvbizhifu" : MessageLookupByLibrary.simpleMessage("绿币支付"),
-    "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
+    "main_menu1" : MessageLookupByLibrary.simpleMessage("首页"),
-    "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
+    "main_menu2" : MessageLookupByLibrary.simpleMessage("门店"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"),
     "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
-    "main_menu5" : MessageLookupByLibrary.simpleMessage("回乡VIP"),
+    "main_menu5" : MessageLookupByLibrary.simpleMessage("hi"),
     "manlijiandaijinquan" : m19,
     "manyuankeyong" : m20,
     "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"),
@@ -467,7 +467,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
     "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"),
     "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"),
-    "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《一心回乡服务协议》"),
+    "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《海峡姐妹服务协议》"),
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隐私服务》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本机号码登录"),
     "qianbao" : MessageLookupByLibrary.simpleMessage("钱包"),
@@ -478,7 +478,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "qiandaowancheng" : MessageLookupByLibrary.simpleMessage("签到完成"),
     "qianjinmaiwei" : MessageLookupByLibrary.simpleMessage("前进麦味"),
     "qianshou" : MessageLookupByLibrary.simpleMessage("已签收"),
-    "qianwanghuixiangmendianduihuanhexiao" : MessageLookupByLibrary.simpleMessage("前往一心回乡旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品"),
+    "qianwanghuixiangmendianduihuanhexiao" : MessageLookupByLibrary.simpleMessage("前往海峡姐妹旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品"),
     "qinglihuancun" : MessageLookupByLibrary.simpleMessage("清理缓存"),
     "qingshurubeizhuyaoqiu" : MessageLookupByLibrary.simpleMessage("请输入备注要求"),
     "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("请输入充值金额"),
@@ -693,7 +693,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
     "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
     "xiedongtai" : MessageLookupByLibrary.simpleMessage("写动态"),
-    "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
+    "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("海峡姐妹用户隐私政策"),
     "xihuan_" : m35,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
     "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
@@ -741,7 +741,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隐私协议》"),
-    "yinsizhengce1" : MessageLookupByLibrary.simpleMessage("     感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡"),
+    "yinsizhengce1" : MessageLookupByLibrary.simpleMessage("     感谢您使用海峡姐妹APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读海峡姐妹"),
     "yinsizhengce2" : MessageLookupByLibrary.simpleMessage("     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。"),
     "yinzhang" : MessageLookupByLibrary.simpleMessage("印章"),
     "yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"),
@@ -758,7 +758,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("已完成订单"),
     "yixianghuiyuanquanyi" : MessageLookupByLibrary.simpleMessage("已享会员权益"),
     "yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("-已显示全部评论-"),
-    "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
+    "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
     "yiyoujifen" : MessageLookupByLibrary.simpleMessage("已有积分"),
     "yizhifu" : MessageLookupByLibrary.simpleMessage("已支付"),
     "yonghuming" : MessageLookupByLibrary.simpleMessage("用户名"),

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -133,7 +133,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("拨打电话"),
     "bofangcishu" : MessageLookupByLibrary.simpleMessage("播放次数"),
     "bojin" : MessageLookupByLibrary.simpleMessage("铂金"),
-    "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
+    "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
     "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持开票"),
     "canyingfuwu" : MessageLookupByLibrary.simpleMessage("餐饮服务"),
     "chakan" : MessageLookupByLibrary.simpleMessage("查看"),
@@ -251,7 +251,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
     "fenxiangjiankang" : MessageLookupByLibrary.simpleMessage("分享健康"),
     "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"),
-    "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。"),
+    "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友，对方在海峡姐妹App登录页输入邀请码，即可邀请成功。"),
     "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"),
     "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"),
     "fuliduihuan" : MessageLookupByLibrary.simpleMessage("福利兑换"),
@@ -274,7 +274,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "gongli" : m8,
     "gongxinchengwei" : MessageLookupByLibrary.simpleMessage("恭喜您成为"),
     "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("恭喜您，成为本店的会员，快去享受超多会员权益吧。"),
-    "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"),
+    "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和海峡姐妹服务协议"),
     "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"),
     "guanyu" : MessageLookupByLibrary.simpleMessage("关于"),
     "guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("关于创始人"),
@@ -296,8 +296,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "huifu" : MessageLookupByLibrary.simpleMessage("回复"),
     "huifu_" : m9,
     "huixiangVIPka" : MessageLookupByLibrary.simpleMessage("回乡VIP卡"),
-    "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"),
+    "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("海峡钱包"),
-    "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
+    "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：海峡姐妹任意门店"),
     "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
     "huixiangvipkazhuanxiang" : MessageLookupByLibrary.simpleMessage("回乡VIP卡专享权益"),
     "huixiangxieyi" : MessageLookupByLibrary.simpleMessage("回乡VIP会员卡规则协议"),
@@ -416,15 +416,15 @@ class MessageLookup extends MessageLookupByLibrary {
     "lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"),
     "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的评论吧"),
     "login" : MessageLookupByLibrary.simpleMessage("登录"),
-    "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
+    "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到海峡姐妹"),
     "lvbiyue" : MessageLookupByLibrary.simpleMessage("绿币余额"),
     "lvbiyue_" : m18,
     "lvbizhifu" : MessageLookupByLibrary.simpleMessage("绿币支付"),
-    "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
+    "main_menu1" : MessageLookupByLibrary.simpleMessage("首页"),
-    "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
+    "main_menu2" : MessageLookupByLibrary.simpleMessage("门店"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"),
     "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
-    "main_menu5" : MessageLookupByLibrary.simpleMessage("回乡VIP"),
+    "main_menu5" : MessageLookupByLibrary.simpleMessage("hi"),
     "manlijiandaijinquan" : m19,
     "manyuankeyong" : m20,
     "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"),
@@ -467,7 +467,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
     "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"),
     "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"),
-    "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《一心回乡服务协议》"),
+    "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《海峡姐妹服务协议》"),
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隐私服务》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本机号码登录"),
     "qianbao" : MessageLookupByLibrary.simpleMessage("钱包"),
@@ -478,7 +478,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "qiandaowancheng" : MessageLookupByLibrary.simpleMessage("签到完成"),
     "qianjinmaiwei" : MessageLookupByLibrary.simpleMessage("前进麦味"),
     "qianshou" : MessageLookupByLibrary.simpleMessage("已签收"),
-    "qianwanghuixiangmendianduihuanhexiao" : MessageLookupByLibrary.simpleMessage("前往一心回乡旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品"),
+    "qianwanghuixiangmendianduihuanhexiao" : MessageLookupByLibrary.simpleMessage("前往海峡姐妹旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品"),
     "qinglihuancun" : MessageLookupByLibrary.simpleMessage("清理缓存"),
     "qingshurubeizhuyaoqiu" : MessageLookupByLibrary.simpleMessage("请输入备注要求"),
     "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("请输入充值金额"),
@@ -693,7 +693,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
     "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
     "xiedongtai" : MessageLookupByLibrary.simpleMessage("写动态"),
-    "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
+    "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("海峡姐妹用户隐私政策"),
     "xihuan_" : m35,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
     "xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
@@ -741,7 +741,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
     "yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隐私协议》"),
-    "yinsizhengce1" : MessageLookupByLibrary.simpleMessage("     感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡"),
+    "yinsizhengce1" : MessageLookupByLibrary.simpleMessage("     感谢您使用海峡姐妹APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读海峡姐妹"),
     "yinsizhengce2" : MessageLookupByLibrary.simpleMessage("     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。"),
     "yinzhang" : MessageLookupByLibrary.simpleMessage("印章"),
     "yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"),
@@ -758,7 +758,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("已完成订单"),
     "yixianghuiyuanquanyi" : MessageLookupByLibrary.simpleMessage("已享会员权益"),
     "yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("-已显示全部评论-"),
-    "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
+    "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
     "yiyoujifen" : MessageLookupByLibrary.simpleMessage("已有积分"),
     "yizhifu" : MessageLookupByLibrary.simpleMessage("已支付"),
     "yonghuming" : MessageLookupByLibrary.simpleMessage("用户名"),

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -129,7 +129,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "biaoweiyidu" : MessageLookupByLibrary.simpleMessage("標爲已讀"),
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("撥打電話"),
     "bojin" : MessageLookupByLibrary.simpleMessage("铂金"),
-    "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回鄉"),
+    "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
     "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持開票"),
     "canyingfuwu" : MessageLookupByLibrary.simpleMessage("餐飲服務"),
     "chakan" : MessageLookupByLibrary.simpleMessage("查看"),
@@ -293,7 +293,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "huifu_" : m9,
     "huixiangVIPka" : MessageLookupByLibrary.simpleMessage("回鄉VIP卡"),
     "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回鄉錢包"),
-    "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
+    "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：海峡姐妹任意门店"),
     "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回鄉頭條"),
     "huixiangvipkazhuanxiang" : MessageLookupByLibrary.simpleMessage("回鄉VIP卡專享權益"),
     "huixiangxieyi" : MessageLookupByLibrary.simpleMessage("回鄉VIP會員卡規則協定"),
@@ -416,11 +416,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "lvbiyue" : MessageLookupByLibrary.simpleMessage("綠幣餘額"),
     "lvbiyue_" : m18,
     "lvbizhifu" : MessageLookupByLibrary.simpleMessage("綠幣支付"),
-    "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"),
+    "main_menu1" : MessageLookupByLibrary.simpleMessage("首頁"),
-    "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"),
+    "main_menu2" : MessageLookupByLibrary.simpleMessage("門店"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"),
     "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
-    "main_menu5" : MessageLookupByLibrary.simpleMessage("回鄉VIP"),
+    "main_menu5" : MessageLookupByLibrary.simpleMessage("hi"),
     "manlijiandaijinquan" : m19,
     "manyuankeyong" : m20,
     "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日簽到"),
@@ -473,7 +473,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "qiandaowancheng" : MessageLookupByLibrary.simpleMessage("簽到完成"),
     "qianjinmaiwei" : MessageLookupByLibrary.simpleMessage("前進麥味"),
     "qianshou" : MessageLookupByLibrary.simpleMessage("已簽收"),
-    "qianwanghuixiangmendianduihuanhexiao" : MessageLookupByLibrary.simpleMessage("前往一心回乡旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品"),
+    "qianwanghuixiangmendianduihuanhexiao" : MessageLookupByLibrary.simpleMessage("前往海峡姐妹旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品"),
     "qinglihuancun" : MessageLookupByLibrary.simpleMessage("清理緩存"),
     "qingshurubeizhuyaoqiu" : MessageLookupByLibrary.simpleMessage("請輸入備注要求"),
     "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("請輸入充值金額"),
@@ -752,7 +752,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("已完成订单"),
     "yixianghuiyuanquanyi" : MessageLookupByLibrary.simpleMessage("已享會員權益"),
     "yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("-已顯示全部評論-"),
-    "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心迴響"),
+    "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
     "yiyoujifen" : MessageLookupByLibrary.simpleMessage("已有積分"),
     "yizhifu" : MessageLookupByLibrary.simpleMessage("已支付"),
     "yonghuming" : MessageLookupByLibrary.simpleMessage("用戶名"),

lib/generated/intl/messages_zh_TW.dart

@@ -131,7 +131,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "bodadianhua" : MessageLookupByLibrary.simpleMessage("撥打電話"),
     "bofangcishu" : MessageLookupByLibrary.simpleMessage("播放次數"),
     "bojin" : MessageLookupByLibrary.simpleMessage("铂金"),
-    "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回鄉"),
+    "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
     "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("不支持開票"),
     "canyingfuwu" : MessageLookupByLibrary.simpleMessage("餐飲服務"),
     "chakan" : MessageLookupByLibrary.simpleMessage("查看"),
@@ -295,7 +295,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "huifu_" : m9,
     "huixiangVIPka" : MessageLookupByLibrary.simpleMessage("回鄉VIP卡"),
     "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回鄉錢包"),
-    "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
+    "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：海峡姐妹任意门店"),
     "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回鄉頭條"),
     "huixiangvipkazhuanxiang" : MessageLookupByLibrary.simpleMessage("回鄉VIP卡專享權益"),
     "huixiangxieyi" : MessageLookupByLibrary.simpleMessage("回鄉VIP會員卡規則協定"),
@@ -418,11 +418,11 @@ class MessageLookup extends MessageLookupByLibrary {
     "lvbiyue" : MessageLookupByLibrary.simpleMessage("綠幣餘額"),
     "lvbiyue_" : m18,
     "lvbizhifu" : MessageLookupByLibrary.simpleMessage("綠幣支付"),
-    "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"),
+    "main_menu1" : MessageLookupByLibrary.simpleMessage("首頁"),
-    "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"),
+    "main_menu2" : MessageLookupByLibrary.simpleMessage("門店"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("社群"),
     "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
-    "main_menu5" : MessageLookupByLibrary.simpleMessage("回鄉VIP"),
+    "main_menu5" : MessageLookupByLibrary.simpleMessage("hi"),
     "manlijiandaijinquan" : m19,
     "manyuankeyong" : m20,
     "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日簽到"),
@@ -475,7 +475,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "qiandaowancheng" : MessageLookupByLibrary.simpleMessage("簽到完成"),
     "qianjinmaiwei" : MessageLookupByLibrary.simpleMessage("前進麥味"),
     "qianshou" : MessageLookupByLibrary.simpleMessage("已簽收"),
-    "qianwanghuixiangmendianduihuanhexiao" : MessageLookupByLibrary.simpleMessage("前往一心回乡旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品"),
+    "qianwanghuixiangmendianduihuanhexiao" : MessageLookupByLibrary.simpleMessage("前往海峡姐妹旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品"),
     "qinglihuancun" : MessageLookupByLibrary.simpleMessage("清理緩存"),
     "qingshurubeizhuyaoqiu" : MessageLookupByLibrary.simpleMessage("請輸入備注要求"),
     "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("請輸入充值金額"),

lib/generated/l10n.dart

@@ -35,10 +35,10 @@ class S {
     return Localizations.of<S>(context, S);
   }
 
-  /// `欢迎来到一心回乡`
+  /// `欢迎来到海峡姐妹`
   String get login_splash {
     return Intl.message(
-      '欢迎来到一心回乡',
+      '欢迎来到海峡姐妹',
       name: 'login_splash',
       desc: '',
       args: [],
@@ -145,10 +145,10 @@ class S {
     );
   }
 
-  /// `《一心回乡服务协议》`
+  /// `《海峡姐妹服务协议》`
   String get privacy_policy2 {
     return Intl.message(
-      '《一心回乡服务协议》',
+      '《海峡姐妹服务协议》',
       name: 'privacy_policy2',
       desc: '',
       args: [],
@@ -165,30 +165,30 @@ class S {
     );
   }
 
-  /// `净弼`
+  /// `首页`
   String get main_menu1 {
     return Intl.message(
-      '净弼',
+      '首页',
       name: 'main_menu1',
       desc: '',
       args: [],
     );
   }
 
-  /// `联盟`
+  /// `门店`
   String get main_menu2 {
     return Intl.message(
-      '联盟',
+      '门店',
       name: 'main_menu2',
       desc: '',
       args: [],
     );
   }
 
-  /// `有机生活`
+  /// `社群`
   String get main_menu3 {
     return Intl.message(
-      '有机生活',
+      '社群',
       name: 'main_menu3',
       desc: '',
       args: [],
@@ -205,10 +205,10 @@ class S {
     );
   }
 
-  /// `回乡VIP`
+  /// `hi`
   String get main_menu5 {
     return Intl.message(
-      '回乡VIP',
+      'hi',
       name: 'main_menu5',
       desc: '',
       args: [],
@@ -1805,10 +1805,10 @@ class S {
     );
   }
 
-  /// `前往一心回乡旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品`
+  /// `前往海峡姐妹旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品`
   String get qianwanghuixiangmendianduihuanhexiao {
     return Intl.message(
-      '前往一心回乡旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品',
+      '前往海峡姐妹旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品',
       name: 'qianwanghuixiangmendianduihuanhexiao',
       desc: '',
       args: [],
@@ -1825,10 +1825,10 @@ class S {
     );
   }
 
-  /// `适用于：一心回乡任意门店`
+  /// `适用于：海峡姐妹任意门店`
   String get huixiangrenyimendian {
     return Intl.message(
-      '适用于：一心回乡任意门店',
+      '适用于：海峡姐妹任意门店',
       name: 'huixiangrenyimendian',
       desc: '',
       args: [],
@@ -2145,10 +2145,10 @@ class S {
     );
   }
 
-  /// `一心回乡`
+  /// `海峡姐妹`
   String get brand_yixinhuixiang {
     return Intl.message(
-      '一心回乡',
+      '海峡姐妹',
       name: 'brand_yixinhuixiang',
       desc: '',
       args: [],
@@ -2215,10 +2215,10 @@ class S {
     );
   }
 
-  /// `请勾选同意隐私服务和一心回乡服务协议`
+  /// `请勾选同意隐私服务和海峡姐妹服务协议`
   String get gouxuanxieyi {
     return Intl.message(
-      '请勾选同意隐私服务和一心回乡服务协议',
+      '请勾选同意隐私服务和海峡姐妹服务协议',
       name: 'gouxuanxieyi',
       desc: '',
       args: [],
@@ -3065,10 +3065,10 @@ class S {
     );
   }
 
-  /// `一心回乡`
+  /// `海峡姐妹`
   String get yixinhuixiang {
     return Intl.message(
-      '一心回乡',
+      '海峡姐妹',
       name: 'yixinhuixiang',
       desc: '',
       args: [],
@@ -4085,10 +4085,10 @@ class S {
     );
   }
 
-  /// `一心回乡用户隐私政策`
+  /// `海峡姐妹用户隐私政策`
   String get xieyitanchuang {
     return Intl.message(
-      '一心回乡用户隐私政策',
+      '海峡姐妹用户隐私政策',
       name: 'xieyitanchuang',
       desc: '',
       args: [],
@@ -4135,10 +4135,10 @@ class S {
     );
   }
 
-  /// `     感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡`
+  /// `     感谢您使用海峡姐妹APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读海峡姐妹`
   String get yinsizhengce1 {
     return Intl.message(
-      '     感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡',
+      '     感谢您使用海峡姐妹APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读海峡姐妹',
       name: 'yinsizhengce1',
       desc: '',
       args: [],
@@ -5575,10 +5575,10 @@ class S {
     );
   }
 
-  /// `将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。`
+  /// `将邀请码分享给好友，对方在海峡姐妹App登录页输入邀请码，即可邀请成功。`
   String get fenxiangyaoqingma {
     return Intl.message(
-      '将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。',
+      '将邀请码分享给好友，对方在海峡姐妹App登录页输入邀请码，即可邀请成功。',
       name: 'fenxiangyaoqingma',
       desc: '',
       args: [],
@@ -6125,10 +6125,10 @@ class S {
     );
   }
 
-  /// `回乡钱包`
+  /// `海峡钱包`
   String get huixiangqianbao {
     return Intl.message(
-      '回乡钱包',
+      '海峡钱包',
       name: 'huixiangqianbao',
       desc: '',
       args: [],

lib/home/founder_story_page.dart

@@ -70,7 +70,7 @@ class _FounderStoryPage extends State<FounderStoryPage> {
                               textAlign: TextAlign.start,
                               text: TextSpan(
                                 text:
-                                    "1993年，台胞李旭清在台湾创建“一心回乡”团队，吸引包括蔡三益在内的30余位伙伴加入。"
+                                    "1993年，台胞李旭清在台湾创建“海峡姐妹”团队，吸引包括蔡三益在内的30余位伙伴加入。"
                                     "他们致力于实践自然生态农耕，创造与环境共存共荣的绿色发展模式。经过多年探索，形成三产融合的完整产业链和成熟运营模式。",
                                 style: TextStyle(
                                     color: Color(0xFF1A1A1A),
@@ -99,7 +99,7 @@ class _FounderStoryPage extends State<FounderStoryPage> {
                         text: TextSpan(
                       text:
                           "2018年在台湾生活了五十七年的李旭清女士决定回到父亲的家乡湖北寻根。在这里为了延续台湾回乡的经验，李姐在湖北武汉创立了,与此同行的还有李姐的两个女儿。"
-                          "为了推广更多的好食物，让更多的人参与到环境保护中，一心回乡遇到了知音，在大力支持下，“海峡姐妹餐饮诞生了!",
+                          "为了推广更多的好食物，让更多的人参与到环境保护中，海峡姐妹遇到了知音，在大力支持下，“海峡姐妹餐饮诞生了!",
                       style: TextStyle(
                           color: Color(0xFF1A1A1A),
                           fontSize: 12.sp,

lib/home/home_page.dart

@@ -664,7 +664,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
           ? Swiper(
               pagination: SwiperPagination(
                 alignment: Alignment.bottomCenter,
-                margin: EdgeInsets.only(top: 5.h),
+                margin: EdgeInsets.only(top: 5.h,),
                 builder: DotSwiperPaginationBuilder(
                   size: 8.w,
                   activeSize: 8.w,

lib/home/home_view/discount_zone.dart

@@ -30,7 +30,7 @@ class _DiscountZone extends State<DiscountZone> {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      margin: EdgeInsets.only(top:24.h,bottom: 8.h),
+      margin: EdgeInsets.only(top:24.h,),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisAlignment: MainAxisAlignment.start,

lib/home/home_view/happy_help_farmers.dart

@@ -25,7 +25,7 @@ class _HappyHelpFarmers extends State<HappyHelpFarmers> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      margin: EdgeInsets.only(left:10.w,right: 10.w,bottom: 24.h),
+      margin: EdgeInsets.only(top: 24.h,left:10.w,right: 10.w),
       child:Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisAlignment: MainAxisAlignment.start,

lib/home/home_view/home_recommend_goods.dart

@@ -40,7 +40,7 @@ class _HomeRecommendGoods extends State<HomeRecommendGoods> {
         borderRadius: BorderRadius.circular(6),
         color: Colors.white,
       ),
-      margin: EdgeInsets.only(left: 14.w, right: 14.w,bottom: 24.h),
+      margin: EdgeInsets.only(top: 8.h,left: 14.w, right: 14.w,),
       child: ListView.builder(
         scrollDirection: Axis.horizontal,
         physics: BouncingScrollPhysics(),

lib/home/home_view/top_selling_list.dart

@@ -44,7 +44,7 @@ class _TopSellingList extends State<TopSellingList> {
           fit: BoxFit.cover,
         ),
       ),
-      margin: EdgeInsets.only(left: 14.w,right: 14.w,bottom: 24.h),
+      margin: EdgeInsets.only(top: 14.h,left: 14.w,right: 14.w,),
       padding: EdgeInsets.only(left: 12.w,top: 16.h),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,

lib/home/home_view/welfare_core.dart

@@ -30,7 +30,7 @@ class _WelfareCore extends State<WelfareCore> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      margin: EdgeInsets.only(left:10.w,right: 10.w,bottom: 14.h),
+      margin: EdgeInsets.only(top: 24.h,left:10.w,right: 10.w),
       child:Column(
         children: [
           Row(

lib/home/points_mall_view/points_goods_title.dart

@@ -39,115 +39,118 @@ class _PointsGoodsTitle extends State<PointsGoodsTitle>
 
   @override
   Widget build(BuildContext context) {
-    return Column(
+    return Container(
-      mainAxisAlignment: MainAxisAlignment.start,
+      margin: EdgeInsets.only(top:24.h),
-      crossAxisAlignment: CrossAxisAlignment.start,
+      child: Column(
-      children: [
+        mainAxisAlignment: MainAxisAlignment.start,
-        // ItemTitle(
+        crossAxisAlignment: CrossAxisAlignment.start,
-        //   text: S.of(context).jifenshangcheng,
+        children: [
-        //   imgPath: "assets/image/icon_points_mall.webp",
+          // ItemTitle(
-        // ),
+          //   text: S.of(context).jifenshangcheng,
-        ItemTitle(
+          //   imgPath: "assets/image/icon_points_mall.webp",
-          text: S.of(context).jifenshangcheng,
+          // ),
-          // imgPath: "assets/image/icon_points_mall.webp",
+          ItemTitle(
-          moreText: _itemText,
+            text: S.of(context).jifenshangcheng,
-          moreType: 1,
+            // imgPath: "assets/image/icon_points_mall.webp",
-          items: sortString
+            moreText: _itemText,
-              .map(
+            moreType: 1,
-                (e) => DropdownMenuItem(
+            items: sortString
-                  value: e,
+                .map(
-                  child: Text(
+                  (e) => DropdownMenuItem(
-                    e,
+                value: e,
-                    style: TextStyle(
+                child: Text(
-                      fontSize: 12.sp,
+                  e,
-                      fontWeight: MyFontWeight.medium,
+                  style: TextStyle(
-                      color: Color(0xff353535),
+                    fontSize: 12.sp,
-                    ),
+                    fontWeight: MyFontWeight.medium,
+                    color: Color(0xff353535),
                   ),
                 ),
-              )
-              .toList(),
-          onChanged: _sortChange,
-        ),
-        Container(
-          alignment: Alignment.centerLeft,
-          child: DefaultTabController(
-            length: widget.gooodsCategorys == null
-                ? 0
-                : widget.gooodsCategorys.length,
-            child:  Theme(
-                data: ThemeData(
-                  splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明
-                  highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明
-                ),
-                child: TabBar(
-              isScrollable: true,
-              //可滚动
-              indicatorColor: Color(0xff39B54A),
-              labelColor: Color(0xff32A060),
-              labelStyle: TextStyle(
-                fontSize: 14.sp,
-                fontWeight: FontWeight.bold,
               ),
-              unselectedLabelStyle: TextStyle(
+            )
-                fontSize: 14.sp,
+                .toList(),
-                fontWeight: MyFontWeight.regular,
+            onChanged: _sortChange,
-              ),
+          ),
-              // controller: tabController,
+          Container(
-              //未选中文字颜色
+            alignment: Alignment.centerLeft,
-              unselectedLabelColor: Color(0xff4D4D4D),
+            child: DefaultTabController(
-              indicatorSize: TabBarIndicatorSize.label,
+              length: widget.gooodsCategorys == null
-              //指示器与文字等宽
+                  ? 0
-              tabs: widget.gooodsCategorys == null
+                  : widget.gooodsCategorys.length,
-                  ? []
+              child:  Theme(
-                  : widget.gooodsCategorys
+                  data: ThemeData(
-                      .map((e) => MyTab(text: e.name))
+                    splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明
-                      .toList(),
+                    highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明
-              onTap: widget.onTap,
+                  ),
-            )),
+                  child: TabBar(
+                    isScrollable: true,
+                    //可滚动
+                    indicatorColor: Color(0xff39B54A),
+                    labelColor: Color(0xff32A060),
+                    labelStyle: TextStyle(
+                      fontSize: 14.sp,
+                      fontWeight: FontWeight.bold,
+                    ),
+                    unselectedLabelStyle: TextStyle(
+                      fontSize: 14.sp,
+                      fontWeight: MyFontWeight.regular,
+                    ),
+                    // controller: tabController,
+                    //未选中文字颜色
+                    unselectedLabelColor: Color(0xff4D4D4D),
+                    indicatorSize: TabBarIndicatorSize.label,
+                    //指示器与文字等宽
+                    tabs: widget.gooodsCategorys == null
+                        ? []
+                        : widget.gooodsCategorys
+                        .map((e) => MyTab(text: e.name))
+                        .toList(),
+                    onTap: widget.onTap,
+                  )),
+            ),
           ),
-        ),
+          // Container(
-        // Container(
+          //   width: 124.w,
-        //   width: 124.w,
+          //   height: 32.h,
-        //   height: 32.h,
+          //   margin: EdgeInsets.only(left: 20.w, top: 10),
-        //   margin: EdgeInsets.only(left: 20.w, top: 10),
+          //   color: Colors.white,
-        //   color: Colors.white,
+          //   child: Stack(
-        //   child: Stack(
+          //     alignment: Alignment.center,
-        //     alignment: Alignment.center,
+          //     children: [
-        //     children: [
+          //       Container(
-        //       Container(
+          //         width: 104.w,
-        //         width: 104.w,
+          //         height: 32.h,
-        //         height: 32.h,
+          //         color: Colors.white,
-        //         color: Colors.white,
+          //       ),
-        //       ),
+          //       Container(
-        //       Container(
+          //         padding: EdgeInsets.symmetric(horizontal: 10.w),
-        //         padding: EdgeInsets.symmetric(horizontal: 10.w),
+          //         child: DropdownButton(
-        //         child: DropdownButton(
+          //           items: sortString
-        //           items: sortString
+          //               .map(
-        //               .map(
+          //                 (e) => DropdownMenuItem(
-        //                 (e) => DropdownMenuItem(
+          //                   value: e,
-        //                   value: e,
+          //                   child: Text(
-        //                   child: Text(
+          //                     e,
-        //                     e,
+          //                     style: TextStyle(
-        //                     style: TextStyle(
+          //                       fontSize: 12.sp,
-        //                       fontSize: 12.sp,
+          //                       fontWeight: MyFontWeight.medium,
-        //                       fontWeight: MyFontWeight.medium,
+          //                       color: Color(0xff353535),
-        //                       color: Color(0xff353535),
+          //                     ),
-        //                     ),
+          //                   ),
-        //                   ),
+          //                 ),
-        //                 ),
+          //               )
-        //               )
+          //               .toList(),
-        //               .toList(),
+          //           value: _itemText,
-        //           value: _itemText,
+          //           itemHeight: 50,
-        //           itemHeight: 50,
+          //           onChanged: _sortChange,
-        //           onChanged: _sortChange,
+          //           style: TextStyle(),
-        //           style: TextStyle(),
+          //         ),
-        //         ),
+          //       ),
-        //       ),
+          //     ],
-        //     ],
+          //   ),
-        //   ),
+          // ),
-        // ),
+        ],
-      ],
+      ),
     );
   }
 

lib/l10n/intl_en.arb

@@ -1,5 +1,5 @@
 {
-  "login_splash": "欢迎来到一心回乡",
+  "login_splash": "欢迎来到海峡姐妹",
   "input_phone": "输入手机号",
   "input_code": "手机验证码",
   "input_phone_hide": "请输入你的手机号",
@@ -10,13 +10,13 @@
   "phone_error": "手机格式错误",
   "code_error": "验证码输入错误",
   "privacy_policy1": "登录既同意",
-  "privacy_policy2": "《一心回乡服务协议》",
+  "privacy_policy2": "《海峡姐妹服务协议》",
   "privacy_policy3": "《隐私服务》",
-  "main_menu1": "净弼",
+  "main_menu1": "首页",
-  "main_menu2": "联盟",
+  "main_menu2": "门店",
-  "main_menu3": "有机生活",
+  "main_menu3": "社群",
   "main_menu4": "我的",
-  "main_menu5":"回乡VIP",
+  "main_menu5":"hi",
   "shouye": "首页",
   "huodongliebiao": "活动列表",
   "jifenshangcheng": "净弼积分商城",
@@ -176,9 +176,9 @@
   "weihexiao": "未核销",
   "shiyongtiaojian": "使用条件",
   "shiyongshuoming": "使用说明",
-  "qianwanghuixiangmendianduihuanhexiao": "前往一心回乡旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品",
+  "qianwanghuixiangmendianduihuanhexiao": "前往海峡姐妹旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品",
   "zitiduihuanquan": "券类型：自提兑换券",
-  "huixiangrenyimendian": "适用于：一心回乡任意门店",
+  "huixiangrenyimendian": "适用于：海峡姐妹任意门店",
   "mendianxuanzhe": "门店选择",
   "queren": "确认",
   "zhifuxiangqing": "支付详情",
@@ -210,14 +210,14 @@
   "fantizhongwen": "繁体中文",
   "qingxuanzheninxiangshezhideyuyan": "请选择您想设置的语言",
   "quxiao": "取消",
-  "brand_yixinhuixiang": "一心回乡",
+  "brand_yixinhuixiang": "海峡姐妹",
   "bainianchuanjiao": "百年川椒",
   "haixiajiemei": "海峡姐妹",
   "qianjinmaiwei": "前进麦味",
   "pinpai": "品牌",
   "qingshurushoujihao": "请输入手机号",
   "qingshuruyanzhengma": "请输入验证码",
-  "gouxuanxieyi": "请勾选同意隐私服务和一心回乡服务协议",
+  "gouxuanxieyi": "请勾选同意隐私服务和海峡姐妹服务协议",
   "qingshuruchongzhijine": "输入充值金额(元)",
   "chongzhizuixiaojine": "充值金额最小是{yuan}元",
   "remenwenzhangshipin": "热门文章视频",
@@ -313,7 +313,7 @@
   "yisongda": "已送达",
   "yifahuo": "已发货",
   "peisongzhong": "配送中",
-  "yixinhuixiang": "一心回乡",
+  "yixinhuixiang": "海峡姐妹",
   "guojiankangyoujishenghuo": "过健康有机生活",
   "banben": "版本:{version}",
   "waimai": "外卖",
@@ -423,12 +423,12 @@
   "nihaimeiyouchongzhihuoxiaofeijilu": "你在这儿还没有消费或充值记录哦～",
   "haimeiyouxiaoxi": "还没有消息～",
   "chakanxiangqing": "查看详情",
-  "xieyitanchuang": "一心回乡用户隐私政策",
+  "xieyitanchuang": "海峡姐妹用户隐私政策",
   "yinsixieyi": "《隐私协议》",
   "shiyongmendian": "适用门店",
   "tongyibingjixu": "同意并继续",
   "jujue": "拒绝",
-  "yinsizhengce1": "     感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡",
+  "yinsizhengce1": "     感谢您使用海峡姐妹APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读海峡姐妹",
   "yinsizhengce2": "     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。",
   "chengshixuanze": "城市选择",
   "bianjidizhi": "编辑地址",
@@ -578,7 +578,7 @@
   "wodeyaoqingma": "我的邀请码",
   "haoyoujiangliguize": "好友奖励规则",
   "beiyaoqingdejiangli": "每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张",
-  "fenxiangyaoqingma": "将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。",
+  "fenxiangyaoqingma": "将邀请码分享给好友，对方在海峡姐妹App登录页输入邀请码，即可邀请成功。",
   "woyouyaoqingma": "我有邀请码",
   "input_invite_code_hide": "填写邀请码",
   "qingshuruyaoqingma": "请输入邀请码",
@@ -636,7 +636,7 @@
   "lvbiyue_": "绿币 {yue}",
   "huodongyue_": "活动余额 {yue}",
   "lvbiyue": "绿币余额",
-  "huixiangqianbao": "回乡钱包",
+  "huixiangqianbao": "海峡钱包",
   "zongzichan": "总资产",
   "zongzichanyuan": "总资产(元)",
   "huodongyue": "活动余额",

lib/l10n/intl_en_US.arb

@@ -12,11 +12,11 @@
   "privacy_policy1": "Login Agreed",
   "privacy_policy2": "《Service Agreement for Returning Home with One Heart》",
   "privacy_policy3": "《privacy Services》",
-  "main_menu1": "Jing Bi",
+  "main_menu1": "Home",
-  "main_menu2": "Union",
+  "main_menu2": "Store",
-  "main_menu3": "Organic Life",
+  "main_menu3": "Association",
   "main_menu4": "Me",
-  "main_menu5":"VIP",
+  "main_menu5":"Hi",
   "shouye": "Home",
   "huodongliebiao": "Activity List",
   "jifenshangcheng": "Jingbi Point Mall",
@@ -210,7 +210,7 @@
   "fantizhongwen": "Traditional Chinese",
   "qingxuanzheninxiangshezhideyuyan": "Please select the language you want to set",
   "quxiao": "Cancel",
-  "brand_yixinhuixiang": "going back home with one heart",
+  "brand_yixinhuixiang": "strait sisters",
   "bainianchuanjiao": "Hundred year Sichuan Pepper",
   "haixiajiemei": "Straits Sister",
   "qianjinmaiwei": "Qianjin Maiwei",

lib/l10n/intl_zh_CN.arb

@@ -1,5 +1,5 @@
 {
-  "login_splash": "欢迎来到一心回乡",
+  "login_splash": "欢迎来到海峡姐妹",
   "input_phone": "输入手机号",
   "input_code": "手机验证码",
   "input_phone_hide": "请输入你的手机号",
@@ -10,13 +10,13 @@
   "phone_error": "手机格式错误",
   "code_error": "验证码输入错误",
   "privacy_policy1": "登录既同意",
-  "privacy_policy2": "《一心回乡服务协议》",
+  "privacy_policy2": "《海峡姐妹服务协议》",
   "privacy_policy3": "《隐私服务》",
-  "main_menu1": "净弼",
+  "main_menu1": "首页",
-  "main_menu2": "联盟",
+  "main_menu2": "门店",
-  "main_menu3": "有机生活",
+  "main_menu3": "社群",
   "main_menu4": "我的",
-  "main_menu5":"回乡VIP",
+  "main_menu5":"hi",
   "shouye": "首页",
   "huodongliebiao": "活动列表",
   "jifenshangcheng": "净弼积分商城",
@@ -176,9 +176,9 @@
   "weihexiao": "未核销",
   "shiyongtiaojian": "使用条件",
   "shiyongshuoming": "使用说明",
-  "qianwanghuixiangmendianduihuanhexiao": "前往一心回乡旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品",
+  "qianwanghuixiangmendianduihuanhexiao": "前往海峡姐妹旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品",
   "zitiduihuanquan": "券类型：自提兑换券",
-  "huixiangrenyimendian": "适用于：一心回乡任意门店",
+  "huixiangrenyimendian": "适用于：海峡姐妹任意门店",
   "mendianxuanzhe": "门店选择",
   "queren": "确认",
   "zhifuxiangqing": "支付详情",
@@ -210,14 +210,14 @@
   "fantizhongwen": "繁体中文",
   "qingxuanzheninxiangshezhideyuyan": "请选择您想设置的语言",
   "quxiao": "取消",
-  "brand_yixinhuixiang": "一心回乡",
+  "brand_yixinhuixiang": "海峡姐妹",
   "bainianchuanjiao": "百年川椒",
   "haixiajiemei": "海峡姐妹",
   "qianjinmaiwei": "前进麦味",
   "pinpai": "品牌",
   "qingshurushoujihao": "请输入手机号",
   "qingshuruyanzhengma": "请输入验证码",
-  "gouxuanxieyi": "请勾选同意隐私服务和一心回乡服务协议",
+  "gouxuanxieyi": "请勾选同意隐私服务和海峡姐妹服务协议",
   "qingshuruchongzhijine": "输入充值金额(元)",
   "chongzhizuixiaojine": "充值金额最小是{yuan}元",
   "remenwenzhangshipin": "热门文章视频",
@@ -314,7 +314,7 @@
   "yisongda": "已送达",
   "yifahuo": "已发货",
   "peisongzhong": "配送中",
-  "yixinhuixiang": "一心回乡",
+  "yixinhuixiang": "海峡姐妹",
   "guojiankangyoujishenghuo": "过健康有机生活",
   "banben": "版本:{version}",
   "waimai": "外卖",
@@ -425,12 +425,12 @@
   "nihaimeiyouchongzhihuoxiaofeijilu": "你在这儿还没有消费或充值记录哦～",
   "haimeiyouxiaoxi": "还没有消息～",
   "chakanxiangqing": "查看详情",
-  "xieyitanchuang": "一心回乡用户隐私政策",
+  "xieyitanchuang": "海峡姐妹用户隐私政策",
   "yinsixieyi": "《隐私协议》",
   "shiyongmendian": "适用门店",
   "tongyibingjixu": "同意并继续",
   "jujue": "拒绝",
-  "yinsizhengce1": "     感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡",
+  "yinsizhengce1": "     感谢您使用海峡姐妹APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读海峡姐妹",
   "yinsizhengce2": "     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。",
   "chengshixuanze": "城市选择",
   "bianjidizhi": "编辑地址",
@@ -579,7 +579,7 @@
   "wodeyaoqingma": "我的邀请码",
   "haoyoujiangliguize": "好友奖励规则",
   "beiyaoqingdejiangli": "每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张",
-  "fenxiangyaoqingma": "将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。",
+  "fenxiangyaoqingma": "将邀请码分享给好友，对方在海峡姐妹App登录页输入邀请码，即可邀请成功。",
   "woyouyaoqingma": "我有邀请码",
   "input_invite_code_hide": "填写邀请码",
   "qingshuruyaoqingma": "请输入邀请码",
@@ -637,7 +637,7 @@
   "lvbiyue_": "绿币 {yue}",
   "huodongyue_": "活动余额 {yue}",
   "lvbiyue": "绿币余额",
-  "huixiangqianbao": "回乡钱包",
+  "huixiangqianbao": "海峡钱包",
   "zongzichan": "总资产",
   "zongzichanyuan": "总资产(元)",
   "huodongyue": "活动余额",

lib/l10n/intl_zh_Hans_CN.arb

@@ -1,5 +1,5 @@
 {
-  "login_splash": "欢迎来到一心回乡",
+  "login_splash": "欢迎来到海峡姐妹",
   "input_phone": "输入手机号",
   "input_code": "手机验证码",
   "input_phone_hide": "请输入你的手机号",
@@ -10,13 +10,13 @@
   "phone_error": "手机格式错误",
   "code_error": "验证码输入错误",
   "privacy_policy1": "登录既同意",
-  "privacy_policy2": "《一心回乡服务协议》",
+  "privacy_policy2": "《海峡姐妹服务协议》",
   "privacy_policy3": "《隐私服务》",
-  "main_menu1": "净弼",
+  "main_menu1": "首页",
-  "main_menu2": "联盟",
+  "main_menu2": "门店",
-  "main_menu3": "有机生活",
+  "main_menu3": "社群",
   "main_menu4": "我的",
-  "main_menu5":"回乡VIP",
+  "main_menu5":"hi",
   "shouye": "首页",
   "huodongliebiao": "活动列表",
   "jifenshangcheng": "净弼积分商城",
@@ -176,9 +176,9 @@
   "weihexiao": "未核销",
   "shiyongtiaojian": "使用条件",
   "shiyongshuoming": "使用说明",
-  "qianwanghuixiangmendianduihuanhexiao": "前往一心回乡旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品",
+  "qianwanghuixiangmendianduihuanhexiao": "前往海峡姐妹旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品",
   "zitiduihuanquan": "券类型：自提兑换券",
-  "huixiangrenyimendian": "适用于：一心回乡任意门店",
+  "huixiangrenyimendian": "适用于：海峡姐妹任意门店",
   "mendianxuanzhe": "门店选择",
   "queren": "确认",
   "zhifuxiangqing": "支付详情",
@@ -210,14 +210,14 @@
   "fantizhongwen": "繁体中文",
   "qingxuanzheninxiangshezhideyuyan": "请选择您想设置的语言",
   "quxiao": "取消",
-  "brand_yixinhuixiang": "一心回乡",
+  "brand_yixinhuixiang": "海峡姐妹",
   "bainianchuanjiao": "百年川椒",
   "haixiajiemei": "海峡姐妹",
   "qianjinmaiwei": "前进麦味",
   "pinpai": "品牌",
   "qingshurushoujihao": "请输入手机号",
   "qingshuruyanzhengma": "请输入验证码",
-  "gouxuanxieyi": "请勾选同意隐私服务和一心回乡服务协议",
+  "gouxuanxieyi": "请勾选同意隐私服务和海峡姐妹服务协议",
   "qingshuruchongzhijine": "输入充值金额(元)",
   "chongzhizuixiaojine": "充值金额最小是{yuan}元",
   "remenwenzhangshipin": "热门文章视频",
@@ -314,7 +314,7 @@
   "yisongda": "已送达",
   "yifahuo": "已发货",
   "peisongzhong": "配送中",
-  "yixinhuixiang": "一心回乡",
+  "yixinhuixiang": "海峡姐妹",
   "guojiankangyoujishenghuo": "过健康有机生活",
   "banben": "版本:{version}",
   "waimai": "外卖",
@@ -425,12 +425,12 @@
   "nihaimeiyouchongzhihuoxiaofeijilu": "你在这儿还没有消费或充值记录哦～",
   "haimeiyouxiaoxi": "还没有消息～",
   "chakanxiangqing": "查看详情",
-  "xieyitanchuang": "一心回乡用户隐私政策",
+  "xieyitanchuang": "海峡姐妹用户隐私政策",
   "yinsixieyi": "《隐私协议》",
   "shiyongmendian": "适用门店",
   "tongyibingjixu": "同意并继续",
   "jujue": "拒绝",
-  "yinsizhengce1": "     感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡",
+  "yinsizhengce1": "     感谢您使用海峡姐妹APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读海峡姐妹",
   "yinsizhengce2": "     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。",
   "chengshixuanze": "城市选择",
   "bianjidizhi": "编辑地址",
@@ -579,7 +579,7 @@
   "wodeyaoqingma": "我的邀请码",
   "haoyoujiangliguize": "好友奖励规则",
   "beiyaoqingdejiangli": "每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张",
-  "fenxiangyaoqingma": "将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。",
+  "fenxiangyaoqingma": "将邀请码分享给好友，对方在海峡姐妹App登录页输入邀请码，即可邀请成功。",
   "woyouyaoqingma": "我有邀请码",
   "input_invite_code_hide": "填写邀请码",
   "qingshuruyaoqingma": "请输入邀请码",
@@ -637,7 +637,7 @@
   "lvbiyue_": "绿币 {yue}",
   "huodongyue_": "活动余额 {yue}",
   "lvbiyue": "绿币余额",
-  "huixiangqianbao": "回乡钱包",
+  "huixiangqianbao": "海峡钱包",
   "zongzichan": "总资产",
   "zongzichanyuan": "总资产(元)",
   "huodongyue": "活动余额",

lib/l10n/intl_zh_Hant_CN.arb

@@ -12,11 +12,11 @@
   "privacy_policy1": "登錄既同意",
   "privacy_policy2": "《一心回鄉服務協議》",
   "privacy_policy3": "《隱私服務》",
-  "main_menu1": "淨弼",
+  "main_menu1": "首頁",
-  "main_menu2": "聯盟",
+  "main_menu2": "門店",
-  "main_menu3": "有機生活",
+  "main_menu3": "社群",
   "main_menu4": "我的",
-  "main_menu5": "回鄉VIP",
+  "main_menu5":"hi",
   "shouye": "首頁",
   "huodongliebiao": "活動列表",
   "jifenshangcheng": "淨弼積分商城",
@@ -179,9 +179,9 @@
   "weihexiao": "未核銷",
   "shiyongtiaojian": "使用条件",
   "shiyongshuoming": "使用说明",
-  "qianwanghuixiangmendianduihuanhexiao": "前往一心回乡旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品",
+  "qianwanghuixiangmendianduihuanhexiao": "前往海峡姐妹旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品",
   "zitiduihuanquan": "券类型：自提兑换券",
-  "huixiangrenyimendian": "适用于：一心回乡任意门店",
+  "huixiangrenyimendian": "适用于：海峡姐妹任意门店",
   "mendianxuanzhe": "门店选择",
   "queren": "确认",
   "zhifuxiangqing": "支付详情",
@@ -210,7 +210,7 @@
   "fantizhongwen": "繁体中文",
   "qingxuanzheninxiangshezhideyuyan": "請選擇您要設置的語言",
   "quxiao": "取消",
-  "brand_yixinhuixiang": "一心回鄉",
+  "brand_yixinhuixiang": "海峽姐妹",
   "bainianchuanjiao": "百年川椒",
   "haixiajiemei": "海峽姐妹",
   "qianjinmaiwei": "前進麥味",
@@ -306,7 +306,7 @@
   "yisongda": "已送達",
   "yifahuo": "已發貨",
   "peisongzhong": "配送中",
-  "yixinhuixiang": "一心迴響",
+  "yixinhuixiang": "海峽姐妹",
   "guojiankangyoujishenghuo": "過健康有機生活",
   "banben": "版本:{version}",
   "waimai": "外賣",

lib/l10n/intl_zh_TW.arb

@@ -12,11 +12,11 @@
   "privacy_policy1": "登錄既同意",
   "privacy_policy2": "《一心回鄉服務協議》",
   "privacy_policy3": "《隱私服務》",
-  "main_menu1": "淨弼",
+  "main_menu1": "首頁",
-  "main_menu2": "聯盟",
+  "main_menu2": "門店",
-  "main_menu3": "有機生活",
+  "main_menu3": "社群",
   "main_menu4": "我的",
-  "main_menu5": "回鄉VIP",
+  "main_menu5":"hi",
   "shouye": "首頁",
   "huodongliebiao": "活動列表",
   "jifenshangcheng": "淨弼積分商城",
@@ -179,9 +179,9 @@
   "weihexiao": "未核銷",
   "shiyongtiaojian": "使用条件",
   "shiyongshuoming": "使用说明",
-  "qianwanghuixiangmendianduihuanhexiao": "前往一心回乡旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品",
+  "qianwanghuixiangmendianduihuanhexiao": "前往海峡姐妹旗下任意门店对工作人员出示商品兑换码，核实无误后，可领取对应商品",
   "zitiduihuanquan": "券类型：自提兑换券",
-  "huixiangrenyimendian": "适用于：一心回乡任意门店",
+  "huixiangrenyimendian": "适用于：海峡姐妹任意门店",
   "mendianxuanzhe": "门店选择",
   "queren": "确认",
   "zhifuxiangqing": "支付详情",
@@ -210,7 +210,7 @@
   "fantizhongwen": "繁体中文",
   "qingxuanzheninxiangshezhideyuyan": "請選擇您要設置的語言",
   "quxiao": "取消",
-  "brand_yixinhuixiang": "一心回鄉",
+  "brand_yixinhuixiang": "海峽姐妹",
   "bainianchuanjiao": "百年川椒",
   "haixiajiemei": "海峽姐妹",
   "qianjinmaiwei": "前進麥味",

lib/login/login_page.dart

@@ -1020,7 +1020,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
                       ),
                       TextSpan(
                         // text: S.of(context).privacy_policy2,
-                        text: "《一心回乡用户协议》",
+                        text: "《海峡姐妹用户协议》",
                         recognizer: TapGestureRecognizer()
                           ..onTap = () {
                             Navigator.of(context)

lib/login/new_login_page.dart

@@ -373,7 +373,7 @@ class _NewLoginPage extends State<NewLoginPage> {
                           height: 20.h,
                         ),
                         Text(
-                          "欢迎来到一心回乡",
+                          "欢迎来到海峡姐妹",
                           style: TextStyle(
                             fontWeight: MyFontWeight.regular,
                             fontSize: 20.sp,
@@ -670,7 +670,7 @@ class _NewLoginPage extends State<NewLoginPage> {
                                 ),
                                 TextSpan(
                                   // text: S.of(context).privacy_policy2,
-                                  text: "《一心回乡用户协议》",
+                                  text: "《海峡姐妹用户协议》",
                                   recognizer: TapGestureRecognizer()
                                     ..onTap = () {
                                       Navigator.of(context).pushNamed(

lib/main.dart

@@ -198,7 +198,7 @@ class MyApp extends StatelessWidget {
           designSize: Size(375, 812),
           builder: () => MaterialApp(
             debugShowCheckedModeBanner: false,
-            title: Platform.isAndroid ? (ExamineInstance.instance.isExamine?"一心回乡":""):"",
+            title: Platform.isAndroid ? (ExamineInstance.instance.isExamine?"海峡姐妹":""):"",
             theme: ThemeData(
               primarySwatch: Colors.blue,
               // fontFamily: 'JDZhengHT',

lib/main_page.dart

@@ -237,7 +237,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
     shareSDKRegister.setupFacebook(
       "523308712059457",
       "d3a1b6377100871799d8973fbe84794a",
-      "一心回乡",
+      "海峡姐妹",
     );
     SharesdkPlugin.regist(shareSDKRegister);
 

lib/mine/mine_page.dart

@@ -306,6 +306,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
                           // MineOrderView(),
 
                           ///推广图
+                          if(activityBannerData.length > 0)
                           spreadImage(),
 
                           ///我的 下面item

lib/retrofit/data/activity_order_list.dart

@@ -1,4 +1,4 @@
-/// storeName : "一心回乡商城"
+/// storeName : "海峡姐妹商城"
 /// joinTime : "2022-01-07 18:28:25"
 /// productImg : "https://pos.upload.gznl.top/1179/2021/11/e50b00a1-09a2-4bab-b71f-e26e80006459.png"
 /// productName : "无花果礼盒"

lib/retrofit/data/channels_list.dart

@@ -1,6 +1,6 @@
 /// channels : ["海峡","回乡","boom"]
 /// isOpen : true
-/// preferentialList : [{"createTime":"2023-04-21 16:15:42","giftdMoney":"0.00","gitfdCouponId":null,"id":"1506553893994102784","isDeleted":0,"rechargeMoney":"0.01","rechargeType":0,"remark":"<p>充值说明：<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。<br />储值活动不与其他活动同享</p>","sortValue":1,"tenantCode":"admin"}]
+/// preferentialList : [{"createTime":"2023-04-21 16:15:42","giftdMoney":"0.00","gitfdCouponId":null,"id":"1506553893994102784","isDeleted":0,"rechargeMoney":"0.01","rechargeType":0,"remark":"<p>充值说明：<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、海峡姐妹生态农场等。<br />储值活动不与其他活动同享</p>","sortValue":1,"tenantCode":"admin"}]
 
 class ChannelsList {
   ChannelsList({
@@ -55,7 +55,7 @@ ChannelsList copyWith({  List<String> channels,
 /// isDeleted : 0
 /// rechargeMoney : "0.01"
 /// rechargeType : 0
-/// remark : "<p>充值说明：<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。<br />储值活动不与其他活动同享</p>"
+/// remark : "<p>充值说明：<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、海峡姐妹生态农场等。<br />储值活动不与其他活动同享</p>"
 /// sortValue : 1
 /// tenantCode : "admin"
 

lib/retrofit/data/founder.dart

@@ -1,6 +1,6 @@
 /// name : "李旭清"
 /// position : "集团创始人"
-/// description : "1993年，台湾同胞李旭清在台湾创建“一心回乡”"
+/// description : "1993年，台湾同胞李旭清在台湾创建“海峡姐妹”"
 /// imgUrl : "https://pos.upload.gznl.top/MDAwMA==/2021/07/3f169d8c-5cb8-4789-a8f6-f2ce17277106.webp"
 /// profile : "<p><img class=\"wscnph\" src=\"https://pos.upload.gznl.top/MDAwMA==/2021/07/bdc0705d-7aa0-4677-a282-81d1b8a56e4b.webp\" /></p>"
 

lib/retrofit/data/headlines_list.dart

@@ -3,7 +3,7 @@
 /// createUser : "1"
 /// updateTime : "2021-11-25 16:45:55"
 /// updateUser : "1"
-/// name : "一心回乡"
+/// name : "海峡姐妹"
 /// introduce : "22"
 /// coverImg : "https://pos.upload.gznl.top/0000/2021/11/899b578b-f594-42f7-91e1-cebc5dbc39da.webp"
 /// bannerImg : "https://pos.upload.gznl.top/0000/2021/11/7a41ebe2-d3b1-44ea-9cda-2e952b58d54c.webp"

lib/retrofit/data/headlines_list_details.dart

@@ -3,7 +3,7 @@
 /// createUser : "1"
 /// updateTime : "2021-11-25 16:45:55"
 /// updateUser : "1"
-/// name : "一心回乡"
+/// name : "海峡姐妹"
 /// introduce : "22"
 /// coverImg : "https://pos.upload.gznl.top/0000/2021/11/899b578b-f594-42f7-91e1-cebc5dbc39da.webp"
 /// bannerImg : "https://pos.upload.gznl.top/0000/2021/11/7a41ebe2-d3b1-44ea-9cda-2e952b58d54c.webp"

lib/retrofit/data/product_show.dart

@@ -3,11 +3,11 @@
 /// createUser : "1364043181062094848"
 /// updateTime : "2022-01-21 18:27:02"
 /// updateUser : "1364043181062094848"
-/// supplierName : "一心回乡生态农场"
+/// supplierName : "海峡姐妹生态农场"
 /// storeId : "1460885296764682240"
 /// categoryId : "1460889654206136320"
 /// groupId : "1484146679266410496"
-/// shortName : "【一心回乡】三益米 筋道绵润、鲜稻尝鲜；自留种老品种，非转基因种子"
+/// shortName : "【海峡姐妹】三益米 筋道绵润、鲜稻尝鲜；自留种老品种，非转基因种子"
 /// productName : "三益米1kg"
 /// sellDesc : ""
 /// productCode : "PRO202201202132000000000000001"

lib/retrofit/data/rechargeActLists.dart

@@ -1,4 +1,4 @@
-/// preferentialList : [{"id":"1506553893994102784","rechargeMoney":"100.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-11-11 10:10:31","isDeleted":0,"rechargeType":0,"remark":"<p>充值说明：<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。<br />储值活动不与其他活动同享</p>","sortValue":1},{"id":"1506553858271215616","rechargeMoney":"300.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-11-21 19:56:39","isDeleted":0,"rechargeType":0,"remark":"<p>平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。</p>","sortValue":2},{"id":"1506553832157478912","rechargeMoney":"500.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-11-21 19:56:48","isDeleted":0,"rechargeType":0,"remark":"<p>平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。</p>","sortValue":3},{"id":"1506553759084314624","rechargeMoney":"800.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-06-10 11:14:39","isDeleted":0,"rechargeType":0,"remark":"<p>平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。</p>","sortValue":4},{"id":"1506553705988620288","rechargeMoney":"1000.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-11-21 19:56:55","isDeleted":0,"rechargeType":0,"remark":"<p>充值说明：<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。</p>","sortValue":5},{"id":"1506553668529291264","rechargeMoney":"1500.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-06-10 11:14:52","isDeleted":0,"rechargeType":0,"remark":"<p>充值说明：<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。</p>","sortValue":6}]
+/// preferentialList : [{"id":"1506553893994102784","rechargeMoney":"100.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-11-11 10:10:31","isDeleted":0,"rechargeType":0,"remark":"<p>充值说明：<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、海峡姐妹生态农场等。<br />储值活动不与其他活动同享</p>","sortValue":1},{"id":"1506553858271215616","rechargeMoney":"300.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-11-21 19:56:39","isDeleted":0,"rechargeType":0,"remark":"<p>平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、海峡姐妹生态农场等。</p>","sortValue":2},{"id":"1506553832157478912","rechargeMoney":"500.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-11-21 19:56:48","isDeleted":0,"rechargeType":0,"remark":"<p>平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、海峡姐妹生态农场等。</p>","sortValue":3},{"id":"1506553759084314624","rechargeMoney":"800.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-06-10 11:14:39","isDeleted":0,"rechargeType":0,"remark":"<p>平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、海峡姐妹生态农场等。</p>","sortValue":4},{"id":"1506553705988620288","rechargeMoney":"1000.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-11-21 19:56:55","isDeleted":0,"rechargeType":0,"remark":"<p>充值说明：<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、海峡姐妹生态农场等。</p>","sortValue":5},{"id":"1506553668529291264","rechargeMoney":"1500.00","giftdMoney":"0.00","gitfdCouponId":null,"tenantCode":"admin","createTime":"2022-06-10 11:14:52","isDeleted":0,"rechargeType":0,"remark":"<p>充值说明：<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、海峡姐妹生态农场等。</p>","sortValue":6}]
 /// channels : ["海峡","回乡","boom"]
 /// isOpen : false
 
@@ -56,7 +56,7 @@ RechargeActLists copyWith({  List<PreferentialList> preferentialList,
 /// createTime : "2022-11-11 10:10:31"
 /// isDeleted : 0
 /// rechargeType : 0
-/// remark : "<p>充值说明：<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、一心回乡生态农场等。<br />储值活动不与其他活动同享</p>"
+/// remark : "<p>充值说明：<br />平台充值根据用户在平台的会员等级享有不同的充值权益。<br />银卡用户享1.1倍充值会员权益，即充值100元账户110元。<br />金卡用户享1.2倍充值会员权益，即充值100元账户120元。<br />共创用户享1.3倍充值会员权益，即充值100元账户130元。<br />平台充值金可在平台上所有品牌和门店使用，包含：农场火锅、海峡姐妹、前进麦味、百年川椒、农场煮意、海峡姐妹生态农场等。<br />储值活动不与其他活动同享</p>"
 /// sortValue : 1
 
 class PreferentialList {

lib/retrofit/retrofit_api.dart

@@ -96,8 +96,8 @@ abstract class ApiService {
     if (kReleaseMode) baseUrl = serviceBaseUrl;
     if (isIp) baseUrl = ipBaseUrl;
     dio.options = BaseOptions(
-      connectTimeout: 60000,
+      connectTimeout: 30000,
-      receiveTimeout: 60000,
+      receiveTimeout: 30000,
       headers: headers,
       responseType: ResponseType.json,
     );

lib/setting/logout_ing.dart

@@ -427,7 +427,7 @@ class _LogoutIng extends State<LogoutIng> {
                 Padding(
                   padding: EdgeInsets.only(bottom: 13),
                   child: Text(
-                    (balance == "0.00" && money == "0.00") ? "由于当于帐号已注销，系统将自动退出登录":"您的回乡钱包余额及门店余额未使用完！",
+                    (balance == "0.00" && money == "0.00") ? "由于当于帐号已注销，系统将自动退出登录":"您的海峡钱包余额及门店余额未使用完！",
                     textAlign: TextAlign.center,
                     style: TextStyle(
                       fontSize: 16.sp,

lib/setting/logout_page.dart

@@ -92,13 +92,13 @@ class _LogoutPage extends State<LogoutPage> {
                 ),
               ),
               _textRich(
-                  "1.账号一旦注销，您将无法登录、使用该账号（也包括无法再使用该账号作为第三方账号登录其他产品），也就是说您将无法再以此账号登录/使用/继续使用一心回乡集团旗下的相关产品与服务"),
+                  "1.账号一旦注销，您将无法登录、使用该账号（也包括无法再使用该账号作为第三方账号登录其他产品），也就是说您将无法再以此账号登录/使用/继续使用海峡姐妹集团旗下的相关产品与服务"),
               _textRich(
                   "2.帐号注销说明我们将删除您的相关信息。您在该帐号下的个人信息、交易记录、业务数据、历史信息等删除后均将无法找回。"),
               _textRich(
-                  "3.账号一旦注销，您曾通过该账号登录、使用的一心回乡集团旗下的产品与服务下的所有内容、信息、数据、记录将会被删除，您也无法再检索、访问、获取、继续使用和找回，也无权要求我们找回（但法律法规另有规定或监管部门另有要求的除外），包括："
+                  "3.账号一旦注销，您曾通过该账号登录、使用的海峡姐妹集团旗下的产品与服务下的所有内容、信息、数据、记录将会被删除，您也无法再检索、访问、获取、继续使用和找回，也无权要求我们找回（但法律法规另有规定或监管部门另有要求的除外），包括："
                   "\n   •该账号下的个人资料（例如：头像、昵称等）及绑定信息（例如：绑定手机号）；"
-                  "\n   •该账号下的您的个人信息（同时您亦不再享有《一心回乡隐私政策》中约定的您的用户权利，但法律法规另有规定的除外）；"
+                  "\n   •该账号下的您的个人信息（同时您亦不再享有《海峡姐妹隐私政策》中约定的您的用户权利，但法律法规另有规定的除外）；"
                   "\n   •该账号曾发表的所有内容（例如：音频、图片、照片、评论、互动、点赞等）；"
                   "\n   •该账号所登录的门店小程序也将无法使用。同时，小程序内的个人信息，账户信息等也将删除"),
               _textRich(
@@ -121,7 +121,7 @@ class _LogoutPage extends State<LogoutPage> {
                   "\n   •请确认平台余额以及清零，否则将不予注销；"
                   "\n   •请确认当下无正在进行中的交易，否则无法进行注销操作；。"),
               _textRich(
-                  "2.勾选《一心回乡账号注销协议》，点击注销后，系统将判定帐号是否符合注销条件，符合后进行手机号验证，输入正确验证码后既注销完成。"),
+                  "2.勾选《海峡姐妹账号注销协议》，点击注销后，系统将判定帐号是否符合注销条件，符合后进行手机号验证，输入正确验证码后既注销完成。"),
               Padding(
                 padding:
                     EdgeInsets.only(top: 12, bottom: 8, right: 20, left: 20),
@@ -135,7 +135,7 @@ class _LogoutPage extends State<LogoutPage> {
                 ),
               ),
               _textRich(
-                  "1.一心回乡有权在必要时修改本协议，您可以在相关页面查阅最新的本协议。您的任何使用本功能的行为，即视为您已经阅读并同意本协议及相应更新。"),
+                  "1.海峡姐妹有权在必要时修改本协议，您可以在相关页面查阅最新的本协议。您的任何使用本功能的行为，即视为您已经阅读并同意本协议及相应更新。"),
               _textRich(
                   "2.本协议的拟定、解释均以中文为准。除双方另有约定外，任何有关本协议的翻译不得作为解释本协议或判定双方当事人意图之依据。"),
               SizedBox(
@@ -159,7 +159,7 @@ class _LogoutPage extends State<LogoutPage> {
                       fillColor: MaterialStateProperty.all(Color(0xFF32A060)),
                     ),
                     Text(
-                      "已了解《一心回乡账号注销协议》，并自行承担相关后果",
+                      "已了解《海峡姐妹账号注销协议》，并自行承担相关后果",
                       textAlign: TextAlign.center,
                       style: TextStyle(
                         fontSize: 11.sp,
@@ -173,7 +173,7 @@ class _LogoutPage extends State<LogoutPage> {
               GestureDetector(
                 onTap: () {
                   if (!checkStatus) {
-                    SmartDialog.showToast("请勾选同意《一心回乡账号注销协议》",
+                    SmartDialog.showToast("请勾选同意《海峡姐妹账号注销协议》",
                         alignment: Alignment.center);
                     return;
                   }

lib/setting/platform_pay_code.dart

@@ -82,7 +82,7 @@ class _PlatformPayCode extends State<PlatformPayCode> {
             height: 12.h,
           ),
           Text(
-            "将用于一心回乡APP下单时平台余额消费",
+            "将用于海峡姐妹APP下单时平台余额消费",
             style: TextStyle(
               fontWeight: MyFontWeight.medium,
               fontSize: 14.sp,

lib/setting/platform_pay_code_success.dart

@@ -119,7 +119,7 @@ class _PlatformPayCodeSuccess extends State<PlatformPayCodeSuccess> {
             height: 12.h,
           ),
           Text(
-            "将用于一心回乡APP下单时平台余额消费",
+            "将用于海峡姐妹APP下单时平台余额消费",
             style: TextStyle(
               fontWeight: MyFontWeight.medium,
               fontSize: 14.sp,

lib/settlement/settlement_view/distribution.dart

@@ -146,7 +146,7 @@ class _DistributionMode extends State<DistributionMode> {
                       flex: 1,
                       child: GestureDetector(
                         onTap: () {
-                          // if (widget.storeInfo.storeName == "一心回乡商城") {
+                          // if (widget.storeInfo.storeName == "海峡姐妹商城") {
                           //   SmartDialog.showToast("该功能暂未开放!",
                           //       alignment: Alignment.center);
                           //   return;
@@ -174,7 +174,7 @@ class _DistributionMode extends State<DistributionMode> {
                       flex: 1,
                       child: GestureDetector(
                         onTap: () {
-                          // if (widget.storeInfo.storeName == "一心回乡商城"){
+                          // if (widget.storeInfo.storeName == "海峡姐妹商城"){
                           //   SmartDialog.showToast("该功能暂未开放!",
                           //       alignment: Alignment.center);
                           //   return;

lib/store/shopping/shopping_home/shopping_home_page.dart

@@ -115,7 +115,7 @@ class _ShoppingHomePage extends State<ShoppingHomePage>
     return Column(
       children: [
         MyAppBar(
-          title: widget?.storeInfo?.storeName ?? "一心回乡商城",
+          title: widget?.storeInfo?.storeName ?? "海峡姐妹商城",
           titleColor: Colors.black,
           leadingColor: Colors.black,
           background: Colors.transparent,

lib/vip/vip_view/vip_goods_discount.dart

@@ -322,9 +322,9 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
                           ),
                           Text(
                             "VIP会员专享价格"
-                                "\n*用户开通回乡VIP卡，可享以专享优惠价格购买一心回乡APP入驻商户部分门店商品的会员权益。"
+                                "\n*用户开通回乡VIP卡，可享以专享优惠价格购买海峡姐妹APP入驻商户部分门店商品的会员权益。"
                                 "\n*权益适用产品及专享价格，以会员权益页面公示为准。"
-                                "\n为满足不同用户的需求，一心回乡将可能适时调整权益适用产品及专享价格，具体权益内容以会员权益页面公示为准。",
+                                "\n为满足不同用户的需求，海峡姐妹将可能适时调整权益适用产品及专享价格，具体权益内容以会员权益页面公示为准。",
                             style: TextStyle(
                               fontWeight: MyFontWeight.medium,
                               fontSize: 14.sp,

pubspec.yaml

@@ -1,5 +1,5 @@
 name: huixiang
-description: 一心回乡.
+description: 海峡姐妹.
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev