Browse Source

Merge remote-tracking branch 'origin/dev' into remove_uniapp

ff_new
fmk 3 years ago
parent
commit
525812b1ce
  1. BIN
      assets/image/2x/qr_share_bg_yq.png
  2. BIN
      assets/image/2x/share_image_bg_yq.png
  3. BIN
      assets/image/2x/yq.png
  4. BIN
      assets/image/2x/yq_qx.png
  5. BIN
      assets/image/3x/qr_share_bg_yq.png
  6. BIN
      assets/image/3x/share_image_bg_yq.png
  7. BIN
      assets/image/3x/yq.png
  8. BIN
      assets/image/3x/yq_qx.png
  9. BIN
      assets/image/qr_share_bg_yq.png
  10. BIN
      assets/image/share_image_bg_yq.png
  11. BIN
      assets/image/yq.png
  12. BIN
      assets/image/yq_qx.png
  13. 131
      lib/community/headlines/article_list.dart
  14. 65
      lib/community/headlines/headlines_collection.dart
  15. 9
      lib/generated/intl/messages_en.dart
  16. 8
      lib/generated/intl/messages_zh_CN.dart
  17. 8
      lib/generated/intl/messages_zh_Hans_CN.dart
  18. 8
      lib/generated/intl/messages_zh_Hant_CN.dart
  19. 8
      lib/generated/intl/messages_zh_TW.dart
  20. 90
      lib/generated/l10n.dart
  21. 27
      lib/home/home_page.dart
  22. 10
      lib/l10n/intl_en.arb
  23. 8
      lib/l10n/intl_zh_CN.arb
  24. 9
      lib/l10n/intl_zh_Hans_CN.arb
  25. 9
      lib/l10n/intl_zh_Hant_CN.arb
  26. 8
      lib/l10n/intl_zh_TW.arb
  27. 154
      lib/login/login_page.dart
  28. 2
      lib/main.dart
  29. 16
      lib/main_page.dart
  30. 6
      lib/mine/coupons_page.dart
  31. 2
      lib/mine/mine_vip/legal_right_details.dart
  32. 5
      lib/mine/mine_vip/mine_vip_core.dart
  33. 59
      lib/qr/qr_share.dart
  34. 78
      lib/qr/qr_share_image.dart
  35. 371
      lib/retrofit/data/login_info.dart
  36. 3
      lib/retrofit/retrofit_api.dart
  37. 30
      lib/retrofit/retrofit_api.g.dart
  38. 120
      lib/view_widget/invite_success_dialog.dart

BIN
assets/image/2x/qr_share_bg_yq.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 KiB

BIN
assets/image/2x/share_image_bg_yq.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

BIN
assets/image/2x/yq.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
assets/image/2x/yq_qx.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
assets/image/3x/qr_share_bg_yq.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 KiB

BIN
assets/image/3x/share_image_bg_yq.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 KiB

BIN
assets/image/3x/yq.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
assets/image/3x/yq_qx.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
assets/image/qr_share_bg_yq.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

BIN
assets/image/share_image_bg_yq.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

BIN
assets/image/yq.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
assets/image/yq_qx.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 747 B

131
lib/community/headlines/article_list.dart

@ -57,7 +57,7 @@ class _ArticleList extends State<ArticleList> {
maxLines: 2, maxLines: 2,
style: TextStyle( style: TextStyle(
fontSize: 15.sp, fontSize: 15.sp,
fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.semi_bold,
color: Colors.black, color: Colors.black,
), ),
)), )),
@ -91,75 +91,78 @@ class _ArticleList extends State<ArticleList> {
margin: EdgeInsets.only(bottom: 12), margin: EdgeInsets.only(bottom: 12),
color: Colors.white, color: Colors.white,
child:Row( child:Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Expanded(child: Column( Expanded(child: Container(
crossAxisAlignment: CrossAxisAlignment.start, height: 96,
mainAxisAlignment: MainAxisAlignment.spaceAround, child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Text( mainAxisAlignment: MainAxisAlignment.spaceAround,
widget?.articles[position]?.mainTitle ?? "", children: [
overflow: TextOverflow.ellipsis, Text(
maxLines: 1, widget?.articles[position]?.mainTitle ?? "",
style: TextStyle( overflow: TextOverflow.ellipsis,
fontSize: 14.sp, maxLines: 1,
fontWeight: MyFontWeight.medium, style: TextStyle(
color: Colors.black, fontSize: 14.sp,
fontWeight: MyFontWeight.semi_bold,
color: Colors.black,
),
), ),
), Text(
SizedBox(height:5), widget?.articles[position]?.viceTitle ?? "",
Text( // overflow: TextOverflow.ellipsis,
widget?.articles[position]?.viceTitle ?? "", // maxLines: 1,
// overflow: TextOverflow.ellipsis, style: TextStyle(
// maxLines: 1, fontSize: 12.sp,
style: TextStyle( fontWeight: MyFontWeight.regular,
fontSize: 12.sp, color: Color(0xFF353535),
fontWeight: MyFontWeight.regular, ),
color: Color(0xFF353535),
), ),
), // SizedBox(height: 20),
SizedBox(height: 10), Row(
Row( children: [
children: [ Text(
Text( (widget.articles[position] != null &&
(widget.articles[position] != null && widget.articles[position].author != null)
widget.articles[position].author != null) ? widget.articles[position].author.name
? widget.articles[position].author.name : "",
: "", style: TextStyle(
style: TextStyle( fontSize: 12.sp,
fontSize: 12.sp, fontWeight: MyFontWeight.medium,
fontWeight: MyFontWeight.medium, color: Color(0xFF8E8E8E),
color: Color(0xFF8E8E8E), ),
), ),
), SizedBox(width:8),
SizedBox(width:8), Image.asset(
Image.asset( "assets/image/browse.png",
"assets/image/browse.png", width: 14,
width: 14, height: 14,
height: 14, color: Color(0xFF808080),
color: Color(0xFF808080),
),
Expanded(child: Text(
"${widget?.articles[position]?.viewers}"
?? "",
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xFF8D8D8D),
), ),
)), Expanded(child: Text(
Text( "${widget?.articles[position]?.viewers}"
widget?.articles[position]?.createTime?.split(" ")[0] ?? "",
?? "", style: TextStyle(
style: TextStyle( fontSize: 12.sp,
fontSize: 12.sp, fontWeight: MyFontWeight.regular,
fontWeight: MyFontWeight.regular, color: Color(0xFF8D8D8D),
color: Color(0xFF8D8D8D), ),
)),
Text(
widget?.articles[position]?.createTime?.split(" ")[0]
?? "",
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xFF8D8D8D),
),
), ),
), ],
], ),
), ],
], ),)),
),),
SizedBox(width:12), SizedBox(width:12),
MImage( MImage(
widget?.articles[position]?.coverImg ?? "", widget?.articles[position]?.coverImg ?? "",

65
lib/community/headlines/headlines_collection.dart

@ -36,7 +36,7 @@ class _HeadlinesCollection extends State<HeadlinesCollection> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
height: 100, height: 60.h,
margin: EdgeInsets.only(top:10), margin: EdgeInsets.only(top:10),
child: ListView.builder( child: ListView.builder(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
@ -61,7 +61,7 @@ class _HeadlinesCollection extends State<HeadlinesCollection> {
Widget headlinesCollectionItem(HeadlinesList headlines) { Widget headlinesCollectionItem(HeadlinesList headlines) {
return Container( return Container(
width: 225.w, width: 225.w,
height:110.h, height:60.h,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4), borderRadius: BorderRadius.circular(4),
boxShadow: [ boxShadow: [
@ -85,7 +85,7 @@ class _HeadlinesCollection extends State<HeadlinesCollection> {
child: MImage( child: MImage(
headlines?.coverImg ?? "", headlines?.coverImg ?? "",
width: 225.w, width: 225.w,
height: 110.h, height: 60.h,
fit: BoxFit.fill, fit: BoxFit.fill,
errorSrc: "assets/image/default_1.png", errorSrc: "assets/image/default_1.png",
fadeSrc: "assets/image/default_1.png", fadeSrc: "assets/image/default_1.png",
@ -96,11 +96,12 @@ class _HeadlinesCollection extends State<HeadlinesCollection> {
), ),
), ),
Container( Container(
padding: EdgeInsets.all(12), padding: EdgeInsets.only(left:12.w,right: 12.w),
child: Column(children: [ child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expanded(child: Row( Expanded(child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
Container( Container(
margin: EdgeInsets.only(right:4), margin: EdgeInsets.only(right:4),
@ -132,31 +133,31 @@ class _HeadlinesCollection extends State<HeadlinesCollection> {
), ),
),), ),),
],)), ],)),
Row( // Row(
children: [ // children: [
Expanded(child:Text( // Expanded(child:Text(
"更新3篇", // "更新3篇",
style: TextStyle( // style: TextStyle(
fontSize: 12.sp, // fontSize: 12.sp,
fontWeight: MyFontWeight.medium, // fontWeight: MyFontWeight.medium,
color: Colors.white, // color: Colors.white,
), // ),
)), // )),
Text( // Text(
"查看专栏", // "查看专栏",
style: TextStyle( // style: TextStyle(
fontSize: 12.sp, // fontSize: 12.sp,
fontWeight: MyFontWeight.regular, // fontWeight: MyFontWeight.regular,
color: Colors.white, // color: Colors.white,
), // ),
), // ),
SizedBox(width: 2), // SizedBox(width: 2),
Image.asset( // Image.asset(
"assets/image/t_right.png", // "assets/image/t_right.png",
width: 14, // width: 14,
height: 14, // height: 14,
), // ),
],), // ],),
],), ],),
), ),
], ],

9
lib/generated/intl/messages_en.dart

@ -111,6 +111,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baocun" : MessageLookupByLibrary.simpleMessage("保存"), "baocun" : MessageLookupByLibrary.simpleMessage("保存"),
"baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"), "baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
"baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二维码,邀请他人微信扫一扫识别,长按关注后,完成小游戏,领取优惠券后,即邀请成功哦!"), "baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二维码,邀请他人微信扫一扫识别,长按关注后,完成小游戏,领取优惠券后,即邀请成功哦!"),
"beiyaoqingdejiangli" : MessageLookupByLibrary.simpleMessage("每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张"),
"beizhu" : MessageLookupByLibrary.simpleMessage("备注"), "beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
"beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"), "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"),
"bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"), "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"),
@ -213,6 +214,7 @@ class MessageLookup extends MessageLookupByLibrary {
"fensi" : MessageLookupByLibrary.simpleMessage("粉丝"), "fensi" : MessageLookupByLibrary.simpleMessage("粉丝"),
"fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
"fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"),
"fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。"),
"fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"),
"fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"),
"ge" : m5, "ge" : m5,
@ -238,6 +240,7 @@ class MessageLookup extends MessageLookupByLibrary {
"haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("还没有优惠券可以领取~"), "haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("还没有优惠券可以领取~"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"), "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"), "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友奖励规则"),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"), "heji" : MessageLookupByLibrary.simpleMessage("合计:"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
@ -269,8 +272,10 @@ class MessageLookup extends MessageLookupByLibrary {
"huopinyisongda" : MessageLookupByLibrary.simpleMessage("货品已送达"), "huopinyisongda" : MessageLookupByLibrary.simpleMessage("货品已送达"),
"input_code" : MessageLookupByLibrary.simpleMessage("手机验证码"), "input_code" : MessageLookupByLibrary.simpleMessage("手机验证码"),
"input_code_hide" : MessageLookupByLibrary.simpleMessage("请输入验证码"), "input_code_hide" : MessageLookupByLibrary.simpleMessage("请输入验证码"),
"input_invite_code_hide" : MessageLookupByLibrary.simpleMessage("填写邀请码"),
"input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"), "input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"),
"input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"),
"invite_code_error" : MessageLookupByLibrary.simpleMessage("邀请码输入错误"),
"jiajifen" : m11, "jiajifen" : m11,
"jian" : MessageLookupByLibrary.simpleMessage(""), "jian" : MessageLookupByLibrary.simpleMessage(""),
"jiangli" : MessageLookupByLibrary.simpleMessage("奖励"), "jiangli" : MessageLookupByLibrary.simpleMessage("奖励"),
@ -385,6 +390,7 @@ class MessageLookup extends MessageLookupByLibrary {
"qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("请输入充值金额"), "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("请输入充值金额"),
"qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("请输入手机号"), "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("请输入手机号"),
"qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("请输入验证码"), "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("请输入验证码"),
"qingshuruyaoqingma" : MessageLookupByLibrary.simpleMessage("请输入邀请码"),
"qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("请输入您的有效手机号"), "qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("请输入您的有效手机号"),
"qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"), "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"),
"qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"),
@ -534,6 +540,8 @@ class MessageLookup extends MessageLookupByLibrary {
"wodeqianbao" : MessageLookupByLibrary.simpleMessage("我的钱包"), "wodeqianbao" : MessageLookupByLibrary.simpleMessage("我的钱包"),
"wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"), "wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"),
"wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"), "wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"),
"wodeyaoqingma" : MessageLookupByLibrary.simpleMessage("我的邀请码"),
"woyouyaoqingma" : MessageLookupByLibrary.simpleMessage("我有邀请码"),
"wuliudanhao" : MessageLookupByLibrary.simpleMessage("物流单号:"), "wuliudanhao" : MessageLookupByLibrary.simpleMessage("物流单号:"),
"wuliugongsi" : MessageLookupByLibrary.simpleMessage("物流公司:"), "wuliugongsi" : MessageLookupByLibrary.simpleMessage("物流公司:"),
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
@ -564,6 +572,7 @@ class MessageLookup extends MessageLookupByLibrary {
"xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"), "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"),
"xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
"yaoqingrenshoujihao_" : m32, "yaoqingrenshoujihao_" : m32,
"yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀请完成"),
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
"yiduihuanjian" : m33, "yiduihuanjian" : m33,

8
lib/generated/intl/messages_zh_CN.dart

@ -111,6 +111,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baocun" : MessageLookupByLibrary.simpleMessage("保存"), "baocun" : MessageLookupByLibrary.simpleMessage("保存"),
"baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"), "baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
"baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二维码,邀请他人微信扫一扫识别,长按关注后,完成小游戏,领取优惠券后,即邀请成功哦!"), "baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二维码,邀请他人微信扫一扫识别,长按关注后,完成小游戏,领取优惠券后,即邀请成功哦!"),
"beiyaoqingdejiangli" : MessageLookupByLibrary.simpleMessage("每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张"),
"beizhu" : MessageLookupByLibrary.simpleMessage("备注"), "beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
"beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"), "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"),
"bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"), "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"),
@ -213,6 +214,7 @@ class MessageLookup extends MessageLookupByLibrary {
"fensi" : MessageLookupByLibrary.simpleMessage("粉丝"), "fensi" : MessageLookupByLibrary.simpleMessage("粉丝"),
"fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
"fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"),
"fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。"),
"fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"),
"fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"),
"ge" : m5, "ge" : m5,
@ -237,6 +239,7 @@ class MessageLookup extends MessageLookupByLibrary {
"haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("还没有优惠券可以领取~"), "haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("还没有优惠券可以领取~"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"), "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"), "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友奖励规则"),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"), "heji" : MessageLookupByLibrary.simpleMessage("合计:"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
@ -267,8 +270,10 @@ class MessageLookup extends MessageLookupByLibrary {
"huopinyisongda" : MessageLookupByLibrary.simpleMessage("货品已送达"), "huopinyisongda" : MessageLookupByLibrary.simpleMessage("货品已送达"),
"input_code" : MessageLookupByLibrary.simpleMessage("手机验证码"), "input_code" : MessageLookupByLibrary.simpleMessage("手机验证码"),
"input_code_hide" : MessageLookupByLibrary.simpleMessage("请输入验证码"), "input_code_hide" : MessageLookupByLibrary.simpleMessage("请输入验证码"),
"input_invite_code_hide" : MessageLookupByLibrary.simpleMessage("填写邀请码"),
"input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"), "input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"),
"input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"),
"invite_code_error" : MessageLookupByLibrary.simpleMessage("邀请码输入错误"),
"jiajifen" : m11, "jiajifen" : m11,
"jian" : MessageLookupByLibrary.simpleMessage(""), "jian" : MessageLookupByLibrary.simpleMessage(""),
"jiangli" : MessageLookupByLibrary.simpleMessage("奖励"), "jiangli" : MessageLookupByLibrary.simpleMessage("奖励"),
@ -383,6 +388,7 @@ class MessageLookup extends MessageLookupByLibrary {
"qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("请输入充值金额"), "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("请输入充值金额"),
"qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("请输入手机号"), "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("请输入手机号"),
"qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("请输入验证码"), "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("请输入验证码"),
"qingshuruyaoqingma" : MessageLookupByLibrary.simpleMessage("请输入邀请码"),
"qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("请输入您的有效手机号"), "qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("请输入您的有效手机号"),
"qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"), "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"),
"qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"),
@ -532,6 +538,8 @@ class MessageLookup extends MessageLookupByLibrary {
"wodeqianbao" : MessageLookupByLibrary.simpleMessage("我的钱包"), "wodeqianbao" : MessageLookupByLibrary.simpleMessage("我的钱包"),
"wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"), "wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"),
"wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"), "wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"),
"wodeyaoqingma" : MessageLookupByLibrary.simpleMessage("我的邀请码"),
"woyouyaoqingma" : MessageLookupByLibrary.simpleMessage("我有邀请码"),
"wuliudanhao" : MessageLookupByLibrary.simpleMessage("物流单号:"), "wuliudanhao" : MessageLookupByLibrary.simpleMessage("物流单号:"),
"wuliugongsi" : MessageLookupByLibrary.simpleMessage("物流公司:"), "wuliugongsi" : MessageLookupByLibrary.simpleMessage("物流公司:"),
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),

8
lib/generated/intl/messages_zh_Hans_CN.dart

@ -111,6 +111,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baocun" : MessageLookupByLibrary.simpleMessage("保存"), "baocun" : MessageLookupByLibrary.simpleMessage("保存"),
"baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"), "baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
"baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二维码,邀请他人微信扫一扫识别,长按关注后,完成小游戏,领取优惠券后,即邀请成功哦!"), "baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二维码,邀请他人微信扫一扫识别,长按关注后,完成小游戏,领取优惠券后,即邀请成功哦!"),
"beiyaoqingdejiangli" : MessageLookupByLibrary.simpleMessage("每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张"),
"beizhu" : MessageLookupByLibrary.simpleMessage("备注"), "beizhu" : MessageLookupByLibrary.simpleMessage("备注"),
"beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"), "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"),
"bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"), "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"),
@ -213,6 +214,7 @@ class MessageLookup extends MessageLookupByLibrary {
"fensi" : MessageLookupByLibrary.simpleMessage("粉丝"), "fensi" : MessageLookupByLibrary.simpleMessage("粉丝"),
"fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
"fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"),
"fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。"),
"fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"),
"fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"),
"ge" : m5, "ge" : m5,
@ -237,6 +239,7 @@ class MessageLookup extends MessageLookupByLibrary {
"haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("还没有优惠券可以领取~"), "haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("还没有优惠券可以领取~"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"), "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"), "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友奖励规则"),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"), "heji" : MessageLookupByLibrary.simpleMessage("合计:"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
@ -267,8 +270,10 @@ class MessageLookup extends MessageLookupByLibrary {
"huopinyisongda" : MessageLookupByLibrary.simpleMessage("货品已送达"), "huopinyisongda" : MessageLookupByLibrary.simpleMessage("货品已送达"),
"input_code" : MessageLookupByLibrary.simpleMessage("手机验证码"), "input_code" : MessageLookupByLibrary.simpleMessage("手机验证码"),
"input_code_hide" : MessageLookupByLibrary.simpleMessage("请输入验证码"), "input_code_hide" : MessageLookupByLibrary.simpleMessage("请输入验证码"),
"input_invite_code_hide" : MessageLookupByLibrary.simpleMessage("填写邀请码"),
"input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"), "input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"),
"input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"),
"invite_code_error" : MessageLookupByLibrary.simpleMessage("邀请码输入错误"),
"jiajifen" : m11, "jiajifen" : m11,
"jian" : MessageLookupByLibrary.simpleMessage(""), "jian" : MessageLookupByLibrary.simpleMessage(""),
"jiangli" : MessageLookupByLibrary.simpleMessage("奖励"), "jiangli" : MessageLookupByLibrary.simpleMessage("奖励"),
@ -383,6 +388,7 @@ class MessageLookup extends MessageLookupByLibrary {
"qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("请输入充值金额"), "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("请输入充值金额"),
"qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("请输入手机号"), "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("请输入手机号"),
"qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("请输入验证码"), "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("请输入验证码"),
"qingshuruyaoqingma" : MessageLookupByLibrary.simpleMessage("请输入邀请码"),
"qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("请输入您的有效手机号"), "qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("请输入您的有效手机号"),
"qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"), "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("请输入支付密码"),
"qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("请填写收件人手机号"),
@ -532,6 +538,8 @@ class MessageLookup extends MessageLookupByLibrary {
"wodeqianbao" : MessageLookupByLibrary.simpleMessage("我的钱包"), "wodeqianbao" : MessageLookupByLibrary.simpleMessage("我的钱包"),
"wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"), "wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"),
"wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"), "wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"),
"wodeyaoqingma" : MessageLookupByLibrary.simpleMessage("我的邀请码"),
"woyouyaoqingma" : MessageLookupByLibrary.simpleMessage("我有邀请码"),
"wuliudanhao" : MessageLookupByLibrary.simpleMessage("物流单号:"), "wuliudanhao" : MessageLookupByLibrary.simpleMessage("物流单号:"),
"wuliugongsi" : MessageLookupByLibrary.simpleMessage("物流公司:"), "wuliugongsi" : MessageLookupByLibrary.simpleMessage("物流公司:"),
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),

8
lib/generated/intl/messages_zh_Hant_CN.dart

@ -111,6 +111,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baocun" : MessageLookupByLibrary.simpleMessage("保存"), "baocun" : MessageLookupByLibrary.simpleMessage("保存"),
"baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"), "baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
"baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二維碼,邀請他人微信掃一掃識別,長按關注後,完成小遊戲,領取優惠券後,即邀請成功哦!"), "baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二維碼,邀請他人微信掃一掃識別,長按關注後,完成小遊戲,領取優惠券後,即邀請成功哦!"),
"beiyaoqingdejiangli" : MessageLookupByLibrary.simpleMessage("每一位被邀請的用戶,在輸入邀請碼之後可獲得前進麥味10元代金券一張"),
"beizhu" : MessageLookupByLibrary.simpleMessage("備注"), "beizhu" : MessageLookupByLibrary.simpleMessage("備注"),
"beizhuxinxi" : MessageLookupByLibrary.simpleMessage("備注信息"), "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("備注信息"),
"bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"), "bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"),
@ -213,6 +214,7 @@ class MessageLookup extends MessageLookupByLibrary {
"fensi" : MessageLookupByLibrary.simpleMessage("粉絲"), "fensi" : MessageLookupByLibrary.simpleMessage("粉絲"),
"fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
"fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接點擊右上方的分享給到你想要邀請的人。"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接點擊右上方的分享給到你想要邀請的人。"),
"fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("將邀請碼分享給好友,對方在一心回鄉App登入頁輸入邀請碼,即可邀請成功。"),
"fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"),
"fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手機號"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手機號"),
"ge" : m5, "ge" : m5,
@ -237,6 +239,7 @@ class MessageLookup extends MessageLookupByLibrary {
"haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("還沒有優惠券可以領取~"), "haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("還沒有優惠券可以領取~"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"), "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"), "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友獎勵規則"),
"heji" : MessageLookupByLibrary.simpleMessage("合計:"), "heji" : MessageLookupByLibrary.simpleMessage("合計:"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"),
@ -267,8 +270,10 @@ class MessageLookup extends MessageLookupByLibrary {
"huopinyisongda" : MessageLookupByLibrary.simpleMessage("貨品已送達"), "huopinyisongda" : MessageLookupByLibrary.simpleMessage("貨品已送達"),
"input_code" : MessageLookupByLibrary.simpleMessage("手機驗證碼"), "input_code" : MessageLookupByLibrary.simpleMessage("手機驗證碼"),
"input_code_hide" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"), "input_code_hide" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"),
"input_invite_code_hide" : MessageLookupByLibrary.simpleMessage("填寫邀請碼"),
"input_phone" : MessageLookupByLibrary.simpleMessage("輸入手機號"), "input_phone" : MessageLookupByLibrary.simpleMessage("輸入手機號"),
"input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"),
"invite_code_error" : MessageLookupByLibrary.simpleMessage("邀請碼輸入錯誤"),
"jiajifen" : m11, "jiajifen" : m11,
"jian" : MessageLookupByLibrary.simpleMessage(""), "jian" : MessageLookupByLibrary.simpleMessage(""),
"jiangli" : MessageLookupByLibrary.simpleMessage("獎勵"), "jiangli" : MessageLookupByLibrary.simpleMessage("獎勵"),
@ -383,6 +388,7 @@ class MessageLookup extends MessageLookupByLibrary {
"qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("請輸入充值金額"), "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("請輸入充值金額"),
"qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("請輸入手機號碼"), "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("請輸入手機號碼"),
"qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"), "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"),
"qingshuruyaoqingma" : MessageLookupByLibrary.simpleMessage("請輸入邀請碼"),
"qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("請輸入您的有效手機號"), "qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("請輸入您的有效手機號"),
"qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("請輸入支付密碼"), "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("請輸入支付密碼"),
"qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("請填寫收件人手機號"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("請填寫收件人手機號"),
@ -531,6 +537,8 @@ class MessageLookup extends MessageLookupByLibrary {
"wodeqianbao" : MessageLookupByLibrary.simpleMessage("我的錢包"), "wodeqianbao" : MessageLookupByLibrary.simpleMessage("我的錢包"),
"wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"), "wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"),
"wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"), "wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"),
"wodeyaoqingma" : MessageLookupByLibrary.simpleMessage("我的邀請碼"),
"woyouyaoqingma" : MessageLookupByLibrary.simpleMessage("我有邀請碼"),
"wuliudanhao" : MessageLookupByLibrary.simpleMessage("物流單號:"), "wuliudanhao" : MessageLookupByLibrary.simpleMessage("物流單號:"),
"wuliugongsi" : MessageLookupByLibrary.simpleMessage("物流公司:"), "wuliugongsi" : MessageLookupByLibrary.simpleMessage("物流公司:"),
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),

8
lib/generated/intl/messages_zh_TW.dart

@ -111,6 +111,7 @@ class MessageLookup extends MessageLookupByLibrary {
"baocun" : MessageLookupByLibrary.simpleMessage("保存"), "baocun" : MessageLookupByLibrary.simpleMessage("保存"),
"baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"), "baocunchenggong" : MessageLookupByLibrary.simpleMessage("保存成功"),
"baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二維碼,邀請他人微信掃一掃識別,長按關注後,完成小遊戲,領取優惠券後,即邀請成功哦!"), "baocunsaoma" : MessageLookupByLibrary.simpleMessage("截屏保存下方二維碼,邀請他人微信掃一掃識別,長按關注後,完成小遊戲,領取優惠券後,即邀請成功哦!"),
"beiyaoqingdejiangli" : MessageLookupByLibrary.simpleMessage("每一位被邀請的用戶,在輸入邀請碼之後可獲得前進麥味10元代金券一張"),
"beizhu" : MessageLookupByLibrary.simpleMessage("備注"), "beizhu" : MessageLookupByLibrary.simpleMessage("備注"),
"beizhuxinxi" : MessageLookupByLibrary.simpleMessage("備注信息"), "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("備注信息"),
"bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"), "bianjidizhi" : MessageLookupByLibrary.simpleMessage("編輯地址"),
@ -213,6 +214,7 @@ class MessageLookup extends MessageLookupByLibrary {
"fensi" : MessageLookupByLibrary.simpleMessage("粉絲"), "fensi" : MessageLookupByLibrary.simpleMessage("粉絲"),
"fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
"fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接點擊右上方的分享給到你想要邀請的人。"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接點擊右上方的分享給到你想要邀請的人。"),
"fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("將邀請碼分享給好友,對方在一心回鄉App登入頁輸入邀請碼,即可邀請成功。"),
"fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"),
"fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手機號"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手機號"),
"ge" : m5, "ge" : m5,
@ -237,6 +239,7 @@ class MessageLookup extends MessageLookupByLibrary {
"haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("還沒有優惠券可以領取~"), "haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("還沒有優惠券可以領取~"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"), "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"), "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友獎勵規則"),
"heji" : MessageLookupByLibrary.simpleMessage("合計:"), "heji" : MessageLookupByLibrary.simpleMessage("合計:"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"),
@ -267,8 +270,10 @@ class MessageLookup extends MessageLookupByLibrary {
"huopinyisongda" : MessageLookupByLibrary.simpleMessage("貨品已送達"), "huopinyisongda" : MessageLookupByLibrary.simpleMessage("貨品已送達"),
"input_code" : MessageLookupByLibrary.simpleMessage("手機驗證碼"), "input_code" : MessageLookupByLibrary.simpleMessage("手機驗證碼"),
"input_code_hide" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"), "input_code_hide" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"),
"input_invite_code_hide" : MessageLookupByLibrary.simpleMessage("填寫邀請碼"),
"input_phone" : MessageLookupByLibrary.simpleMessage("輸入手機號"), "input_phone" : MessageLookupByLibrary.simpleMessage("輸入手機號"),
"input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"), "input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"),
"invite_code_error" : MessageLookupByLibrary.simpleMessage("邀請碼輸入錯誤"),
"jiajifen" : m11, "jiajifen" : m11,
"jian" : MessageLookupByLibrary.simpleMessage(""), "jian" : MessageLookupByLibrary.simpleMessage(""),
"jiangli" : MessageLookupByLibrary.simpleMessage("獎勵"), "jiangli" : MessageLookupByLibrary.simpleMessage("獎勵"),
@ -383,6 +388,7 @@ class MessageLookup extends MessageLookupByLibrary {
"qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("請輸入充值金額"), "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("請輸入充值金額"),
"qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("請輸入手機號碼"), "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("請輸入手機號碼"),
"qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"), "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("請輸入驗證碼"),
"qingshuruyaoqingma" : MessageLookupByLibrary.simpleMessage("請輸入邀請碼"),
"qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("請輸入您的有效手機號"), "qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("請輸入您的有效手機號"),
"qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("請輸入支付密碼"), "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("請輸入支付密碼"),
"qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("請填寫收件人手機號"), "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("請填寫收件人手機號"),
@ -532,6 +538,8 @@ class MessageLookup extends MessageLookupByLibrary {
"wodeqianbao" : MessageLookupByLibrary.simpleMessage("我的錢包"), "wodeqianbao" : MessageLookupByLibrary.simpleMessage("我的錢包"),
"wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"), "wodeshengri" : MessageLookupByLibrary.simpleMessage("我的生日"),
"wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"), "wodexiaoxi" : MessageLookupByLibrary.simpleMessage("我的消息"),
"wodeyaoqingma" : MessageLookupByLibrary.simpleMessage("我的邀請碼"),
"woyouyaoqingma" : MessageLookupByLibrary.simpleMessage("我有邀請碼"),
"wuliudanhao" : MessageLookupByLibrary.simpleMessage("物流單號:"), "wuliudanhao" : MessageLookupByLibrary.simpleMessage("物流單號:"),
"wuliugongsi" : MessageLookupByLibrary.simpleMessage("物流公司:"), "wuliugongsi" : MessageLookupByLibrary.simpleMessage("物流公司:"),
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"), "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),

90
lib/generated/l10n.dart

@ -5535,6 +5535,96 @@ class S {
); );
} }
/// ``
String get wodeyaoqingma {
return Intl.message(
'我的邀请码',
name: 'wodeyaoqingma',
desc: '',
args: [],
);
}
/// ``
String get haoyoujiangliguize {
return Intl.message(
'好友奖励规则',
name: 'haoyoujiangliguize',
desc: '',
args: [],
);
}
/// `,10`
String get beiyaoqingdejiangli {
return Intl.message(
'每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张',
name: 'beiyaoqingdejiangli',
desc: '',
args: [],
);
}
/// `App登录页输入邀请码`
String get fenxiangyaoqingma {
return Intl.message(
'将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。',
name: 'fenxiangyaoqingma',
desc: '',
args: [],
);
}
/// ``
String get woyouyaoqingma {
return Intl.message(
'我有邀请码',
name: 'woyouyaoqingma',
desc: '',
args: [],
);
}
/// ``
String get input_invite_code_hide {
return Intl.message(
'填写邀请码',
name: 'input_invite_code_hide',
desc: '',
args: [],
);
}
/// ``
String get qingshuruyaoqingma {
return Intl.message(
'请输入邀请码',
name: 'qingshuruyaoqingma',
desc: '',
args: [],
);
}
/// ``
String get invite_code_error {
return Intl.message(
'邀请码输入错误',
name: 'invite_code_error',
desc: '',
args: [],
);
}
/// ``
String get yaoqingwancheng {
return Intl.message(
'邀请完成',
name: 'yaoqingwancheng',
desc: '',
args: [],
);
}
/// `使` /// `使`
String get privacy_policy4 { String get privacy_policy4 {
return Intl.message( return Intl.message(

27
lib/home/home_page.dart

@ -20,10 +20,12 @@ import 'package:huixiang/retrofit/data/brand.dart';
import 'package:huixiang/retrofit/data/founder.dart'; import 'package:huixiang/retrofit/data/founder.dart';
import 'package:huixiang/retrofit/data/goods.dart'; import 'package:huixiang/retrofit/data/goods.dart';
import 'package:huixiang/retrofit/data/goods_category.dart'; import 'package:huixiang/retrofit/data/goods_category.dart';
import 'package:huixiang/retrofit/data/login_info.dart';
import 'package:huixiang/retrofit/data/page.dart'; import 'package:huixiang/retrofit/data/page.dart';
import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/event_type.dart'; import 'package:huixiang/utils/event_type.dart';
import 'package:huixiang/view_widget/classic_header.dart'; import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/invite_success_dialog.dart';
import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/request_permission.dart'; import 'package:huixiang/view_widget/request_permission.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
@ -35,8 +37,10 @@ import 'home_view/shortcut_operation.dart';
class HomePage extends StatefulWidget { class HomePage extends StatefulWidget {
final Function changeTab; final Function changeTab;
final String invite;
final List<CouponList> couponList;
HomePage(this.changeTab); HomePage(this.changeTab, {this.invite,this.couponList});
@override @override
State<StatefulWidget> createState() { State<StatefulWidget> createState() {
@ -56,12 +60,28 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
setState(() {}); setState(() {});
} }
}); });
if((widget.invite??"") != "" || widget.couponList != null
&& widget.couponList.length > 0)
showInvite = true;
}
///
inviteShowAlertDialog(invite,CouponList couponList) {
//
showDialog(
context: context,
builder: (BuildContext context) {
return InviteSuccessDialog(invite,couponList);
},
);
} }
final SwiperController controller = SwiperController(); final SwiperController controller = SwiperController();
String categoryId; String categoryId;
int pageNum = 1; int pageNum = 1;
bool showInvite = false;
//1-2-3- //1-2-3-
int orderType = 1; int orderType = 1;
@ -194,6 +214,11 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
refreshController.refreshFailed(); refreshController.refreshFailed();
} }
EasyLoading.dismiss(); EasyLoading.dismiss();
if(showInvite){
inviteShowAlertDialog(widget.invite,widget.couponList[0]);
showInvite = false;
}
} }
@override @override

10
lib/l10n/intl_en.arb

@ -574,6 +574,16 @@
"chakanhexiaoma": "查看核销码", "chakanhexiaoma": "查看核销码",
"chakanwuliu": "查看物流", "chakanwuliu": "查看物流",
"dangqianzhukadengji": "当前主卡等级", "dangqianzhukadengji": "当前主卡等级",
"wodeyaoqingma": "我的邀请码",
"haoyoujiangliguize": "好友奖励规则",
"beiyaoqingdejiangli": "每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张",
"fenxiangyaoqingma": "将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。",
"woyouyaoqingma": "我有邀请码",
"input_invite_code_hide": "填写邀请码",
"qingshuruyaoqingma": "请输入邀请码",
"invite_code_error": "邀请码输入错误",
"yaoqingwancheng": "邀请完成",

8
lib/l10n/intl_zh_CN.arb

@ -572,6 +572,14 @@
"chakanhexiaoma": "查看核销码", "chakanhexiaoma": "查看核销码",
"chakanwuliu": "查看物流", "chakanwuliu": "查看物流",
"dangqianzhukadengji": "当前主卡等级", "dangqianzhukadengji": "当前主卡等级",
"wodeyaoqingma": "我的邀请码",
"haoyoujiangliguize": "好友奖励规则",
"beiyaoqingdejiangli": "每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张",
"fenxiangyaoqingma": "将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。",
"woyouyaoqingma": "我有邀请码",
"input_invite_code_hide": "填写邀请码",
"qingshuruyaoqingma": "请输入邀请码",
"invite_code_error": "邀请码输入错误",

9
lib/l10n/intl_zh_Hans_CN.arb

@ -572,7 +572,14 @@
"chakanhexiaoma": "查看核销码", "chakanhexiaoma": "查看核销码",
"chakanwuliu": "查看物流", "chakanwuliu": "查看物流",
"dangqianzhukadengji": "当前主卡等级", "dangqianzhukadengji": "当前主卡等级",
"wodeyaoqingma": "我的邀请码",
"haoyoujiangliguize": "好友奖励规则",
"beiyaoqingdejiangli": "每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张",
"fenxiangyaoqingma": "将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。",
"woyouyaoqingma": "我有邀请码",
"input_invite_code_hide": "填写邀请码",
"qingshuruyaoqingma": "请输入邀请码",
"invite_code_error": "邀请码输入错误",

9
lib/l10n/intl_zh_Hant_CN.arb

@ -566,7 +566,14 @@
"chakanhexiaoma": "查看核銷碼", "chakanhexiaoma": "查看核銷碼",
"chakanwuliu": "查看物流", "chakanwuliu": "查看物流",
"dangqianzhukadengji": "當前主卡等級", "dangqianzhukadengji": "當前主卡等級",
"wodeyaoqingma": "我的邀請碼",
"haoyoujiangliguize": "好友獎勵規則",
"beiyaoqingdejiangli": "每一位被邀請的用戶,在輸入邀請碼之後可獲得前進麥味10元代金券一張",
"fenxiangyaoqingma": "將邀請碼分享給好友,對方在一心回鄉App登入頁輸入邀請碼,即可邀請成功。",
"woyouyaoqingma": "我有邀請碼",
"input_invite_code_hide": "填寫邀請碼",
"qingshuruyaoqingma": "請輸入邀請碼",
"invite_code_error": "邀請碼輸入錯誤",

8
lib/l10n/intl_zh_TW.arb

@ -566,6 +566,14 @@
"chakanhexiaoma": "查看核銷碼", "chakanhexiaoma": "查看核銷碼",
"chakanwuliu": "查看物流", "chakanwuliu": "查看物流",
"dangqianzhukadengji": "當前主卡等級", "dangqianzhukadengji": "當前主卡等級",
"wodeyaoqingma": "我的邀請碼",
"haoyoujiangliguize": "好友獎勵規則",
"beiyaoqingdejiangli": "每一位被邀請的用戶,在輸入邀請碼之後可獲得前進麥味10元代金券一張",
"fenxiangyaoqingma": "將邀請碼分享給好友,對方在一心回鄉App登入頁輸入邀請碼,即可邀請成功。",
"woyouyaoqingma": "我有邀請碼",
"input_invite_code_hide": "填寫邀請碼",
"qingshuruyaoqingma": "請輸入邀請碼",
"invite_code_error": "邀請碼輸入錯誤",

154
lib/login/login_page.dart

@ -7,6 +7,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:huixiang/main.dart'; import 'package:huixiang/main.dart';
import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/login_info.dart';
import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/retrofit/data/user_entity.dart'; import 'package:huixiang/retrofit/data/user_entity.dart';
import 'package:huixiang/utils/event_type.dart'; import 'package:huixiang/utils/event_type.dart';
@ -18,6 +19,7 @@ import 'package:flutter/services.dart';
import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/generated/l10n.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:huixiang/view_widget/invite_success_dialog.dart';
import 'package:huixiang/view_widget/round_button.dart'; import 'package:huixiang/view_widget/round_button.dart';
import 'package:photo_view/photo_view.dart'; import 'package:photo_view/photo_view.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
@ -36,14 +38,17 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
var checkStatus = false; var checkStatus = false;
var mobileStatus = 0; var mobileStatus = 0;
var verifyStatus = 0; var verifyStatus = 0;
var invitationCodeStatus = 0;
var mobileErrorText = ""; var mobileErrorText = "";
var codeErrorText = ""; var codeErrorText = "";
var invitationErrorText = "";
var btnText = S.current.send_code; var btnText = S.current.send_code;
// var _controllerPhone = TextEditingController(text: "13800138000"); // var _controllerPhone = TextEditingController(text: "13800138000");
// var _controllerCode = TextEditingController(text: "888888"); // var _controllerCode = TextEditingController(text: "888888");
var _controllerPhone = TextEditingController(); var _controllerPhone = TextEditingController();
var _controllerCode = TextEditingController(); var _controllerCode = TextEditingController();
var _controllerInviteCode = TextEditingController();
var _sendCodeStatus = 0; var _sendCodeStatus = 0;
GlobalKey loginKey = GlobalKey(); GlobalKey loginKey = GlobalKey();
@ -55,6 +60,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
int changeAlpha = 0; int changeAlpha = 0;
Animation<Alignment> animation; Animation<Alignment> animation;
Animation<double> doubleAnimation; Animation<double> doubleAnimation;
bool invitationCode = true;
isLogin() async { isLogin() async {
SharedPreferences sharedPreferences = await SharedPreferences.getInstance(); SharedPreferences sharedPreferences = await SharedPreferences.getInstance();
@ -170,6 +176,24 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
statusCodeVisible = false; statusCodeVisible = false;
} }
}); });
_controllerInviteCode.addListener(() {
if (_controllerInviteCode.text != null && _controllerInviteCode.text != "") {
if (isPhone(_controllerInviteCode.text)) {
statusInviteTextColor = Color(0xFF353535);
statusInviteLineColor = Color(0xFF32A060);
statusInviteVisible = false;
} else {
statusInviteTextColor = Color(0xFFF72626);
statusInviteLineColor = Color(0xFFF72626);
statusInviteVisible = true;
}
} else {
statusInviteTextColor = Color(0xFF353535);
statusInviteLineColor = Color(0xFF32A060);
statusInviteVisible = false;
}
});
} }
bool statusPhoneVisible = false; bool statusPhoneVisible = false;
@ -180,6 +204,11 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
Color statusCodeTextColor = Color(0xFF353535); Color statusCodeTextColor = Color(0xFF353535);
Color statusCodeLineColor = Color(0xFF32A060); Color statusCodeLineColor = Color(0xFF32A060);
bool statusInviteVisible = false;
Color statusInviteTextColor = Color(0xFF353535);
Color statusInviteLineColor = Color(0xFF32A060);
_sendCode() async { _sendCode() async {
SharedPreferences sharedPreferences = await SharedPreferences.getInstance(); SharedPreferences sharedPreferences = await SharedPreferences.getInstance();
if (!sharedPreferences.containsKey("isShowPrivacyPolicy") || if (!sharedPreferences.containsKey("isShowPrivacyPolicy") ||
@ -278,6 +307,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
setState(() {}); setState(() {});
return; return;
} }
var code = _controllerCode.text; var code = _controllerCode.text;
if (code == "") { if (code == "") {
verifyStatus = 2; verifyStatus = 2;
@ -291,29 +321,31 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
setState(() {}); setState(() {});
return; return;
} }
var invite = _controllerInviteCode.text;
var param = { var param = {
"capcha": code, "capcha": code,
"mobile": mobile, "mobile": mobile,
"invite":invite,
}; };
EasyLoading.show(status: S.of(context).zhengzaijiazai); EasyLoading.show(status: S.of(context).zhengzaijiazai);
BaseData value = await client.memberLogin(param).catchError((error) { BaseData<LoginInfo> value = await client.memberLogin(param).catchError((error) {
print(error); print(error);
SmartDialog.showToast("$error", alignment: Alignment.center); SmartDialog.showToast("$error", alignment: Alignment.center);
}); });
EasyLoading.show(status: S.of(context).zhengzaijiazai); EasyLoading.show(status: S.of(context).zhengzaijiazai);
Future.delayed(Duration(seconds:2), () { Future.delayed(Duration(seconds:2), () {
if (value !=null && value.isSuccess) { if (value !=null && value.isSuccess) {
saveUserJson(value.data); saveUserJson(value.data.authInfo.toJson());
eventBus.fire(EventType(3)); eventBus.fire(EventType(3));
Navigator.of(context).pushNamedAndRemoveUntil( Navigator.of(context).pushNamedAndRemoveUntil(
'/router/main_page', '/router/main_page',
(route) => false, (route) => false,arguments:{"invite":invite,"couponList":value.data.couponList});
);
EasyLoading.dismiss(); EasyLoading.dismiss();
} else { } else {
SmartDialog.showToast("${value.msg}", alignment: Alignment.center); SmartDialog.showToast("${value?.msg ??""}", alignment: Alignment.center);
} }
}); });
} }
@ -682,7 +714,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
Container( Container(
height: 40.h, height: 40.h,
width: MediaQuery.of(context).size.width - 80.h, width: MediaQuery.of(context).size.width - 80.h,
margin: EdgeInsets.only(top: 12.h), // margin: EdgeInsets.only(top: 12.h),
child: TextField( child: TextField(
style: TextStyle( style: TextStyle(
height: 1.h, height: 1.h,
@ -726,7 +758,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
color: statusPhoneLineColor, color: statusPhoneLineColor,
), ),
SizedBox( SizedBox(
height: 35.h, height: 25.h,
child: Visibility( child: Visibility(
visible: statusPhoneVisible, visible: statusPhoneVisible,
child: Text( child: Text(
@ -748,7 +780,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
), ),
Container( Container(
height: 40.h, height: 40.h,
margin: EdgeInsets.only(top: 12.h), // margin: EdgeInsets.only(top: 12.h),
width: MediaQuery.of(context).size.width - 80.h, width: MediaQuery.of(context).size.width - 80.h,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
@ -850,6 +882,112 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
), ),
), ),
), ),
SizedBox(
height:25.h,
child: Visibility(
visible: statusPhoneVisible,
child: Text(
S.of(context).phone_error,
style: TextStyle(
color: Color(0xFFF72626),
fontSize: 12.sp,
),
),
),
),
GestureDetector(
onTap: (){
setState(() {
invitationCode = false;
});
},
child:
invitationCode ?
Container(child:
Column(children: [
Text(
S.of(context).woyouyaoqingma,
style: TextStyle(
fontSize: 12.sp,
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
Container(
width: 56.w,
height: 0.5,
color: Colors.black,
),
],),):Container(child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
S.of(context).input_invite_code_hide,
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.bold,
color: Colors.black,
),
),
Container(
height: 40.h,
width: MediaQuery.of(context).size.width - 80.h,
child: TextField(
style: TextStyle(
height: 1.h,
fontSize: 16.sp,
color: statusInviteTextColor,
),
onChanged: (value) {
if (value != null && value.isNotEmpty) {
if (isPhone(value)) {
invitationCodeStatus = 1;
} else {
invitationCodeStatus = 2;
}
} else {
invitationCodeStatus = 0;
}
setState(() {});
},
controller: _controllerInviteCode,
keyboardType: TextInputType.phone,
decoration: InputDecoration(
errorBorder: InputBorder.none,
focusedBorder: InputBorder.none,
enabledBorder: InputBorder.none,
hintText: "",
// contentPadding: EdgeInsets.only(top: 12, bottom: 12, left: 12),
hintStyle: TextStyle(
fontSize: 10.sp,
color: Color(0xFFA29E9E),
),
),
textInputAction: TextInputAction.next,
inputFormatters: [LengthLimitingTextInputFormatter(11)],
cursorColor: Colors.grey,
maxLines: 1,
),
),
Container(
height: 1.h,
width: MediaQuery.of(context).size.width - 80.h,
color: statusInviteLineColor,
margin: EdgeInsets.only(bottom: 10.h),
),
Visibility(
visible: statusInviteVisible,
child: Text(
S.of(context).invite_code_error,
style: TextStyle(
color: Color(0xFFF72626),
fontSize: 12.sp,
),
),
),
],
),),
),
Expanded( Expanded(
flex: 1, flex: 1,
child: Container( child: Container(

2
lib/main.dart

@ -318,7 +318,7 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
'/router/guide_Page': (context, {arguments}) => GuidePage(), '/router/guide_Page': (context, {arguments}) => GuidePage(),
'/router/about_page': (context, {arguments}) => AboutPage(), '/router/about_page': (context, {arguments}) => AboutPage(),
'/router/qr_share': (context, {arguments}) => QrSharePage(), '/router/qr_share': (context, {arguments}) => QrSharePage(),
'/router/main_page': (context, {arguments}) => MainPage(), '/router/main_page': (context, {arguments}) => MainPage(arguments: arguments),
'/router/test_page': (context, {arguments}) => TestPage(), '/router/test_page': (context, {arguments}) => TestPage(),
'/router/communityFollow': (context, {arguments}) => CommunityFollow(), '/router/communityFollow': (context, {arguments}) => CommunityFollow(),
'/router/releasePage': (context, {arguments}) => ReleasePage(), '/router/releasePage': (context, {arguments}) => ReleasePage(),

16
lib/main_page.dart

@ -10,6 +10,7 @@ import 'package:huixiang/home/home_page.dart';
import 'package:huixiang/main.dart'; import 'package:huixiang/main.dart';
import 'package:huixiang/mine/mine_page.dart'; import 'package:huixiang/mine/mine_page.dart';
import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/login_info.dart';
import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/retrofit/data/user_info.dart';
import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/union/union_page.dart'; import 'package:huixiang/union/union_page.dart';
@ -23,6 +24,10 @@ import 'package:shared_preferences/shared_preferences.dart';
import 'package:tpns_flutter_plugin/tpns_flutter_plugin.dart'; import 'package:tpns_flutter_plugin/tpns_flutter_plugin.dart';
class MainPage extends StatefulWidget { class MainPage extends StatefulWidget {
final Map<String, dynamic> arguments;
MainPage({this.arguments});
@override @override
State<StatefulWidget> createState() { State<StatefulWidget> createState() {
return _MainPage(); return _MainPage();
@ -76,13 +81,21 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
pushRoute(); pushRoute();
String invite = "";
var couponList;
if(widget.arguments != null && (widget.arguments["invite"]??"") != ""
&& widget.arguments["couponList"] != null ){
invite = widget.arguments["invite"];
couponList = widget.arguments["couponList"];
}
_widgetOptions = <Widget>[ _widgetOptions = <Widget>[
// BrandPage(), // BrandPage(),
HomePage((index) { HomePage((index) {
setState(() { setState(() {
pageController.jumpToPage(index); pageController.jumpToPage(index);
}); });
}), },invite:invite,couponList:couponList),
// MainHomePage(), // MainHomePage(),
UnionPage(), UnionPage(),
CommunityPage(), CommunityPage(),
@ -357,6 +370,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
); );
} }
// Widget bottomNavigationBigItem(text, index) { // Widget bottomNavigationBigItem(text, index) {
// var isSelected = index == clickIndex; // var isSelected = index == clickIndex;
// return Expanded( // return Expanded(

6
lib/mine/coupons_page.dart

@ -180,15 +180,13 @@ class _CouponsPage extends State<CouponsPage> {
"coupon": coupons[position].toJson(), "coupon": coupons[position].toJson(),
}); });
} else { } else {
showStoreSelector( showStoreSelector(coupons[position].storeList);
coupons[position].storeList);
} }
} }
}, },
() { () {
setState(() { setState(() {
coupons[position].isEx = coupons[position].isEx = !coupons[position].isEx;
!coupons[position].isEx;
}); });
}, },
type: 0, type: 0,

2
lib/mine/mine_vip/legal_right_details.dart

@ -496,7 +496,7 @@ class _LegalRightDetails extends State<LegalRightDetails> {
], ],
), ),
), ),
if (!vipBenefitList.actived && !vipBenefitList.have) if (!vipBenefitList.actived && !vipBenefitList.have || vipBenefitList.actived && !vipBenefitList.have)
Container( Container(
decoration: new BoxDecoration( decoration: new BoxDecoration(
color: Color(0xFFA29E9E), color: Color(0xFFA29E9E),

5
lib/mine/mine_vip/mine_vip_core.dart

@ -643,7 +643,8 @@ class _MineVipCore extends State<MineVipCore> {
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
children: [ children: [
MImage( MImage(
vipBenefitList?.icon ?? "", (vipBenefitList.actived || (vipBenefitList.actived && vipBenefitList.have) ||(vipBenefitList.actived && !vipBenefitList.have))?
(vipBenefitList?.icon ?? ""):(vipBenefitList?.iconGrey ?? ""),
width: 36, width: 36,
height: 36, height: 36,
// fit: BoxFit.cover, // fit: BoxFit.cover,
@ -678,7 +679,7 @@ class _MineVipCore extends State<MineVipCore> {
], ],
), ),
), ),
if (!vipBenefitList.actived && !vipBenefitList.have) if (!vipBenefitList.actived && !vipBenefitList.have || vipBenefitList.actived && !vipBenefitList.have)
Container( Container(
decoration: new BoxDecoration( decoration: new BoxDecoration(
color: Color(0xFFA29E9E), color: Color(0xFFA29E9E),

59
lib/qr/qr_share.dart

@ -79,7 +79,7 @@ class _QrSharePage extends State<QrSharePage> {
children: [ children: [
Positioned( Positioned(
child: Image.asset( child: Image.asset(
"assets/image/qr_share_bg.png", "assets/image/qr_share_bg_yq.png",
fit: BoxFit.fill, fit: BoxFit.fill,
), ),
top: 0, top: 0,
@ -111,40 +111,55 @@ class _QrSharePage extends State<QrSharePage> {
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
shareTypeTitle(S.of(context).fangshiyi), shareTypeTitle(S.of(context).wodeyaoqingma),
Container( Container(
margin: EdgeInsets.only(left: 16.w, right: 24.w), margin: EdgeInsets.only(left: 16.w, right: 24.w),
child: Text( child: Text(
S.of(context).baocunsaoma, // S.of(context).baocunsaoma,
phone,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Color(0xFF2E3552), color: Color(0xFF2E3552),
fontSize: 16.sp, fontSize: 40.sp,
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.semi_bold,
), ),
), ),
), ),
// Container(
// width: 152.w,
// height: 152.w,
// decoration: BoxDecoration(
// border: Border.all(
// color: Color(0xFF2E3552),
// width: 1,
// ),
// ),
// child: QrImage(
// data: "http://mp.hx.lotus-wallet.com/pages/invite/index?mobile=${phone ?? ""}",
// version: QrVersions.auto,
// size: 200.w,
// gapless: true,
// ),
// ),
shareTypeTitle(S.of(context).haoyoujiangliguize),
Container( Container(
width: 152.w, margin: EdgeInsets.only(left: 16.w, right: 24.w),
height: 152.w, child: Text(
decoration: BoxDecoration( // S.of(context).fenxiangyaoqing,
border: Border.all( S.of(context).fenxiangyaoqingma,
textAlign: TextAlign.center,
style: TextStyle(
color: Color(0xFF2E3552), color: Color(0xFF2E3552),
width: 1, fontSize: 16.sp,
fontWeight: MyFontWeight.regular,
), ),
), ),
child: QrImage(
data: "http://mp.hx.lotus-wallet.com/pages/invite/index?mobile=${phone ?? ""}",
version: QrVersions.auto,
size: 200.w,
gapless: true,
),
), ),
shareTypeTitle(S.of(context).fangshier),
Container( Container(
margin: EdgeInsets.only(left: 16.w, right: 24.w), margin: EdgeInsets.only(left: 16.w, right: 24.w),
child: Text( child: Text(
S.of(context).fenxiangyaoqing, // S.of(context).fenxiangyaoqing,
S.of(context).beiyaoqingdejiangli,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Color(0xFF2E3552), color: Color(0xFF2E3552),
@ -174,13 +189,13 @@ class _QrSharePage extends State<QrSharePage> {
Widget shareTypeTitle(typeText) { Widget shareTypeTitle(typeText) {
return Container( return Container(
width: 90.w, width: 140.w,
height: 30.h, height: 30.h,
child: Text( child: Text(
typeText, typeText,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.regular,
fontSize: 18.sp, fontSize: 16.sp,
color: Color(0xFF2E3552), color: Color(0xFF2E3552),
), ),
), ),
@ -199,7 +214,7 @@ class _QrSharePage extends State<QrSharePage> {
double height; double height;
buildImageInfo() async { buildImageInfo() async {
image = Image.asset("assets/image/qr_share_bg.png"); image = Image.asset("assets/image/qr_share_bg_yq.png");
image.image image.image
.resolve(ImageConfiguration()) .resolve(ImageConfiguration())
.addListener(ImageStreamListener((ImageInfo info, bool _) { .addListener(ImageStreamListener((ImageInfo info, bool _) {

78
lib/qr/qr_share_image.dart

@ -39,7 +39,7 @@ class _QrShareImagePage extends State<QrShareImagePage> {
child: Column( child: Column(
children: [ children: [
Image.asset( Image.asset(
"assets/image/share_image_bg.png", "assets/image/share_image_bg_yq.png",
height: (MediaQuery.of(context).size.width * 0.8) * 0.47, height: (MediaQuery.of(context).size.width * 0.8) * 0.47,
width: (MediaQuery.of(context).size.width * 0.8), width: (MediaQuery.of(context).size.width * 0.8),
), ),
@ -56,10 +56,11 @@ class _QrShareImagePage extends State<QrShareImagePage> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
width: 206.w, width:90.w,
height: 30.h, height: 30.h,
child: Text( child: Text(
S.of(context).yaoqingrenshoujihao_("${widget.mobile.substring(0, 3)}****${widget.mobile.substring(7, 11)}"), // S.of(context).yaoqingrenshoujihao_("${widget.mobile.substring(0, 3)}****${widget.mobile.substring(7, 11)}"),
S.of(context).wodeyaoqingma,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 12.sp, fontSize: 12.sp,
@ -76,27 +77,62 @@ class _QrShareImagePage extends State<QrShareImagePage> {
), ),
), ),
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 68.w), margin: EdgeInsets.only(left: 16.w, right: 24.w),
child: Text(
// S.of(context).saomashibieguanzhugongzonghao,
widget.mobile,
textAlign: TextAlign.center,
style: TextStyle(
color: Color(0xFF2E3552),
fontSize:30.sp,
fontWeight: MyFontWeight.semi_bold,
),
),
),
// Container(
// margin: EdgeInsets.symmetric(horizontal: 68.w),
// decoration: BoxDecoration(
// border: Border.all(
// color: Color(0xFF2E3552),
// width: 1,
// ),
// ),
// child: AspectRatio(
// aspectRatio: 1,
// child: QrImage(
// data: "http://mp.hx.lotus-wallet.com/pages/invite/index?mobile=${widget.mobile ?? ""}",
// version: QrVersions.auto,
// size: 200.w,
// gapless: true,
// ),
// ),
// ),
Container(
width:140.w,
height: 30.h,
child: Text(
// S.of(context).yaoqingrenshoujihao_("${widget.mobile.substring(0, 3)}****${widget.mobile.substring(7, 11)}"),
S.of(context).haoyoujiangliguize,
style: TextStyle(
fontWeight: MyFontWeight.semi_bold,
fontSize: 12.sp,
color: Color(0xFF2E3552),
),
),
alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFFFFC93B),
border: Border.all( border: Border.all(
color: Color(0xFF2E3552), color: Color(0xFF2E3552),
width: 1, width: 1,
), ),
), ),
child: AspectRatio(
aspectRatio: 1,
child: QrImage(
data: "http://mp.hx.lotus-wallet.com/pages/invite/index?mobile=${widget.mobile ?? ""}",
version: QrVersions.auto,
size: 200.w,
gapless: true,
),
),
), ),
Container( Container(
margin: EdgeInsets.only(left: 16.w, right: 24.w), margin: EdgeInsets.only(left: 16.w, right: 24.w),
child: Text( child: Text(
S.of(context).saomashibieguanzhugongzonghao, // S.of(context).saomashibieguanzhugongzonghao,
S.of(context).beiyaoqingdejiangli,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Color(0xFF2E3552), color: Color(0xFF2E3552),
@ -163,7 +199,7 @@ class _QrShareImagePage extends State<QrShareImagePage> {
RenderRepaintBoundary boundary = buildContext.findRenderObject(); RenderRepaintBoundary boundary = buildContext.findRenderObject();
ui.Image image = await boundary.toImage(pixelRatio: 3); ui.Image image = await boundary.toImage(pixelRatio: 3);
ByteData byteData = ByteData byteData =
await image.toByteData(format: ui.ImageByteFormat.png); await image.toByteData(format: ui.ImageByteFormat.png);
String filePath = ""; String filePath = "";
if (Platform.isAndroid) { if (Platform.isAndroid) {
@ -198,12 +234,12 @@ class _QrShareImagePage extends State<QrShareImagePage> {
); );
SharesdkPlugin.share(ShareSDKPlatforms.wechatSession, params, SharesdkPlugin.share(ShareSDKPlatforms.wechatSession, params,
(state, userData, contentEntity, error) { (state, userData, contentEntity, error) {
print("share state !$state"); print("share state !$state");
print("share userData !$userData"); print("share userData !$userData");
print("share contentEntity !$contentEntity"); print("share contentEntity !$contentEntity");
print("share error !$error"); print("share error !$error");
}); });
} }
} }
} }

371
lib/retrofit/data/login_info.dart

@ -0,0 +1,371 @@
/// authInfo : {"token":"eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX3R5cGUiOiJQTEFURk9STV9BUFAiLCJuYW1lIjoi5pav5Z-65LuUIiwidG9rZW5fdHlwZSI6InRva2VuIiwidXNlcmlkIjoiMTQ2Mzc1MTMwMjYzNzk0NDgzMiIsImFjY291bnQiOiIxNTM5Mjk0OTA5NyIsImV4cCI6MTY0MTAwMzg4NSwibmJmIjoxNjM4NDExODg1fQ.3ioTF8ofxKeoIlT_KriPHjjpJVzB3orh6rNCYrN5auA","tokenType":"token","refreshToken":"eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ0b2tlbl90eXBlIjoicmVmcmVzaF90b2tlbiIsInVzZXJpZCI6IjE0NjM3NTEzMDI2Mzc5NDQ4MzIiLCJleHAiOjE2NDEwMDM4ODUsIm5iZiI6MTYzODQxMTg4NX0.kePPEJDAKhgGyJRzlo4OvZ_OWPYi4O6RFWsSc7cdmhU","name":"斯基仔","account":"15392949097","avatar":null,"workDescribe":null,"userId":"1463751302637944832","userType":"PLATFORM_APP","expire":"2592000","expiration":"2022-01-01 10:24:45","mobile":"15392949097"}
/// couponList : [{"id":"1463398002331746304","createTime":"2021-11-24 14:44:07","createUser":"1333246101196636160","updateTime":"2021-11-24 14:44:07","updateUser":"1333246101196636160","storeId":"0","couponName":"满10-2","bizType":1,"allProduct":true,"productSkuId":[],"fullAmount":"10.00","discountAmount":"2.00","fullNumber":1,"discountPercent":100,"sellPrice":"0.00","sellCount":0,"bizId":"","publishStartTime":"2021-11-24 12:00:00","publishEndTime":"2021-11-30 12:00:00","useStartTime":"2021-11-24 12:00:00","useEndTime":"2021-11-30 12:00:00","promotionId":"0","dateOrDay":false,"startAfterDays":0,"daysValidate":0,"centreDisplay":true,"tenantCode":"1175","isDelete":0,"storeName":"海峡姐妹奶茶店","number":1}]
class LoginInfo {
LoginInfo({
AuthInfo authInfo,
List<CouponList> couponList,}){
_authInfo = authInfo;
_couponList = couponList;
}
LoginInfo.fromJson(dynamic json) {
_authInfo = json['authInfo'] != null ? AuthInfo.fromJson(json['authInfo']) : null;
if (json['couponList'] != null) {
_couponList = [];
json['couponList'].forEach((v) {
_couponList.add(CouponList.fromJson(v));
});
}
}
AuthInfo _authInfo;
List<CouponList> _couponList;
AuthInfo get authInfo => _authInfo;
List<CouponList> get couponList => _couponList;
Map<String, dynamic> toJson() {
final map = <String, dynamic>{};
if (_authInfo != null) {
map['authInfo'] = _authInfo.toJson();
}
if (_couponList != null) {
map['couponList'] = _couponList.map((v) => v.toJson()).toList();
}
return map;
}
}
/// id : "1463398002331746304"
/// createTime : "2021-11-24 14:44:07"
/// createUser : "1333246101196636160"
/// updateTime : "2021-11-24 14:44:07"
/// updateUser : "1333246101196636160"
/// storeId : "0"
/// couponName : "满10-2"
/// bizType : 1
/// allProduct : true
/// productSkuId : []
/// fullAmount : "10.00"
/// discountAmount : "2.00"
/// fullNumber : 1
/// discountPercent : 100
/// sellPrice : "0.00"
/// sellCount : 0
/// bizId : ""
/// publishStartTime : "2021-11-24 12:00:00"
/// publishEndTime : "2021-11-30 12:00:00"
/// useStartTime : "2021-11-24 12:00:00"
/// useEndTime : "2021-11-30 12:00:00"
/// promotionId : "0"
/// dateOrDay : false
/// startAfterDays : 0
/// daysValidate : 0
/// centreDisplay : true
/// tenantCode : "1175"
/// isDelete : 0
/// storeName : "海峡姐妹奶茶店"
/// number : 1
class CouponList {
CouponList({
String id,
String createTime,
String createUser,
String updateTime,
String updateUser,
String storeId,
String couponName,
int bizType,
bool allProduct,
// List<dynamic> productSkuId,
String fullAmount,
String discountAmount,
int fullNumber,
int discountPercent,
String sellPrice,
int sellCount,
String bizId,
String publishStartTime,
String publishEndTime,
String useStartTime,
String useEndTime,
String promotionId,
bool dateOrDay,
int startAfterDays,
int daysValidate,
bool centreDisplay,
String tenantCode,
int isDelete,
String storeName,
int number,}){
_id = id;
_createTime = createTime;
_createUser = createUser;
_updateTime = updateTime;
_updateUser = updateUser;
_storeId = storeId;
_couponName = couponName;
_bizType = bizType;
_allProduct = allProduct;
// _productSkuId = productSkuId;
_fullAmount = fullAmount;
_discountAmount = discountAmount;
_fullNumber = fullNumber;
_discountPercent = discountPercent;
_sellPrice = sellPrice;
_sellCount = sellCount;
_bizId = bizId;
_publishStartTime = publishStartTime;
_publishEndTime = publishEndTime;
_useStartTime = useStartTime;
_useEndTime = useEndTime;
_promotionId = promotionId;
_dateOrDay = dateOrDay;
_startAfterDays = startAfterDays;
_daysValidate = daysValidate;
_centreDisplay = centreDisplay;
_tenantCode = tenantCode;
_isDelete = isDelete;
_storeName = storeName;
_number = number;
}
CouponList.fromJson(dynamic json) {
_id = json['id'];
_createTime = json['createTime'];
_createUser = json['createUser'];
_updateTime = json['updateTime'];
_updateUser = json['updateUser'];
_storeId = json['storeId'];
_couponName = json['couponName'];
_bizType = json['bizType'];
_allProduct = json['allProduct'];
// if (json['productSkuId'] != null) {
// _productSkuId = [];
// json['productSkuId'].forEach((v) {
// _productSkuId.add(dynamic.fromJson(v));
// });
// }
_fullAmount = json['fullAmount'];
_discountAmount = json['discountAmount'];
_fullNumber = json['fullNumber'];
_discountPercent = json['discountPercent'];
_sellPrice = json['sellPrice'];
_sellCount = json['sellCount'];
_bizId = json['bizId'];
_publishStartTime = json['publishStartTime'];
_publishEndTime = json['publishEndTime'];
_useStartTime = json['useStartTime'];
_useEndTime = json['useEndTime'];
_promotionId = json['promotionId'];
_dateOrDay = json['dateOrDay'];
_startAfterDays = json['startAfterDays'];
_daysValidate = json['daysValidate'];
_centreDisplay = json['centreDisplay'];
_tenantCode = json['tenantCode'];
_isDelete = json['isDelete'];
_storeName = json['storeName'];
_number = json['number'];
}
String _id;
String _createTime;
String _createUser;
String _updateTime;
String _updateUser;
String _storeId;
String _couponName;
int _bizType;
bool _allProduct;
// List<dynamic> _productSkuId;
String _fullAmount;
String _discountAmount;
int _fullNumber;
int _discountPercent;
String _sellPrice;
int _sellCount;
String _bizId;
String _publishStartTime;
String _publishEndTime;
String _useStartTime;
String _useEndTime;
String _promotionId;
bool _dateOrDay;
int _startAfterDays;
int _daysValidate;
bool _centreDisplay;
String _tenantCode;
int _isDelete;
String _storeName;
int _number;
String get id => _id;
String get createTime => _createTime;
String get createUser => _createUser;
String get updateTime => _updateTime;
String get updateUser => _updateUser;
String get storeId => _storeId;
String get couponName => _couponName;
int get bizType => _bizType;
bool get allProduct => _allProduct;
// List<dynamic> get productSkuId => _productSkuId;
String get fullAmount => _fullAmount;
String get discountAmount => _discountAmount;
int get fullNumber => _fullNumber;
int get discountPercent => _discountPercent;
String get sellPrice => _sellPrice;
int get sellCount => _sellCount;
String get bizId => _bizId;
String get publishStartTime => _publishStartTime;
String get publishEndTime => _publishEndTime;
String get useStartTime => _useStartTime;
String get useEndTime => _useEndTime;
String get promotionId => _promotionId;
bool get dateOrDay => _dateOrDay;
int get startAfterDays => _startAfterDays;
int get daysValidate => _daysValidate;
bool get centreDisplay => _centreDisplay;
String get tenantCode => _tenantCode;
int get isDelete => _isDelete;
String get storeName => _storeName;
int get number => _number;
Map<String, dynamic> toJson() {
final map = <String, dynamic>{};
map['id'] = _id;
map['createTime'] = _createTime;
map['createUser'] = _createUser;
map['updateTime'] = _updateTime;
map['updateUser'] = _updateUser;
map['storeId'] = _storeId;
map['couponName'] = _couponName;
map['bizType'] = _bizType;
map['allProduct'] = _allProduct;
// if (_productSkuId != null) {
// map['productSkuId'] = _productSkuId.map((v) => v.toJson()).toList();
// }
map['fullAmount'] = _fullAmount;
map['discountAmount'] = _discountAmount;
map['fullNumber'] = _fullNumber;
map['discountPercent'] = _discountPercent;
map['sellPrice'] = _sellPrice;
map['sellCount'] = _sellCount;
map['bizId'] = _bizId;
map['publishStartTime'] = _publishStartTime;
map['publishEndTime'] = _publishEndTime;
map['useStartTime'] = _useStartTime;
map['useEndTime'] = _useEndTime;
map['promotionId'] = _promotionId;
map['dateOrDay'] = _dateOrDay;
map['startAfterDays'] = _startAfterDays;
map['daysValidate'] = _daysValidate;
map['centreDisplay'] = _centreDisplay;
map['tenantCode'] = _tenantCode;
map['isDelete'] = _isDelete;
map['storeName'] = _storeName;
map['number'] = _number;
return map;
}
}
/// token : "eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX3R5cGUiOiJQTEFURk9STV9BUFAiLCJuYW1lIjoi5pav5Z-65LuUIiwidG9rZW5fdHlwZSI6InRva2VuIiwidXNlcmlkIjoiMTQ2Mzc1MTMwMjYzNzk0NDgzMiIsImFjY291bnQiOiIxNTM5Mjk0OTA5NyIsImV4cCI6MTY0MTAwMzg4NSwibmJmIjoxNjM4NDExODg1fQ.3ioTF8ofxKeoIlT_KriPHjjpJVzB3orh6rNCYrN5auA"
/// tokenType : "token"
/// refreshToken : "eyJ0eXAiOiJKc29uV2ViVG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJ0b2tlbl90eXBlIjoicmVmcmVzaF90b2tlbiIsInVzZXJpZCI6IjE0NjM3NTEzMDI2Mzc5NDQ4MzIiLCJleHAiOjE2NDEwMDM4ODUsIm5iZiI6MTYzODQxMTg4NX0.kePPEJDAKhgGyJRzlo4OvZ_OWPYi4O6RFWsSc7cdmhU"
/// name : "斯基仔"
/// account : "15392949097"
/// avatar : null
/// workDescribe : null
/// userId : "1463751302637944832"
/// userType : "PLATFORM_APP"
/// expire : "2592000"
/// expiration : "2022-01-01 10:24:45"
/// mobile : "15392949097"
class AuthInfo {
AuthInfo({
String token,
String tokenType,
String refreshToken,
String name,
String account,
dynamic avatar,
dynamic workDescribe,
String userId,
String userType,
String expire,
String expiration,
String mobile,}){
_token = token;
_tokenType = tokenType;
_refreshToken = refreshToken;
_name = name;
_account = account;
_avatar = avatar;
_workDescribe = workDescribe;
_userId = userId;
_userType = userType;
_expire = expire;
_expiration = expiration;
_mobile = mobile;
}
AuthInfo.fromJson(dynamic json) {
_token = json['token'];
_tokenType = json['tokenType'];
_refreshToken = json['refreshToken'];
_name = json['name'];
_account = json['account'];
_avatar = json['avatar'];
_workDescribe = json['workDescribe'];
_userId = json['userId'];
_userType = json['userType'];
_expire = json['expire'];
_expiration = json['expiration'];
_mobile = json['mobile'];
}
String _token;
String _tokenType;
String _refreshToken;
String _name;
String _account;
dynamic _avatar;
dynamic _workDescribe;
String _userId;
String _userType;
String _expire;
String _expiration;
String _mobile;
String get token => _token;
String get tokenType => _tokenType;
String get refreshToken => _refreshToken;
String get name => _name;
String get account => _account;
dynamic get avatar => _avatar;
dynamic get workDescribe => _workDescribe;
String get userId => _userId;
String get userType => _userType;
String get expire => _expire;
String get expiration => _expiration;
String get mobile => _mobile;
Map<String, dynamic> toJson() {
final map = <String, dynamic>{};
map['token'] = _token;
map['tokenType'] = _tokenType;
map['refreshToken'] = _refreshToken;
map['name'] = _name;
map['account'] = _account;
map['avatar'] = _avatar;
map['workDescribe'] = _workDescribe;
map['userId'] = _userId;
map['userType'] = _userType;
map['expire'] = _expire;
map['expiration'] = _expiration;
map['mobile'] = _mobile;
return map;
}
}

3
lib/retrofit/retrofit_api.dart

@ -13,6 +13,7 @@ import 'package:huixiang/retrofit/data/article.dart';
import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/comunity_comment.dart'; import 'package:huixiang/retrofit/data/comunity_comment.dart';
import 'package:huixiang/retrofit/data/coupon.dart'; import 'package:huixiang/retrofit/data/coupon.dart';
import 'package:huixiang/retrofit/data/login_info.dart';
import 'package:huixiang/retrofit/data/order_info.dart'; import 'package:huixiang/retrofit/data/order_info.dart';
import 'package:huixiang/view_widget/login_tips_dialog.dart'; import 'package:huixiang/view_widget/login_tips_dialog.dart';
import 'package:retrofit/retrofit.dart'; import 'package:retrofit/retrofit.dart';
@ -170,7 +171,7 @@ abstract class ApiService {
/// ///
@POST("/auth/platform/memberLogin") @POST("/auth/platform/memberLogin")
Future<BaseData> memberLogin(@Body() Map<String, dynamic> param); Future<BaseData<LoginInfo>> memberLogin(@Body() Map<String, dynamic> param);
/// ///
@GET("/auth/sendVerify/{mobile}") @GET("/auth/sendVerify/{mobile}")

30
lib/retrofit/retrofit_api.g.dart

@ -68,8 +68,30 @@ class _ApiService implements ApiService {
return value; return value;
} }
@override // @override
Future<BaseData<dynamic>> memberLogin(param) async { // Future<BaseData<dynamic>> memberLogin(param) async {
// ArgumentError.checkNotNull(param, 'param');
// const _extra = <String, dynamic>{};
// final queryParameters = <String, dynamic>{};
// final _data = <String, dynamic>{};
// _data.addAll(param ?? <String, dynamic>{});
// final _result = await _dio.request<Map<String, dynamic>>(
// '/auth/platform/memberLogin',
// queryParameters: queryParameters,
// options: RequestOptions(
// method: 'POST',
// headers: <String, dynamic>{},
// extra: _extra,
// baseUrl: baseUrl),
// data: _data);
// final value = BaseData<dynamic>.fromJson(
// _result.data,
// (json) => json as dynamic,
// );
// return value;
// }
@override
Future<BaseData<LoginInfo>> memberLogin(param) async {
ArgumentError.checkNotNull(param, 'param'); ArgumentError.checkNotNull(param, 'param');
const _extra = <String, dynamic>{}; const _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{}; final queryParameters = <String, dynamic>{};
@ -84,9 +106,9 @@ class _ApiService implements ApiService {
extra: _extra, extra: _extra,
baseUrl: baseUrl), baseUrl: baseUrl),
data: _data); data: _data);
final value = BaseData<dynamic>.fromJson( final value = BaseData<LoginInfo>.fromJson(
_result.data, _result.data,
(json) => json as dynamic, (json) => LoginInfo.fromJson(json),
); );
return value; return value;
} }

120
lib/view_widget/invite_success_dialog.dart

@ -0,0 +1,120 @@
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/flutter_utils.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/round_button.dart';
class InviteSuccessDialog extends StatefulWidget {
final String invite;
final CouponList couponList;
InviteSuccessDialog(this.invite,this.couponList);
@override
State<StatefulWidget> createState() {
return _InviteSuccessDialog();
}
}
class _InviteSuccessDialog extends State<InviteSuccessDialog> {
@override
Widget build(BuildContext context) {
return SimpleDialog(
titlePadding: EdgeInsets.all(10),
backgroundColor: Colors.transparent,
elevation: 0,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(6),
),
children: [
Column(children: [
Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8.w),
),
padding: EdgeInsets.only(top:20.h,left: 12,right: 12),
margin: EdgeInsets.only(left:60.w,right:60.w),
child: Container(
padding: EdgeInsets.symmetric(vertical: 10.h),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
"assets/image/yq.png",
width: 61,
height: 65,
),
SizedBox(height: 9.h,),
Text(
"邀请完成",
style: TextStyle(
color: Color(0xFF353535),
fontSize: 16.sp,
fontWeight: MyFontWeight.medium,
),
),
SizedBox(height: 6.h),
RichText(
textAlign: TextAlign.center,
text: TextSpan(
text:
"通过${widget.invite.substring(0, 3)}****${widget.invite.substring(7, 11)}的邀请码完成邀请,获得",
style: TextStyle(
color: Color(0xFF1A1A1A),
fontSize: 14.sp,
fontWeight: MyFontWeight.regular,
height: 1.5.h),
children: [
TextSpan(
text:"${widget.couponList.storeName}${widget.couponList.couponName} * ${widget.couponList.bizType}",
style: TextStyle(color: Color(0xFF32A060),fontSize: 14.sp,fontWeight: MyFontWeight.regular),
),
]
),),
SizedBox(height: 13,),
GestureDetector(
onTap: (){
Navigator.of(context).pop();
},
child:RoundButton(
text: S.of(context).queren,
textColor: Colors.white,
width: 130.w,
height: 34.h,
padding: EdgeInsets.symmetric(vertical: 6.h),
fontSize: 16.sp,
fontWeight: MyFontWeight.semi_bold,
backgroup: Color(0xFF32A060),
radius: 4.w,
callback: () {
SmartDialog.dismiss();
},
),
),
SizedBox(height:20),
],
),
),
),
SizedBox(height:35),
GestureDetector(onTap: (){
setState(() {
Navigator.of(context).pop();
});
},child:Image.asset(
"assets/image/yq_qx.png",
width: 34,
height: 34,
),)
],),
],
);
}
}
Loading…
Cancel
Save