diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index ed352eed..a7f23b74 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -157,6 +157,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("点单"), "dianhua" : MessageLookupByLibrary.simpleMessage("电话"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录,享受更多精彩信息"), + "dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"), "dianzanxihuan_" : m3, "dingdan" : MessageLookupByLibrary.simpleMessage("订单"), @@ -332,6 +333,7 @@ class MessageLookup extends MessageLookupByLibrary { "phone_error" : MessageLookupByLibrary.simpleMessage("手机格式错误"), "pinglun" : MessageLookupByLibrary.simpleMessage("评论"), "pinglun_" : m21, + "pingtaiyue" : MessageLookupByLibrary.simpleMessage("平台余额"), "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"), "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"), "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"), diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index 9815a085..dd0f4d8f 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -157,6 +157,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("点单"), "dianhua" : MessageLookupByLibrary.simpleMessage("电话"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录,享受更多精彩信息"), + "dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"), "dianzanxihuan_" : m3, "dingdan" : MessageLookupByLibrary.simpleMessage("订单"), @@ -331,6 +332,7 @@ class MessageLookup extends MessageLookupByLibrary { "phone_error" : MessageLookupByLibrary.simpleMessage("手机格式错误"), "pinglun" : MessageLookupByLibrary.simpleMessage("评论"), "pinglun_" : m21, + "pingtaiyue" : MessageLookupByLibrary.simpleMessage("平台余额"), "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"), "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"), "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"), diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index d2af5651..e52402bf 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_CN.dart @@ -157,6 +157,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("点单"), "dianhua" : MessageLookupByLibrary.simpleMessage("电话"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录,享受更多精彩信息"), + "dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"), "dianzanxihuan_" : m3, "dingdan" : MessageLookupByLibrary.simpleMessage("订单"), @@ -331,6 +332,7 @@ class MessageLookup extends MessageLookupByLibrary { "phone_error" : MessageLookupByLibrary.simpleMessage("手机格式错误"), "pinglun" : MessageLookupByLibrary.simpleMessage("评论"), "pinglun_" : m21, + "pingtaiyue" : MessageLookupByLibrary.simpleMessage("平台余额"), "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"), "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"), "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"), diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart index bd058d3f..8ce7167d 100644 --- a/lib/generated/intl/messages_zh_Hant_CN.dart +++ b/lib/generated/intl/messages_zh_Hant_CN.dart @@ -157,6 +157,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("點單"), "dianhua" : MessageLookupByLibrary.simpleMessage("電話"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄,享受更多精彩信息"), + "dianpuyue" : MessageLookupByLibrary.simpleMessage("店鋪餘額"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"), "dianzanxihuan_" : m3, "dingdan" : MessageLookupByLibrary.simpleMessage("訂單"), @@ -331,6 +332,7 @@ class MessageLookup extends MessageLookupByLibrary { "phone_error" : MessageLookupByLibrary.simpleMessage("手機格式錯誤"), "pinglun" : MessageLookupByLibrary.simpleMessage("評論"), "pinglun_" : m21, + "pingtaiyue" : MessageLookupByLibrary.simpleMessage("平臺餘額"), "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"), "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介紹"), "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登錄既同意"), diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index c87f2c49..38dd31de 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/lib/generated/intl/messages_zh_TW.dart @@ -157,6 +157,7 @@ class MessageLookup extends MessageLookupByLibrary { "diandan" : MessageLookupByLibrary.simpleMessage("點單"), "dianhua" : MessageLookupByLibrary.simpleMessage("電話"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄,享受更多精彩信息"), + "dianpuyue" : MessageLookupByLibrary.simpleMessage("店鋪餘額"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"), "dianzanxihuan_" : m3, "dingdan" : MessageLookupByLibrary.simpleMessage("訂單"), @@ -331,6 +332,7 @@ class MessageLookup extends MessageLookupByLibrary { "phone_error" : MessageLookupByLibrary.simpleMessage("手機格式錯誤"), "pinglun" : MessageLookupByLibrary.simpleMessage("評論"), "pinglun_" : m21, + "pingtaiyue" : MessageLookupByLibrary.simpleMessage("平臺餘額"), "pinpai" : MessageLookupByLibrary.simpleMessage("品牌"), "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介紹"), "privacy_policy1" : MessageLookupByLibrary.simpleMessage("登錄既同意"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index d2dc0271..816acde3 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -4995,6 +4995,26 @@ class S { ); } + /// `平台余额` + String get pingtaiyue { + return Intl.message( + '平台余额', + name: 'pingtaiyue', + desc: '', + args: [], + ); + } + + /// `店铺余额` + String get dianpuyue { + return Intl.message( + '店铺余额', + name: 'dianpuyue', + desc: '', + args: [], + ); + } + /// `并使用本机号码登录` String get privacy_policy4 { return Intl.message( diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 3bc7d269..3c4ecc5b 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -517,6 +517,8 @@ "kabaokeshiyong": "卡包-可使用", "zhongchakan": "中查看", "diandan": "点单", + "pingtaiyue": "平台余额", + "dianpuyue": "店铺余额", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 87ffeba7..8155e927 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -519,6 +519,8 @@ "kabaokeshiyong": "卡包-可使用", "zhongchakan": "中查看", "diandan": "点单", + "pingtaiyue": "平台余额", + "dianpuyue": "店铺余额", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 87ffeba7..8155e927 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -519,6 +519,8 @@ "kabaokeshiyong": "卡包-可使用", "zhongchakan": "中查看", "diandan": "点单", + "pingtaiyue": "平台余额", + "dianpuyue": "店铺余额", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index de410f92..8fe0c561 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -512,6 +512,8 @@ "kabaokeshiyong": "卡包-可使用", "zhongchakan": "中查看", "diandan": "點單", + "pingtaiyue": "平臺餘額", + "dianpuyue": "店鋪餘額", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 4770e7a9..b60d82f0 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -511,6 +511,8 @@ "kabaokeshiyong": "卡包-可使用", "zhongchakan": "中查看", "diandan": "點單", + "pingtaiyue": "平臺餘額", + "dianpuyue": "店鋪餘額", diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index 623389d7..607b84df 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -343,7 +343,7 @@ class _OrderDetailPage extends State { Widget paySelector() { return Container( - margin: EdgeInsets.only(left: 16.w, right: 16.w, top: 14.h, bottom: 2.h), + // margin: EdgeInsets.only(left: 16.w, right: 16.w, top: 14.h, bottom: 2.h), padding: EdgeInsets.all(20), decoration: BoxDecoration( color: Colors.white, @@ -378,7 +378,7 @@ class _OrderDetailPage extends State { checkView(0), // Image.asset("assets/image/icon_alipay.png"), Text( - S.of(context).yue, + S.of(context).pingtaiyue, style: TextStyle( fontSize: 12.sp, color: Color(0xff353535), @@ -394,6 +394,24 @@ class _OrderDetailPage extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ checkView(1), + // Image.asset("assets/image/icon_alipay.png"), + Text( + S.of(context).dianpuyue, + style: TextStyle( + fontSize: 12.sp, + color: Color(0xff353535), + ), + ), + ], + ), + SizedBox( + height: 20.h, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + checkView(2), IconText( S.of(context).weixinzhifu, leftImage: "assets/image/icon_we_chat.png",