Browse Source

Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app

 Conflicts:
	assets/image/2x/icon_sign_success.png
	assets/image/3x/icon_sign_success.png
	lib/generated/l10n.dart
	lib/l10n/intl_en.arb
	lib/l10n/intl_zh_CN.arb
	lib/l10n/intl_zh_Hans_CN.arb
	lib/l10n/intl_zh_Hant_CN.arb
	lib/l10n/intl_zh_TW.arb
	lib/main.dart
master
fmk 3 years ago
parent
commit
e255fcc729
  1. BIN
      assets/image/2x/add.png
  2. BIN
      assets/image/2x/cancel.png
  3. BIN
      assets/image/2x/delete.png
  4. BIN
      assets/image/2x/icon_sign_success.png
  5. BIN
      assets/image/2x/landmark.png
  6. BIN
      assets/image/2x/map.png
  7. BIN
      assets/image/2x/order.png
  8. BIN
      assets/image/2x/pen.png
  9. BIN
      assets/image/2x/reduce.png
  10. BIN
      assets/image/2x/shadow.png
  11. BIN
      assets/image/2x/shopp.png
  12. BIN
      assets/image/3x/add.png
  13. BIN
      assets/image/3x/cancel2.png
  14. BIN
      assets/image/3x/delete.png
  15. BIN
      assets/image/3x/icon_sign_success.png
  16. BIN
      assets/image/3x/landmark.png
  17. BIN
      assets/image/3x/map.png
  18. BIN
      assets/image/3x/oredr.png
  19. BIN
      assets/image/3x/pen.png
  20. BIN
      assets/image/3x/reduce.png
  21. BIN
      assets/image/3x/shadow.png
  22. BIN
      assets/image/3x/shopp.png
  23. BIN
      assets/image/add.png
  24. BIN
      assets/image/cancel.png
  25. BIN
      assets/image/delete.png
  26. BIN
      assets/image/landmark.png
  27. BIN
      assets/image/map.png
  28. BIN
      assets/image/order.png
  29. BIN
      assets/image/order_btn1.png
  30. BIN
      assets/image/order_btn2.png
  31. BIN
      assets/image/order_btn3.png
  32. BIN
      assets/image/pen.png
  33. BIN
      assets/image/reduce.png
  34. BIN
      assets/image/shadow.png
  35. BIN
      assets/image/shopp.png
  36. 5
      lib/generated/intl/messages_en.dart
  37. 5
      lib/generated/intl/messages_zh_CN.dart
  38. 5
      lib/generated/intl/messages_zh_Hans_CN.dart
  39. 5
      lib/generated/intl/messages_zh_Hant_CN.dart
  40. 5
      lib/generated/intl/messages_zh_TW.dart
  41. 100
      lib/generated/l10n.dart
  42. 5
      lib/l10n/intl_en.arb
  43. 5
      lib/l10n/intl_zh_CN.arb
  44. 5
      lib/l10n/intl_zh_Hans_CN.arb
  45. 5
      lib/l10n/intl_zh_Hant_CN.arb
  46. 5
      lib/l10n/intl_zh_TW.arb
  47. 4
      lib/order/order_detail_page.dart
  48. 770
      lib/store/store_view/settlement.dart

BIN
assets/image/2x/add.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 482 B

BIN
assets/image/2x/cancel.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 657 B

BIN
assets/image/2x/delete.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 580 B

BIN
assets/image/2x/icon_sign_success.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
assets/image/2x/landmark.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
assets/image/2x/map.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

BIN
assets/image/2x/order.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
assets/image/2x/pen.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 548 B

BIN
assets/image/2x/reduce.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 616 B

BIN
assets/image/2x/shadow.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

BIN
assets/image/2x/shopp.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
assets/image/3x/add.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 878 B

BIN
assets/image/3x/cancel2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/image/3x/delete.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 964 B

BIN
assets/image/3x/icon_sign_success.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
assets/image/3x/landmark.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
assets/image/3x/map.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

BIN
assets/image/3x/oredr.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
assets/image/3x/pen.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 933 B

BIN
assets/image/3x/reduce.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/image/3x/shadow.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
assets/image/3x/shopp.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
assets/image/add.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 276 B

BIN
assets/image/cancel.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 342 B

BIN
assets/image/delete.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 B

BIN
assets/image/landmark.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 824 B

BIN
assets/image/map.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
assets/image/order.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
assets/image/order_btn1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
assets/image/order_btn2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
assets/image/order_btn3.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
assets/image/pen.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B

BIN
assets/image/reduce.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 314 B

BIN
assets/image/shadow.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
assets/image/shopp.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

5
lib/generated/intl/messages_en.dart

@ -148,6 +148,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"), "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
"dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"), "dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"),
"dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"), "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"),
"daodianziqu" : MessageLookupByLibrary.simpleMessage("到店自取"),
"daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到评论列表顶部"), "daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到评论列表顶部"),
"daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"), "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"),
"dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"), "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"),
@ -165,6 +166,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"), "dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"),
"dingdangenzong" : MessageLookupByLibrary.simpleMessage("订单跟踪"), "dingdangenzong" : MessageLookupByLibrary.simpleMessage("订单跟踪"),
"dingdanhao" : MessageLookupByLibrary.simpleMessage("订单号"), "dingdanhao" : MessageLookupByLibrary.simpleMessage("订单号"),
"dingdanjiesuan" : MessageLookupByLibrary.simpleMessage("订单结算"),
"dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"), "dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"),
"dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("订单消息"), "dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("订单消息"),
"dingdanyisongda" : MessageLookupByLibrary.simpleMessage("订单送达"), "dingdanyisongda" : MessageLookupByLibrary.simpleMessage("订单送达"),
@ -281,6 +283,7 @@ class MessageLookup extends MessageLookupByLibrary {
"keyongyue" : MessageLookupByLibrary.simpleMessage("可用余额"), "keyongyue" : MessageLookupByLibrary.simpleMessage("可用余额"),
"kongtiao" : MessageLookupByLibrary.simpleMessage("空调"), "kongtiao" : MessageLookupByLibrary.simpleMessage("空调"),
"kuaidi" : MessageLookupByLibrary.simpleMessage("快递"), "kuaidi" : MessageLookupByLibrary.simpleMessage("快递"),
"kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快递物流"),
"lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"),
"lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"),
"lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"),
@ -461,6 +464,7 @@ class MessageLookup extends MessageLookupByLibrary {
"tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"), "tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"),
"tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"),
"waimai" : MessageLookupByLibrary.simpleMessage("外卖"), "waimai" : MessageLookupByLibrary.simpleMessage("外卖"),
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m29, "wancheng_" : m29,
@ -570,6 +574,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yue" : MessageLookupByLibrary.simpleMessage("余额"), "yue" : MessageLookupByLibrary.simpleMessage("余额"),
"yue_" : m38, "yue_" : m38,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"), "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("预留电话"),
"yunfei" : MessageLookupByLibrary.simpleMessage("运费"), "yunfei" : MessageLookupByLibrary.simpleMessage("运费"),
"yuyan" : MessageLookupByLibrary.simpleMessage("语言"), "yuyan" : MessageLookupByLibrary.simpleMessage("语言"),
"zailaiyidan" : MessageLookupByLibrary.simpleMessage("再来一单"), "zailaiyidan" : MessageLookupByLibrary.simpleMessage("再来一单"),

5
lib/generated/intl/messages_zh_CN.dart

@ -148,6 +148,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"), "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
"dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"), "dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"),
"dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"), "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"),
"daodianziqu" : MessageLookupByLibrary.simpleMessage("到店自取"),
"daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到评论列表顶部"), "daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到评论列表顶部"),
"daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"), "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"),
"dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"), "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"),
@ -165,6 +166,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"), "dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"),
"dingdangenzong" : MessageLookupByLibrary.simpleMessage("订单跟踪"), "dingdangenzong" : MessageLookupByLibrary.simpleMessage("订单跟踪"),
"dingdanhao" : MessageLookupByLibrary.simpleMessage("订单号"), "dingdanhao" : MessageLookupByLibrary.simpleMessage("订单号"),
"dingdanjiesuan" : MessageLookupByLibrary.simpleMessage("订单结算"),
"dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"), "dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"),
"dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("订单消息"), "dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("订单消息"),
"dingdanyisongda" : MessageLookupByLibrary.simpleMessage("订单送达"), "dingdanyisongda" : MessageLookupByLibrary.simpleMessage("订单送达"),
@ -280,6 +282,7 @@ class MessageLookup extends MessageLookupByLibrary {
"keyongyue" : MessageLookupByLibrary.simpleMessage("可用余额"), "keyongyue" : MessageLookupByLibrary.simpleMessage("可用余额"),
"kongtiao" : MessageLookupByLibrary.simpleMessage("空调"), "kongtiao" : MessageLookupByLibrary.simpleMessage("空调"),
"kuaidi" : MessageLookupByLibrary.simpleMessage("快递"), "kuaidi" : MessageLookupByLibrary.simpleMessage("快递"),
"kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快递物流"),
"lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"),
"lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"),
"lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"),
@ -460,6 +463,7 @@ class MessageLookup extends MessageLookupByLibrary {
"tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"), "tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"),
"tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"),
"waimai" : MessageLookupByLibrary.simpleMessage("外卖"), "waimai" : MessageLookupByLibrary.simpleMessage("外卖"),
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m29, "wancheng_" : m29,
@ -569,6 +573,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yue" : MessageLookupByLibrary.simpleMessage("余额"), "yue" : MessageLookupByLibrary.simpleMessage("余额"),
"yue_" : m38, "yue_" : m38,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"), "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("预留电话"),
"yunfei" : MessageLookupByLibrary.simpleMessage("运费"), "yunfei" : MessageLookupByLibrary.simpleMessage("运费"),
"yuyan" : MessageLookupByLibrary.simpleMessage("语言"), "yuyan" : MessageLookupByLibrary.simpleMessage("语言"),
"zailaiyidan" : MessageLookupByLibrary.simpleMessage("再来一单"), "zailaiyidan" : MessageLookupByLibrary.simpleMessage("再来一单"),

5
lib/generated/intl/messages_zh_Hans_CN.dart

@ -148,6 +148,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"), "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
"dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"), "dangqianjifen" : MessageLookupByLibrary.simpleMessage("当前积分:"),
"dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"), "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("当前商品兑换核销码已核销完成"),
"daodianziqu" : MessageLookupByLibrary.simpleMessage("到店自取"),
"daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到评论列表顶部"), "daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到评论列表顶部"),
"daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"), "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等级"),
"dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"), "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家确认"),
@ -165,6 +166,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"), "dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("订单待支付"),
"dingdangenzong" : MessageLookupByLibrary.simpleMessage("订单跟踪"), "dingdangenzong" : MessageLookupByLibrary.simpleMessage("订单跟踪"),
"dingdanhao" : MessageLookupByLibrary.simpleMessage("订单号"), "dingdanhao" : MessageLookupByLibrary.simpleMessage("订单号"),
"dingdanjiesuan" : MessageLookupByLibrary.simpleMessage("订单结算"),
"dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"), "dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"),
"dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("订单消息"), "dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("订单消息"),
"dingdanyisongda" : MessageLookupByLibrary.simpleMessage("订单送达"), "dingdanyisongda" : MessageLookupByLibrary.simpleMessage("订单送达"),
@ -280,6 +282,7 @@ class MessageLookup extends MessageLookupByLibrary {
"keyongyue" : MessageLookupByLibrary.simpleMessage("可用余额"), "keyongyue" : MessageLookupByLibrary.simpleMessage("可用余额"),
"kongtiao" : MessageLookupByLibrary.simpleMessage("空调"), "kongtiao" : MessageLookupByLibrary.simpleMessage("空调"),
"kuaidi" : MessageLookupByLibrary.simpleMessage("快递"), "kuaidi" : MessageLookupByLibrary.simpleMessage("快递"),
"kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快递物流"),
"lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"),
"lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"),
"lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"),
@ -460,6 +463,7 @@ class MessageLookup extends MessageLookupByLibrary {
"tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"), "tuiguangma" : MessageLookupByLibrary.simpleMessage("推广码"),
"tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"),
"waimai" : MessageLookupByLibrary.simpleMessage("外卖"), "waimai" : MessageLookupByLibrary.simpleMessage("外卖"),
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m29, "wancheng_" : m29,
@ -569,6 +573,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yue" : MessageLookupByLibrary.simpleMessage("余额"), "yue" : MessageLookupByLibrary.simpleMessage("余额"),
"yue_" : m38, "yue_" : m38,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"), "yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("预留电话"),
"yunfei" : MessageLookupByLibrary.simpleMessage("运费"), "yunfei" : MessageLookupByLibrary.simpleMessage("运费"),
"yuyan" : MessageLookupByLibrary.simpleMessage("语言"), "yuyan" : MessageLookupByLibrary.simpleMessage("语言"),
"zailaiyidan" : MessageLookupByLibrary.simpleMessage("再来一单"), "zailaiyidan" : MessageLookupByLibrary.simpleMessage("再来一单"),

5
lib/generated/intl/messages_zh_Hant_CN.dart

@ -148,6 +148,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dangqiandengji" : MessageLookupByLibrary.simpleMessage("當前等級"), "dangqiandengji" : MessageLookupByLibrary.simpleMessage("當前等級"),
"dangqianjifen" : MessageLookupByLibrary.simpleMessage("當前積分:"), "dangqianjifen" : MessageLookupByLibrary.simpleMessage("當前積分:"),
"dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("當前商品兌換核銷碼已核銷完成 "), "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("當前商品兌換核銷碼已核銷完成 "),
"daodianziqu" : MessageLookupByLibrary.simpleMessage("到店自取"),
"daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到評論列表頂部"), "daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到評論列表頂部"),
"daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等級"), "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等級"),
"dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家確認"), "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家確認"),
@ -165,6 +166,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("訂單待支付"), "dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("訂單待支付"),
"dingdangenzong" : MessageLookupByLibrary.simpleMessage("訂單跟蹤"), "dingdangenzong" : MessageLookupByLibrary.simpleMessage("訂單跟蹤"),
"dingdanhao" : MessageLookupByLibrary.simpleMessage("訂單號"), "dingdanhao" : MessageLookupByLibrary.simpleMessage("訂單號"),
"dingdanjiesuan" : MessageLookupByLibrary.simpleMessage("訂單結算"),
"dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"), "dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"),
"dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("訂單消息"), "dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("訂單消息"),
"dingdanyisongda" : MessageLookupByLibrary.simpleMessage("訂單送達"), "dingdanyisongda" : MessageLookupByLibrary.simpleMessage("訂單送達"),
@ -280,6 +282,7 @@ class MessageLookup extends MessageLookupByLibrary {
"keyongyue" : MessageLookupByLibrary.simpleMessage("可用餘額"), "keyongyue" : MessageLookupByLibrary.simpleMessage("可用餘額"),
"kongtiao" : MessageLookupByLibrary.simpleMessage("空調"), "kongtiao" : MessageLookupByLibrary.simpleMessage("空調"),
"kuaidi" : MessageLookupByLibrary.simpleMessage("快遞"), "kuaidi" : MessageLookupByLibrary.simpleMessage("快遞"),
"kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快遞物流"),
"lianxishoujihao" : MessageLookupByLibrary.simpleMessage("聯繫手機號"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("聯繫手機號"),
"lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("連續簽到領取雙倍積分"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("連續簽到領取雙倍積分"),
"lijicanjia" : MessageLookupByLibrary.simpleMessage("立即參加"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即參加"),
@ -460,6 +463,7 @@ class MessageLookup extends MessageLookupByLibrary {
"tuiguangma" : MessageLookupByLibrary.simpleMessage("推廣碼"), "tuiguangma" : MessageLookupByLibrary.simpleMessage("推廣碼"),
"tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"),
"waimai" : MessageLookupByLibrary.simpleMessage("外賣"), "waimai" : MessageLookupByLibrary.simpleMessage("外賣"),
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外賣配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m29, "wancheng_" : m29,
@ -569,6 +573,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yue" : MessageLookupByLibrary.simpleMessage("餘額"), "yue" : MessageLookupByLibrary.simpleMessage("餘額"),
"yue_" : m38, "yue_" : m38,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"), "yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("預留電話"),
"yunfei" : MessageLookupByLibrary.simpleMessage("運費"), "yunfei" : MessageLookupByLibrary.simpleMessage("運費"),
"yuyan" : MessageLookupByLibrary.simpleMessage("語言"), "yuyan" : MessageLookupByLibrary.simpleMessage("語言"),
"zailaiyidan" : MessageLookupByLibrary.simpleMessage("再來一單"), "zailaiyidan" : MessageLookupByLibrary.simpleMessage("再來一單"),

5
lib/generated/intl/messages_zh_TW.dart

@ -148,6 +148,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dangqiandengji" : MessageLookupByLibrary.simpleMessage("當前等級"), "dangqiandengji" : MessageLookupByLibrary.simpleMessage("當前等級"),
"dangqianjifen" : MessageLookupByLibrary.simpleMessage("當前積分:"), "dangqianjifen" : MessageLookupByLibrary.simpleMessage("當前積分:"),
"dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("當前商品兌換核銷碼已核銷完成 "), "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("當前商品兌換核銷碼已核銷完成 "),
"daodianziqu" : MessageLookupByLibrary.simpleMessage("到店自取"),
"daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到評論列表頂部"), "daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("到評論列表頂部"),
"daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等級"), "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("到下一等級"),
"dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家確認"), "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("等待商家確認"),
@ -165,6 +166,7 @@ class MessageLookup extends MessageLookupByLibrary {
"dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("訂單待支付"), "dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("訂單待支付"),
"dingdangenzong" : MessageLookupByLibrary.simpleMessage("訂單跟蹤"), "dingdangenzong" : MessageLookupByLibrary.simpleMessage("訂單跟蹤"),
"dingdanhao" : MessageLookupByLibrary.simpleMessage("訂單號"), "dingdanhao" : MessageLookupByLibrary.simpleMessage("訂單號"),
"dingdanjiesuan" : MessageLookupByLibrary.simpleMessage("訂單結算"),
"dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"), "dingdanqueren" : MessageLookupByLibrary.simpleMessage("订单确认"),
"dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("訂單消息"), "dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("訂單消息"),
"dingdanyisongda" : MessageLookupByLibrary.simpleMessage("訂單送達"), "dingdanyisongda" : MessageLookupByLibrary.simpleMessage("訂單送達"),
@ -280,6 +282,7 @@ class MessageLookup extends MessageLookupByLibrary {
"keyongyue" : MessageLookupByLibrary.simpleMessage("可用餘額"), "keyongyue" : MessageLookupByLibrary.simpleMessage("可用餘額"),
"kongtiao" : MessageLookupByLibrary.simpleMessage("空調"), "kongtiao" : MessageLookupByLibrary.simpleMessage("空調"),
"kuaidi" : MessageLookupByLibrary.simpleMessage("快遞"), "kuaidi" : MessageLookupByLibrary.simpleMessage("快遞"),
"kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快遞物流"),
"lianxishoujihao" : MessageLookupByLibrary.simpleMessage("聯繫手機號"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("聯繫手機號"),
"lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("連續簽到領取雙倍積分"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("連續簽到領取雙倍積分"),
"lijicanjia" : MessageLookupByLibrary.simpleMessage("立即參加"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即參加"),
@ -460,6 +463,7 @@ class MessageLookup extends MessageLookupByLibrary {
"tuiguangma" : MessageLookupByLibrary.simpleMessage("推廣碼"), "tuiguangma" : MessageLookupByLibrary.simpleMessage("推廣碼"),
"tuikuan" : MessageLookupByLibrary.simpleMessage("退款"), "tuikuan" : MessageLookupByLibrary.simpleMessage("退款"),
"waimai" : MessageLookupByLibrary.simpleMessage("外賣"), "waimai" : MessageLookupByLibrary.simpleMessage("外賣"),
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外賣配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"), "waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m29, "wancheng_" : m29,
@ -569,6 +573,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yue" : MessageLookupByLibrary.simpleMessage("餘額"), "yue" : MessageLookupByLibrary.simpleMessage("餘額"),
"yue_" : m38, "yue_" : m38,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"), "yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("預留電話"),
"yunfei" : MessageLookupByLibrary.simpleMessage("運費"), "yunfei" : MessageLookupByLibrary.simpleMessage("運費"),
"yuyan" : MessageLookupByLibrary.simpleMessage("語言"), "yuyan" : MessageLookupByLibrary.simpleMessage("語言"),
"zailaiyidan" : MessageLookupByLibrary.simpleMessage("再來一單"), "zailaiyidan" : MessageLookupByLibrary.simpleMessage("再來一單"),

100
lib/generated/l10n.dart

@ -5035,6 +5035,106 @@ class S {
); );
} }
/// ``
String get dingdanjiesuan {
return Intl.message(
'订单结算',
name: 'dingdanjiesuan',
desc: '',
args: [],
);
}
/// ``
String get daodianziqu {
return Intl.message(
'到店自取',
name: 'daodianziqu',
desc: '',
args: [],
);
}
/// ``
String get waimaipeisong {
return Intl.message(
'外卖配送',
name: 'waimaipeisong',
desc: '',
args: [],
);
}
/// ``
String get kuaidiwuliu {
return Intl.message(
'快递物流',
name: 'kuaidiwuliu',
desc: '',
args: [],
);
}
/// ``
String get yuliudianhua {
return Intl.message(
'预留电话',
name: 'yuliudianhua',
desc: '',
args: [],
);
}
/// ``
String get dingdanjiesuan {
return Intl.message(
'订单结算',
name: 'dingdanjiesuan',
desc: '',
args: [],
);
}
/// ``
String get daodianziqu {
return Intl.message(
'到店自取',
name: 'daodianziqu',
desc: '',
args: [],
);
}
/// ``
String get waimaipeisong {
return Intl.message(
'外卖配送',
name: 'waimaipeisong',
desc: '',
args: [],
);
}
/// ``
String get kuaidiwuliu {
return Intl.message(
'快递物流',
name: 'kuaidiwuliu',
desc: '',
args: [],
);
}
/// ``
String get yuliudianhua {
return Intl.message(
'预留电话',
name: 'yuliudianhua',
desc: '',
args: [],
);
}
/// `使` /// `使`
String get privacy_policy4 { String get privacy_policy4 {
return Intl.message( return Intl.message(

5
lib/l10n/intl_en.arb

@ -521,6 +521,11 @@
"dianpuyue": "店铺余额", "dianpuyue": "店铺余额",
"tuiguangma": "推广码", "tuiguangma": "推广码",
"wodegongju": "我的工具", "wodegongju": "我的工具",
"dingdanjiesuan": "订单结算",
"daodianziqu": "到店自取",
"waimaipeisong": "外卖配送",
"kuaidiwuliu": "快递物流",
"yuliudianhua": "预留电话",

5
lib/l10n/intl_zh_CN.arb

@ -523,6 +523,11 @@
"dianpuyue": "店铺余额", "dianpuyue": "店铺余额",
"tuiguangma": "推广码", "tuiguangma": "推广码",
"wodegongju": "我的工具", "wodegongju": "我的工具",
"dingdanjiesuan": "订单结算",
"daodianziqu": "到店自取",
"waimaipeisong": "外卖配送",
"kuaidiwuliu": "快递物流",
"yuliudianhua": "预留电话",

5
lib/l10n/intl_zh_Hans_CN.arb

@ -523,6 +523,11 @@
"dianpuyue": "店铺余额", "dianpuyue": "店铺余额",
"tuiguangma": "推广码", "tuiguangma": "推广码",
"wodegongju": "我的工具", "wodegongju": "我的工具",
"dingdanjiesuan": "订单结算",
"daodianziqu": "到店自取",
"waimaipeisong": "外卖配送",
"kuaidiwuliu": "快递物流",
"yuliudianhua": "预留电话",

5
lib/l10n/intl_zh_Hant_CN.arb

@ -516,6 +516,11 @@
"dianpuyue": "店鋪餘額", "dianpuyue": "店鋪餘額",
"tuiguangma": "推廣碼", "tuiguangma": "推廣碼",
"wodegongju": "我的工具", "wodegongju": "我的工具",
"dingdanjiesuan": "訂單結算",
"daodianziqu": "到店自取",
"waimaipeisong": "外賣配送",
"kuaidiwuliu": "快遞物流",
"yuliudianhua": "預留電話",

5
lib/l10n/intl_zh_TW.arb

@ -515,6 +515,11 @@
"dianpuyue": "店鋪餘額", "dianpuyue": "店鋪餘額",
"tuiguangma": "推廣碼", "tuiguangma": "推廣碼",
"wodegongju": "我的工具", "wodegongju": "我的工具",
"dingdanjiesuan": "訂單結算",
"daodianziqu": "到店自取",
"waimaipeisong": "外賣配送",
"kuaidiwuliu": "快遞物流",
"yuliudianhua": "預留電話",

4
lib/order/order_detail_page.dart

@ -125,6 +125,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
/// ///
OrderStatus(orderStatus, isTakeOut, sendStatus, payStatus, OrderStatus(orderStatus, isTakeOut, sendStatus, payStatus,
refundStatus, title, center, orderInfo), refundStatus, title, center, orderInfo),
/// ///
OrderAddress( OrderAddress(
orderStatus, orderStatus,
@ -305,7 +306,8 @@ class _OrderDetailPage extends State<OrderDetailPage> {
), ),
), ),
Text( Text(
S.of(context) S
.of(context)
.yuan_(orderInfo != null ? orderInfo.finalPayPrice : "0"), .yuan_(orderInfo != null ? orderInfo.finalPayPrice : "0"),
style: TextStyle( style: TextStyle(
fontSize: 20.sp, fontSize: 20.sp,

770
lib/store/store_view/settlement.dart

@ -0,0 +1,770 @@
import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/order/order_view/order_commodity.dart';
import 'package:huixiang/order/order_view/order_info.dart';
import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/order_info.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/round_button.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class Settlement extends StatefulWidget {
final arguments;
final OrderInfo orderInfo;
Settlement({this.arguments,this.orderInfo});
@override
State<StatefulWidget> createState() {
return _Settlement();
}
}
class _Settlement extends State<Settlement> {
ApiService apiService;
int selectedBtn = 0;
@override
void initState() {
super.initState();
SharedPreferences.getInstance().then((value) {
apiService = ApiService(
Dio(),
context: context,
token: value.getString("token"),
);
queryDetails();
});
}
OrderInfo orderInfo;
int payStatus = 0;
int orderStatus = 0;
int sendStatus = 0;
int isTakeOut = 0;
int refundStatus = 0;
// String storeType = "NORMALSTORE"; //NORMALSTORE FASTSTORE RETAILSTORE
queryDetails() async {
BaseData<OrderInfo> baseData =
await apiService.orderDetail(widget.arguments["id"]);
if (baseData != null && baseData.isSuccess) {
orderInfo = baseData.data;
payStatus = orderInfo.payStatus;
orderStatus = orderInfo.orderStatus;
sendStatus = orderInfo.sendStatus;
isTakeOut = orderInfo.isTakeOut;
refundStatus = orderInfo.refundStatus;
// storeType = orderInfo.storeVO.posType.code;
print("order refund_status: $refundStatus");
print("order payStatus: $payStatus");
print("order orderStatus: $orderStatus");
print("order sendStatus: $sendStatus");
print("order isTakeOut: $isTakeOut");
if (mounted)
setState(() {
statusTitle();
});
}
}
@override
Widget build(BuildContext context) {
return Stack(
children: [
Positioned(
top: 0,
left: 0,
right: 0,
child: Container(
height: (orderStatus >= 4 ? 118.h : 118.h) +
MediaQuery.of(context).padding.top +
kToolbarHeight +
48.h,
color: Color(0xFF3A405A),
width: MediaQuery.of(context).size.width,
),
),
Positioned(
child: Scaffold(
backgroundColor: Colors.transparent,
appBar: MyAppBar(
background: Color(0xFF3A405A),
leadingColor: Colors.white,
title:S.of(context).dingdanjiesuan,
titleColor: Colors.white,
titleSize: 18.sp,
),
body: Container(
child: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Container(
child: Column(
children: [
distributionMode(),
SizedBox(height: 14,),
///
OrderCommodity(orderInfo),
// if (payStatus == 0) couponRemarks(),
/*(payStatus == 0) ? paySelector() : */
///
activityRemarks(),
payMethod(),
],
),
),
),
),
),
left: 0,
right: 0,
top: 0,
bottom: 0,
),
Positioned(
bottom: 0,
left: 0,
right: 0,
child:
Container(
height: 54.h,
color: Colors.white,
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Spacer(),
Text(
S.of(context).heji,
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Colors.black,
),
),
Text(
"¥19.00",
style: TextStyle(
fontSize: 20.sp,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF32A060),
),
),
SizedBox(width: 28,),
GestureDetector(
onTap: () {
},
child: RoundButton(
width: 103.w,
height: 54.h,
text: S.current.jiesuan,
textColor: Colors.white,
fontWeight: MyFontWeight.regular,
backgroup: Color(0xFF32A060),
fontSize: 16.sp,
padding: EdgeInsets.symmetric(vertical: 5.h),
),
),
],
),
),
)
],
);
}
String title = "";
String center = "";
statusTitle() {
if (isTakeOut == 0) {
if (payStatus == 0) {
title = S.of(context).dingdandaizhifu;
} else {
title = S.of(context).dingdanyizhifu;
switch (orderStatus) {
case 2:
title = S.of(context).shangjiazhengzaipeican;
break;
case 3:
title = S.of(context).dengdaiyonghuqucan;
center = S.of(context).qudanhao(orderInfo.dayFlowCode);
break;
case 4:
title = S.of(context).dingdanyiwancheng;
center = S.of(context).dingdanyiwancheng;
break;
case 5:
title = S.of(context).yiquxiao;
center = S.of(context).yiquxiao;
break;
}
}
} else if (isTakeOut == 1) {
if (payStatus == 0) {
title = S.of(context).dingdandaizhifu;
} else {
title = S.of(context).dengdaishangjiaqueren;
if (orderStatus < 4) {
switch (sendStatus) {
case 1:
title = S.of(context).zhengzaihujiaoqishou;
break;
case 2:
title = S.of(context).qishouyijiedanquhuozhong;
break;
case 3:
title = S.of(context).qishoupeisongzhongyujisongdashijian;
break;
case 4:
title = S.of(context).dingdanyisongda;
center = S.of(context).dingdanyisongda;
switch (orderStatus) {
case 4:
title = S.of(context).dingdanyiwancheng;
center = S.of(context).dingdanyiwancheng;
break;
}
break;
}
} else if (orderStatus == 4) {
title = S.of(context).dingdanyiwancheng;
center = S.of(context).dingdanyiwancheng;
}
}
} else if (isTakeOut == 2) {
if (payStatus == 0) {
title = S.of(context).dingdandaizhifu;
} else {
title = S.of(context).dingdandaifahuo;
if (orderStatus < 4) {
switch (sendStatus) {
case 1:
title = S.of(context).shangjiayifahuo;
break;
case 4:
title = S.of(context).huopinyisongda;
center = S.of(context).huopinyisongda;
break;
}
} else if (orderStatus == 4) {
title = S.of(context).dingdanyiwancheng;
center = S.of(context).dingdanyiwancheng;
}
}
}
if (orderStatus == 5) {
title = S.of(context).yiquxiao;
center = S.of(context).yiquxiao;
}
if (refundStatus == 1) {
title = S.of(context).dingdanyituikuan;
center = S.of(context).dingdanyituikuan;
}
}
Widget distributionMode() {
return Container(
decoration: BoxDecoration(
color: Color(0xFFFAFAFA),
boxShadow: [
BoxShadow(
color: Color(0x0D000000),
offset: Offset(0, 3),
blurRadius: 14,
spreadRadius: 0,
),
],
borderRadius: BorderRadius.circular(8),
),
height: 175.h,
margin: EdgeInsets.only(left: 16, right: 16, top: 15),
child: Stack(
children: [
Column(
children: [
Container(
decoration: BoxDecoration(
color: Color(0xFF9C9FAC),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(8),
topRight: Radius.circular(8),
),
),
height: 50.h,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
flex: 1,
child: Container(
height: 50.h,
decoration: BoxDecoration(
image: selectedBtn == 0
? DecorationImage(
image: AssetImage(
"assets/image/order_btn1.png"),
fit: BoxFit.fill,
)
: null,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(8))),
child: GestureDetector(
onTap: () {
setState(() {
selectedBtn = 0;
});
},
child: Stack(
alignment: Alignment.center,
children: [
Text(
S.of(context).daodianziqu,
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.semi_bold,
color: Colors.black,
),
),
],
),
)),
),
Expanded(
flex: 1,
child: GestureDetector(
onTap: () {
setState(() {
selectedBtn = 1;
});
},
child: Stack(
alignment: Alignment.center,
children: [
if (selectedBtn == 1)
Image.asset(
"assets/image/order_btn2.png",
height: 50.h,
fit: BoxFit.fill,
),
Text(
S.of(context).waimaipeisong,
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.regular,
color: Colors.black,
),
),
],
),
),
),
Expanded(
flex: 1,
child: Container(
height: 50.h,
decoration: BoxDecoration(
image: selectedBtn == 2
? DecorationImage(
image: AssetImage(
"assets/image/order_btn3.png"),
fit: BoxFit.fill,
)
: null,
borderRadius: BorderRadius.only(
topRight: Radius.circular(8))),
child: GestureDetector(
onTap: () {
setState(() {
selectedBtn = 2;
});
},
child: Stack(
alignment: Alignment.center,
children: [
Text(
S.of(context).kuaidiwuliu,
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.regular,
color: Colors.black,
),
),
],
),
)),
),
],
),
),
Container(
width: double.infinity,
padding: EdgeInsets.only(left: 16, right: 16, top: 15),
child: Column(
children: [
Row(
children: [
Expanded(child:Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"前进麦味·天然烘焙(凯德1818店)",
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF4C4C4C),
),
),
SizedBox(
height: 4,
),
Text(
"武昌区中国铁建凯德1818蓝调步行街中北路109附33门牌号05",
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
fontSize: 12.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xFF727272),
),
),
SizedBox(
height: 12,
),
],
),),
SizedBox(
width: 18,
),
Stack(
alignment: Alignment.center,
children: [
Column(
children: [
Image.asset(
"assets/image/map.png",
height: 61.h,
width:61.w,
),
],
),
Column(children: [
RoundButton(
width: 41.w,
height: 13,
text: "距离您11m",
textColor:Color(0xFF34A262),
fontWeight: MyFontWeight.semi_bold,
radius:7.5,
backgroup:Colors.white,
fontSize:7.sp,
),
Image.asset(
"assets/image/landmark.png",
height: 24.h,
width:24.w,
),
],),
],
)
],
),
Row(
children: [
Expanded(child: Text(
S.of(context).yuliudianhua,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.regular,
color: Color(0xFF4C4C4C),
),
)),
Text(
"12309090909",
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.medium,
color: Color(0xFF4C4C4C),
),
),
Image.asset(
"assets/image/pen.png",
height:14.h,
width:14.w,
),
],
)
],
),
),
],
),
// Image.asset(
// "assets/image/shadow.png",
// width: 24.w,
// height: 24.h,
// fit: BoxFit.contain,
// ),
],
),
);
}
Widget activityRemarks(){
return Container(
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Color(0x0D000000),
offset: Offset(0, 3),
blurRadius: 14,
spreadRadius: 0,
),
],
borderRadius: BorderRadius.circular(8),
),
height: 86.h,
margin: EdgeInsets.only(left: 16, right: 16, top: 15),
padding: EdgeInsets.only(left: 16, right: 16, top: 16),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(flex: 1,child:Text(
S.of(context).youhuiquan,
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 14.sp,
color: Color(0xFF353535),
),
)),
Text(
"满30减10",
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xFF32A060),
fontWeight: MyFontWeight.semi_bold
),
),
Icon(
Icons.keyboard_arrow_right,
size: 16,
),
],
),
SizedBox(height: 13,
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(flex: 1,child:Text(
S.of(context).beizhu,
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 14.sp,
color: Color(0xFF353535),
),
)),
Text(
"口味、面包硬度等",
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xFF353535),
fontWeight: MyFontWeight.semi_bold
),
),
Icon(
Icons.keyboard_arrow_right,
size: 16,
),
],
),
],
),
);
}
Widget payMethod(){
return Container(
width: double.infinity,
margin: EdgeInsets.only(
left: 16.w,
right: 16.w,
top: 12.h,
bottom: 4.h,
),
padding: EdgeInsets.only(
left: 16.w,
right: 16.w,
top: 20.h,
bottom: 20.h,
),
decoration: BoxDecoration(
boxShadow: [
BoxShadow(
color: Color(0x000000).withAlpha(25),
offset: Offset(0, 1),
blurRadius: 12.0,
),
],
color: Colors.white,
borderRadius: BorderRadius.circular(8),
),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.only(bottom: 16.h),
child: Text(
S.of(context).zhifufangshi,
style: TextStyle(
fontSize: 16.sp,
color: Colors.black,
fontWeight:MyFontWeight.regular,
),
),
),
GestureDetector(
onTap: () {
setState(() {
checkIndex =1;
});
},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
checkView(1),
Text(
S.of(context).pingtaiyue,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xff353535),
fontWeight: MyFontWeight.semi_bold
),
),
],
),
),
SizedBox(height: 10,),
GestureDetector(
onTap: () {
setState(() {
checkIndex =2;
});
},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
checkView(2),
Text(
S.of(context).dianpuyue,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xff353535),
fontWeight: MyFontWeight.semi_bold,
),
),
],
),
),
SizedBox(height: 10,),
GestureDetector(
onTap: () {
setState(() {
checkIndex = 3;
});
},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
checkView(3),
Spacer(),
Image.asset("assets/image/icon_we_chat.png"),
Padding(
padding: EdgeInsets.only(left: 8.w),
child: Text(
S.of(context).weixinzhifu,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xff353535),
fontWeight: MyFontWeight.semi_bold,
),
),
),
],
),
),
],
),
);
}
var checkIndex = 1;
Widget checkView(var index) {
return Container(
padding: EdgeInsets.only(right: 16.w),
alignment: Alignment.center,
child: Image.asset(
checkIndex != index
? "assets/image/icon_radio_unselected.png"
: "assets/image/icon_radio_selected.png",
width: 15.w,
height: 15.h,
),
);
}
String payChannel() {
switch (widget.orderInfo.payChannel) {
case 0:
return "现金支付";
case 1:
return "微信支付";
case 2:
return "支付宝支付";
case 3:
return "商户会员余额支付";
case 4:
return "平台会员余额支付";
case 5:
return "美团买单";
case 6:
return "饿了么支付";
case 7:
return "扫呗支付";
case 8:
return "微生活";
case 9:
return "银联支付";
}
return S.of(context).yue;
}
}
Loading…
Cancel
Save