diff --git a/assets/image/2x/dining_w.webp b/assets/image/2x/dining_w.webp new file mode 100644 index 00000000..7b10d441 Binary files /dev/null and b/assets/image/2x/dining_w.webp differ diff --git a/assets/image/3x/dining_w.webp b/assets/image/3x/dining_w.webp new file mode 100644 index 00000000..13b92d49 Binary files /dev/null and b/assets/image/3x/dining_w.webp differ diff --git a/assets/image/dining_w.webp b/assets/image/dining_w.webp new file mode 100644 index 00000000..040b7fb6 Binary files /dev/null and b/assets/image/dining_w.webp differ diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 47f6d6d2..30115b46 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -684,6 +684,7 @@ class MessageLookup extends MessageLookupByLibrary { "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"), "xuanji" : MessageLookupByLibrary.simpleMessage("选集"), "xuanzeshangpinlingqufangshi" : MessageLookupByLibrary.simpleMessage("请选择商品的领取方式"), + "xuanzetuijianmendian" : MessageLookupByLibrary.simpleMessage("选择推荐门店"), "xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("续费会员"), "xuexijiankang" : MessageLookupByLibrary.simpleMessage("学习健康"), "xufeihuixiangVIP" : MessageLookupByLibrary.simpleMessage("续费回乡VIP"), @@ -712,6 +713,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"), "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), + "yingwen" : MessageLookupByLibrary.simpleMessage("英文"), "yingyeshijian" : m37, "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"), diff --git a/lib/generated/intl/messages_en_US.dart b/lib/generated/intl/messages_en_US.dart index 5f7fea35..7bbb27d2 100644 --- a/lib/generated/intl/messages_en_US.dart +++ b/lib/generated/intl/messages_en_US.dart @@ -684,6 +684,7 @@ class MessageLookup extends MessageLookupByLibrary { "xuanguige" : MessageLookupByLibrary.simpleMessage("Select specs"), "xuanji" : MessageLookupByLibrary.simpleMessage("Selection"), "xuanzeshangpinlingqufangshi" : MessageLookupByLibrary.simpleMessage("Please select the picking method of goods"), + "xuanzetuijianmendian" : MessageLookupByLibrary.simpleMessage("select recommended store"), "xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("Renewal member"), "xuexijiankang" : MessageLookupByLibrary.simpleMessage("Learning Health"), "xufeihuixiangVIP" : MessageLookupByLibrary.simpleMessage("Renewal Home VIP"), @@ -712,6 +713,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye2" : MessageLookupByLibrary.simpleMessage("New Group Alliance Store Members Order Meals"), "yindaoye3" : MessageLookupByLibrary.simpleMessage("Member activity zone"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("Live a healthy and organic life"), + "yingwen" : MessageLookupByLibrary.simpleMessage("United States"), "yingyeshijian" : m37, "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("Silver card member"), "yinshi" : MessageLookupByLibrary.simpleMessage("diet"), diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index c6ed4607..a45c22b4 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -684,6 +684,7 @@ class MessageLookup extends MessageLookupByLibrary { "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"), "xuanji" : MessageLookupByLibrary.simpleMessage("选集"), "xuanzeshangpinlingqufangshi" : MessageLookupByLibrary.simpleMessage("请选择商品的领取方式"), + "xuanzetuijianmendian" : MessageLookupByLibrary.simpleMessage("选择推荐门店"), "xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("续费会员"), "xuexijiankang" : MessageLookupByLibrary.simpleMessage("学习健康"), "xufeihuixiangVIP" : MessageLookupByLibrary.simpleMessage("续费回乡VIP"), @@ -712,6 +713,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"), "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), + "yingwen" : MessageLookupByLibrary.simpleMessage("英文"), "yingyeshijian" : m37, "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"), diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index 39e563c8..335a315f 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_CN.dart @@ -684,6 +684,7 @@ class MessageLookup extends MessageLookupByLibrary { "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"), "xuanji" : MessageLookupByLibrary.simpleMessage("选集"), "xuanzeshangpinlingqufangshi" : MessageLookupByLibrary.simpleMessage("请选择商品的领取方式"), + "xuanzetuijianmendian" : MessageLookupByLibrary.simpleMessage("选择推荐门店"), "xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("续费会员"), "xuexijiankang" : MessageLookupByLibrary.simpleMessage("学习健康"), "xufeihuixiangVIP" : MessageLookupByLibrary.simpleMessage("续费回乡VIP"), @@ -712,6 +713,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"), "yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), + "yingwen" : MessageLookupByLibrary.simpleMessage("英文"), "yingyeshijian" : m37, "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("饮食"), diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart index 974a5f96..80a05409 100644 --- a/lib/generated/intl/messages_zh_Hant_CN.dart +++ b/lib/generated/intl/messages_zh_Hant_CN.dart @@ -678,6 +678,7 @@ class MessageLookup extends MessageLookupByLibrary { "xuanguige" : MessageLookupByLibrary.simpleMessage("選規格"), "xuanji" : MessageLookupByLibrary.simpleMessage("選集"), "xuanzeshangpinlingqufangshi" : MessageLookupByLibrary.simpleMessage("請選擇商品的領取方式"), + "xuanzetuijianmendian" : MessageLookupByLibrary.simpleMessage("選擇推薦門店"), "xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("續費會員"), "xuexijiankang" : MessageLookupByLibrary.simpleMessage("學習健康"), "xufeihuixiangVIP" : MessageLookupByLibrary.simpleMessage("續費回鄉VIP"), @@ -706,6 +707,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集團聯盟店會員點餐"), "yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"), + "yingwen" : MessageLookupByLibrary.simpleMessage("英文"), "yingyeshijian" : m37, "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("飲食"), diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart index dc3695e1..80763869 100644 --- a/lib/generated/intl/messages_zh_TW.dart +++ b/lib/generated/intl/messages_zh_TW.dart @@ -681,6 +681,7 @@ class MessageLookup extends MessageLookupByLibrary { "xuanguige" : MessageLookupByLibrary.simpleMessage("選規格"), "xuanji" : MessageLookupByLibrary.simpleMessage("選集"), "xuanzeshangpinlingqufangshi" : MessageLookupByLibrary.simpleMessage("請選擇商品的領取方式"), + "xuanzetuijianmendian" : MessageLookupByLibrary.simpleMessage("選擇推薦門店"), "xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("續費會員"), "xuexijiankang" : MessageLookupByLibrary.simpleMessage("學習健康"), "xufeihuixiangVIP" : MessageLookupByLibrary.simpleMessage("續費回鄉VIP"), @@ -709,6 +710,7 @@ class MessageLookup extends MessageLookupByLibrary { "yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集團聯盟店會員點餐"), "yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"), "yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"), + "yingwen" : MessageLookupByLibrary.simpleMessage("英文"), "yingyeshijian" : m37, "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"), "yinshi" : MessageLookupByLibrary.simpleMessage("飲食"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index de8a06e8..2e4c0f26 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -6955,6 +6955,26 @@ class S { ); } + /// `选择推荐门店` + String get xuanzetuijianmendian { + return Intl.message( + '选择推荐门店', + name: 'xuanzetuijianmendian', + desc: '', + args: [], + ); + } + + /// `英文` + String get yingwen { + return Intl.message( + '英文', + name: 'yingwen', + desc: '', + args: [], + ); + } + /// `并使用本机号码登录` String get privacy_policy4 { return Intl.message( diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 6e585276..0f40d16d 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -724,6 +724,7 @@ "mendianyue":"门店余额", "lvbizhifu":"绿币支付", "xuanzetuijianmendian":"选择推荐门店", + "yingwen":"英文", diff --git a/lib/l10n/intl_en_US.arb b/lib/l10n/intl_en_US.arb index b6ec2a8d..b8c06677 100644 --- a/lib/l10n/intl_en_US.arb +++ b/lib/l10n/intl_en_US.arb @@ -725,6 +725,7 @@ "mendianyue":"store balance", "lvbizhifu":"green payment", "xuanzetuijianmendian":"select recommended store", + "yingwen":"United States", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 6cd67e39..a90f096e 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -725,6 +725,7 @@ "mendianyue":"门店余额", "lvbizhifu":"绿币支付", "xuanzetuijianmendian":"选择推荐门店", + "yingwen":"英文", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index ceb0566b..26333f99 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -725,6 +725,7 @@ "mendianyue":"门店余额", "lvbizhifu":"绿币支付", "xuanzetuijianmendian":"选择推荐门店", + "yingwen":"英文", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index db538c46..0b89d1f3 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -716,6 +716,7 @@ "mendianyue":"門店餘額", "lvbizhifu":"綠幣支付", "xuanzetuijianmendian":"選擇推薦門店", + "yingwen":"英文", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 6436f013..575272d4 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -718,6 +718,7 @@ "mendianyue":"門店餘額", "lvbizhifu":"綠幣支付", "xuanzetuijianmendian":"選擇推薦門店", + "yingwen":"英文", diff --git a/lib/main.dart b/lib/main.dart index db02bc29..095a300d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -202,7 +202,7 @@ class MyApp extends StatelessWidget { } else if (locales[0].countryCode == "CN"){ locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'CH'); } else{ - locale = Locale.fromSubtags(languageCode: 'en', countryCode: 'CH'); + locale = Locale.fromSubtags(languageCode: 'en', countryCode: 'US'); } return appLocale ?? locale; }, diff --git a/lib/mine/recharge_page.dart b/lib/mine/recharge_page.dart index ba3eeb17..31b82e0e 100644 --- a/lib/mine/recharge_page.dart +++ b/lib/mine/recharge_page.dart @@ -734,7 +734,7 @@ class _RechargePage extends State { alignment: Alignment.center, margin: EdgeInsets.symmetric(vertical: 12), child: Text( - "选择推荐门店", + S.of(context).xuanzetuijianmendian, style: TextStyle( fontWeight: MyFontWeight.bold, fontSize: 15.sp, diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index 73f52e6a..4c658729 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -259,7 +259,7 @@ class _OrderDetailPage extends State { } statusTitle() { - if (isTakeOut == 0) { + if (isTakeOut == 0 || isTakeOut == 3 || isTakeOut == 4) { if (payStatus == 0 && orderStatus != -1) { title = S.of(context).dingdandaizhifu; } else { diff --git a/lib/order/order_view/order_address.dart b/lib/order/order_view/order_address.dart index 30303357..2fa6e570 100644 --- a/lib/order/order_view/order_address.dart +++ b/lib/order/order_view/order_address.dart @@ -77,7 +77,7 @@ class _OrderAddress extends State { Text( (widget.orderInfo != null && widget.orderInfo.addressExt != null) - ? ((widget.isTakeOut == 0 + ? ((widget.isTakeOut == 0 || widget.isTakeOut == 3 || widget.isTakeOut == 4 ? widget.orderInfo.storeName : widget.orderInfo.addressExt.recName) ?? "") diff --git a/lib/order/order_view/order_commodity.dart b/lib/order/order_view/order_commodity.dart index 5c079ddb..1fc95527 100644 --- a/lib/order/order_view/order_commodity.dart +++ b/lib/order/order_view/order_commodity.dart @@ -73,7 +73,7 @@ class _OrderCommodity extends State { } widgets.add(SizedBox(height: 20.h)); - if (widget.orderInfo.isTakeOut != 0) { + if (widget.orderInfo.isTakeOut != 0 && widget.orderInfo.isTakeOut != 3 && widget.orderInfo.isTakeOut != 4) { // 配送费 widgets.add( discountItem( diff --git a/lib/order/order_view/order_info.dart b/lib/order/order_view/order_info.dart index 77ee6780..753382c7 100644 --- a/lib/order/order_view/order_info.dart +++ b/lib/order/order_view/order_info.dart @@ -46,7 +46,7 @@ class _OrderInfoView extends State { orderInfoItem(S.of(context).xiadanshijian, widget.orderInfo != null ? widget.orderInfo.createTime : ""), orderInfoItem(S.of(context).peisongfangshi, widget.isTakeOut == 0 - ? S.of(context).ziqu :(widget.orderInfo != null && widget.orderInfo.logisticsName != "") ? widget.orderInfo.logisticsName : "美团配送"), + ? S.of(context).ziqu : widget.isTakeOut == 3 ? "打包":widget.isTakeOut == 4?"堂食":((widget.orderInfo != null && widget.orderInfo.logisticsName != "") ? widget.orderInfo.logisticsName : "美团配送")), // orderInfoItem(S.of(context).peisongfangshi,"美团配送"), if(widget?.orderInfo?.subcribeTime != null && widget?.orderInfo?.subcribeTime != "") orderInfoItem("预约时间", diff --git a/lib/order/order_view/order_status.dart b/lib/order/order_view/order_status.dart index 595d6b23..06961969 100644 --- a/lib/order/order_view/order_status.dart +++ b/lib/order/order_view/order_status.dart @@ -66,9 +66,11 @@ class _OrderStatus extends State { RoundButton( text: widget.isTakeOut == 0 ? S.of(context).ziqu - : widget.isTakeOut == 1 + : widget.isTakeOut == 4 ? "堂食" + :widget.isTakeOut == 3 ? "打包" + :(widget.isTakeOut == 1 ? S.of(context).waimai - : "物流", + : "物流"), width: 46.w * AppUtils.textScale(context), height: 20.h * AppUtils.textScale(context), textColor: Color(0xFF32A060), diff --git a/lib/retrofit/data/delivery_info.dart b/lib/retrofit/data/delivery_info.dart index c58156cb..1fc09716 100644 --- a/lib/retrofit/data/delivery_info.dart +++ b/lib/retrofit/data/delivery_info.dart @@ -7,8 +7,9 @@ class DeliveryInfo { bool dianwodaStatus; bool meituanRegStatus; bool meituanStatus; + bool dineInTakeStatus; - DeliveryInfo({this.dadaRegStatus, this.dadaSourceId, this.dadaStatus, this.dianwodaRegStatus, this.dianwodaStatus, this.meituanRegStatus, this.meituanStatus}); + DeliveryInfo({this.dadaRegStatus, this.dadaSourceId, this.dadaStatus, this.dianwodaRegStatus, this.dianwodaStatus, this.meituanRegStatus, this.meituanStatus,this.dineInTakeStatus}); factory DeliveryInfo.fromJson(Map json) => DeliveryInfo( dadaRegStatus: json['dadaRegStatus'] as bool, @@ -18,6 +19,8 @@ class DeliveryInfo { dianwodaStatus: json['dianwodaStatus'] as bool, meituanRegStatus: json['meituanRegStatus'] as bool, meituanStatus: json['meituanStatus'] as bool, + dineInTakeStatus: json['dineInTakeStatus'] as bool, + ); Map toJson() => { @@ -28,6 +31,7 @@ class DeliveryInfo { 'dianwodaStatus': this.dianwodaStatus, 'meituanRegStatus': this.meituanRegStatus, 'meituanStatus': this.meituanStatus, + 'dineInTakeStatus': this.dineInTakeStatus, }; } diff --git a/lib/setting/setting_page.dart b/lib/setting/setting_page.dart index f20988cf..3f513c9f 100644 --- a/lib/setting/setting_page.dart +++ b/lib/setting/setting_page.dart @@ -130,6 +130,14 @@ class _SettingPage extends State { isDefaultAction: true, isDestructiveAction: false, ), + CupertinoActionSheetAction( + child: Text('英文'), + onPressed: () { + changeLanguage("en"); + }, + isDefaultAction: true, + isDestructiveAction: false, + ), ], cancelButton: CupertinoActionSheetAction( onPressed: () { @@ -146,7 +154,7 @@ class _SettingPage extends State { S.of(context).yuyan, locale == "tw" ? S.of(context).fantizhongwen - : S.of(context).zhongwenjianti), + : (locale == "en" ?S.of(context).yingwen:S.of(context).zhongwenjianti)), ), GestureDetector( child: settingSingleItem(S.of(context).quanxian), @@ -260,10 +268,14 @@ class _SettingPage extends State { S.load(Locale.fromSubtags(languageCode: 'zh', countryCode: 'CN')); locale = "zh"; eventBus.fire(EventType(0)); - } else { + } else if(language == "tw"){ S.load(Locale.fromSubtags(languageCode: 'zh', countryCode: 'TW')); locale = "tw"; eventBus.fire(EventType(1)); + }else { + S.load(Locale.fromSubtags(languageCode: 'en', countryCode: 'US')); + locale = "en"; + eventBus.fire(EventType(2)); } SharedPreferences.getInstance().then((value) => { value.setString("language", language), diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart index 01098a8e..d001e45a 100644 --- a/lib/settlement/settlement.dart +++ b/lib/settlement/settlement.dart @@ -95,6 +95,7 @@ class _Settlement extends State { String subTime; int storesIndex = 0; String discountType; + int diningStatus = 4; @override void initState() { @@ -529,7 +530,7 @@ class _Settlement extends State { ((subscribeParam?.isEnableSubscribe ?? false) == true) ? true : false; //是否预约 - placeOrderFirst.isTakeOut = selectedBtn; + placeOrderFirst.isTakeOut = ((storeInfo?.deliveryInfo?.dineInTakeStatus ?? false) == true) ? diningStatus : selectedBtn; placeOrderFirst.notes = remakers + (reservationTime ?? "") + ((subscribeParam?.isEnableSubscribe ?? false) == true @@ -828,12 +829,15 @@ class _Settlement extends State { address, selectedAddress, pageType, - widget.arguments["distance"]), + widget.arguments["distance"],), SizedBox( height: 16, ), + if((storeInfo?.deliveryInfo?.dineInTakeStatus?? false) ==true && settleOrderInfo !=null) + takeStatus(), + /// 预留的手机号， 可修改 // EditPhoneWidget( // storeInfo, @@ -1000,6 +1004,141 @@ class _Settlement extends State { ); } + ///堂食/打包外带选择 + Widget takeStatus(){ + return Container( + decoration: BoxDecoration( + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Color(0x0D000000), + offset: Offset(0, 1), + blurRadius: 8, + spreadRadius: 0, + ), + ], + borderRadius: BorderRadius.circular(8), + ), + margin: EdgeInsets.only(left: 16.w, right: 16.w,top:6.h,bottom:6.h), + padding: EdgeInsets.symmetric(horizontal: 12.w,vertical:10.h), + child: + Row(children: [ + Expanded(child:GestureDetector( + onTap: (){ + setState((){ + diningStatus = 4; + }); + }, + child: Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(6)), + border: Border.all( + width: diningStatus == 4? 2.w:1.w, + color: diningStatus == 4? Color(0xFF32A060):Color(0xFFDEDEDE), + style: BorderStyle.solid, + ), + color: diningStatus == 4?Color(0xFFEEFFF5):Color(0xFFFFFFFF), + ), + padding: EdgeInsets.only(top:11.h,bottom: 14.h), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset( + "assets/image/home_he.webp", + fit: BoxFit.fill, + width: 21.w, + height: 31.h, + ), + SizedBox(width:10.w,), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + "堂食", + style: TextStyle( + color: Color(0xFF353535), + fontSize: 14.sp, + fontWeight: FontWeight.bold, + ), + ), + SizedBox(height: 6.h,), + Text( + "店内用餐", + style: TextStyle( + color: Color(0xFF32A060), + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + ), + ), + ], + ) + ], + ), + ), + )), + SizedBox(width: 12.w,), + Expanded(child: GestureDetector( + onTap: (){ + setState((){ + diningStatus = 3; + }); + }, + child: Container( + alignment: Alignment.center, + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(6)), + border: Border.all( + width: diningStatus == 3? 2.w : 1.w, + color: diningStatus == 3?Color(0xFF32A060):Color(0xFFDEDEDE), + style: BorderStyle.solid, + ), + color: diningStatus == 3 ?Color(0xFFEEFFF5):Color(0xFFFFFFFF), + ), + padding: EdgeInsets.only(top:11.h,bottom: 14.h), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset( + "assets/image/dining_w.webp", + fit: BoxFit.fill, + width: 24.w, + height: 26.h, + ), + SizedBox(width:9.w,), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + "外带", + style: TextStyle( + color: Color(0xFF353535), + fontSize: 14.sp, + fontWeight: FontWeight.bold, + ), + ), + SizedBox(height: 6.h,), + Text( + "打包到店取", + style: TextStyle( + color: Color(0xFF32A060), + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + ), + ), + ], + ) + ], + ), + ), + )), + ],), + ); + } + payChannelCheck(int payChannel) { this.payChannel = payChannel; if (tableId > 0) { diff --git a/lib/settlement/settlement_view/activity_coupon_remarks.dart b/lib/settlement/settlement_view/activity_coupon_remarks.dart index 709c5f59..8e3fb641 100644 --- a/lib/settlement/settlement_view/activity_coupon_remarks.dart +++ b/lib/settlement/settlement_view/activity_coupon_remarks.dart @@ -87,12 +87,12 @@ class _ActivityCouponRemarks extends State { borderRadius: BorderRadius.circular(8), ), // height: 122.h / (!widget.placeOrder ? 2 : 1), - margin: EdgeInsets.only(left: 16, right: 16, top: 15, bottom: 14), + margin: EdgeInsets.only(left: 16.w, right: 16.w, top: 14.h, bottom: 14.h), padding: EdgeInsets.only( - left: 16, - right: 16, - top: 14, - bottom: 14, + left: 16.w, + right: 16.w, + top: 14.h, + bottom: 14.h, ), child: Column( mainAxisAlignment: MainAxisAlignment.spaceEvenly, diff --git a/lib/settlement/settlement_view/distribution.dart b/lib/settlement/settlement_view/distribution.dart index e9c2179a..af54e70b 100644 --- a/lib/settlement/settlement_view/distribution.dart +++ b/lib/settlement/settlement_view/distribution.dart @@ -83,9 +83,9 @@ class _DistributionMode extends State { return Container( height: 165.h, margin: EdgeInsets.only( - left: 16, - right: 16, - top: 10, + left: 16.w, + right: 16.w, + top: 10.h, ), child: Stack( children: [ @@ -112,7 +112,6 @@ class _DistributionMode extends State { Column( children: [ Container( - // height: 50.h, child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, diff --git a/lib/settlement/settlement_view/pay_method.dart b/lib/settlement/settlement_view/pay_method.dart index 7755f5cb..a97f1bb5 100644 --- a/lib/settlement/settlement_view/pay_method.dart +++ b/lib/settlement/settlement_view/pay_method.dart @@ -57,7 +57,7 @@ class _PayMethod extends State { margin: EdgeInsets.only( left: 16.w, right: 16.w, - top: 12.h, + top: 8.h, bottom: 16.h, ), padding: EdgeInsets.only( diff --git a/lib/utils/status_utils.dart b/lib/utils/status_utils.dart index f6519612..a414556b 100644 --- a/lib/utils/status_utils.dart +++ b/lib/utils/status_utils.dart @@ -8,7 +8,7 @@ class StatusUtils { static String statusText( context, refundStatus, orderStatus, payStatus, sendStatus, isTakeOut) { String statusText = ""; - if (isTakeOut == 0) { + if (isTakeOut == 0 || isTakeOut == 3 || isTakeOut == 4) { if (payStatus == 0 && orderStatus != -1) { statusText = S.of(context).daizhifu; } else { @@ -169,7 +169,7 @@ class StatusUtils { ]; } else { if (orderStatus < 4) { - if (isTakeOut == 0) { + if (isTakeOut == 0 || isTakeOut == 3 || isTakeOut == 4) { return [ Expanded( flex: 1,