From 1a5f7a62dec32bb830f38f806bcc5268c7c0144a Mon Sep 17 00:00:00 2001 From: wurong <953969641@qq.com> Date: Tue, 20 Jun 2023 17:13:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=8D=A2=E5=8D=A1=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=94=B9=E5=8D=B0=E7=AB=A0=EF=BC=9B=20=E7=82=B9=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E5=9C=B0=E6=A0=87=E6=8C=89=E9=92=AE=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E8=8C=83=E5=9B=B4=E6=89=A9=E5=A4=A7=EF=BC=8C=E7=94=B5?= =?UTF-8?q?=E8=AF=9D=E6=8C=89=E9=92=AE=E6=96=B0=E5=A2=9E=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E5=B0=B1=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/order/exchange_order_page.dart | 6 ++-- lib/order/exchange_order_success_page.dart | 4 +-- lib/store/store_order.dart | 3 +- lib/store/store_view/store_info.dart | 32 +++++++++++++--------- lib/store/store_view/store_order_list.dart | 5 ++++ 5 files changed, 31 insertions(+), 19 deletions(-) diff --git a/lib/order/exchange_order_page.dart b/lib/order/exchange_order_page.dart index 975a7f50..11582c62 100644 --- a/lib/order/exchange_order_page.dart +++ b/lib/order/exchange_order_page.dart @@ -680,7 +680,7 @@ class _ExchangeOrderPage extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( - payableAmount().contains(S.of(context).jihuanka)? "现金抵扣印章":"现金抵扣积分", + payableAmount().contains("印章")? "现金抵扣印章":"现金抵扣积分", style: TextStyle( fontSize: 14, color: Color(0xFF353535), @@ -1213,8 +1213,8 @@ class _ExchangeOrderPage extends State { "price": realPay.contains(S.of(context).jifen) ? realPay.substring(0, realPay.indexOf(S.of(context).jifen)) : "0", - "happyBeanPrice":realPay.contains(S.of(context).jihuanka) - ? realPay.substring(0, realPay.indexOf(S.of(context).jihuanka)) + "happyBeanPrice":realPay.contains("印章") + ? realPay.substring(0, realPay.indexOf("印章")) : "0", "realPay": realPay, "points": points, diff --git a/lib/order/exchange_order_success_page.dart b/lib/order/exchange_order_success_page.dart index 286408cd..a12be52e 100644 --- a/lib/order/exchange_order_success_page.dart +++ b/lib/order/exchange_order_success_page.dart @@ -86,8 +86,8 @@ class _ExchangeOrderSuccessPage extends State { height:45.h, ), Text( - widget.arguments["realPay"].toString().contains(S.of(context).xiaofeijihuanka) ? - S.of(context).xiaofeijihuanka: (widget.arguments["realPay"].toString().contains(S.of(context).jifen) ? S.of(context).xiaofeijifen : "消费金额"), + widget.arguments["realPay"].toString().contains("消费印章") ? + "消费印章": (widget.arguments["realPay"].toString().contains(S.of(context).jifen) ? S.of(context).xiaofeijifen : "消费金额"), style: TextStyle( color: Color(0xFF727272), fontSize: 14.sp, diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart index 5fcddbc3..b7b60ce2 100644 --- a/lib/store/store_order.dart +++ b/lib/store/store_order.dart @@ -128,6 +128,8 @@ class _StoreOrderPage extends State storeId: storeId, ); + EasyLoading.dismiss(); + queryMemberInfo(); queryShopCar().then((value) { @@ -137,7 +139,6 @@ class _StoreOrderPage extends State if (tableId > 0) { getParentInfo(); } - EasyLoading.dismiss(); } }); } diff --git a/lib/store/store_view/store_info.dart b/lib/store/store_view/store_info.dart index dfef1d7e..ab653393 100644 --- a/lib/store/store_view/store_info.dart +++ b/lib/store/store_view/store_info.dart @@ -179,7 +179,8 @@ class _StoreInfoView extends State { SizedBox( width: 16.w, ), - InkWell( + GestureDetector( + behavior: HitTestBehavior.opaque, onTap: () { Navigator.of(context).pushNamed( '/router/location_map', @@ -190,23 +191,28 @@ class _StoreInfoView extends State { }, ); }, - child: Image.asset( - "assets/image/icon_union_location.webp", - width: 24.w, - height: 24.h, + child:Container( + padding:EdgeInsets.only(right: 8.w) , + child: Image.asset( + "assets/image/icon_union_location.webp", + width: 24.w, + height: 24.h, + ), ), ), - SizedBox( - width: 16.w, - ), - InkWell( + if((widget?.storeInfo?.tel ?? "") != "") + GestureDetector( + behavior: HitTestBehavior.opaque, onTap: () { showCallMobile(); }, - child: Image.asset( - "assets/image/icon_union_call.webp", - width: 24, - height: 24, + child: Container( + padding:EdgeInsets.only(left: 8.w) , + child: Image.asset( + "assets/image/icon_union_call.webp", + width: 24, + height: 24, + ), ), ), ], diff --git a/lib/store/store_view/store_order_list.dart b/lib/store/store_view/store_order_list.dart index 4e6a99ce..8a9190ce 100644 --- a/lib/store/store_view/store_order_list.dart +++ b/lib/store/store_view/store_order_list.dart @@ -1,5 +1,6 @@ import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:huixiang/retrofit/data/activity.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/findMiNiGroupList.dart'; @@ -14,6 +15,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:huixiang/view_widget/round_button.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import '../../utils/flutter_utils.dart'; + class StoreOrderListPage extends StatefulWidget { final Map arguments; final List activitys; @@ -94,6 +97,8 @@ class _StoreOrderListPage extends State { "id": widget.arguments["id"], }).catchError((error) { // refreshController.refreshFailed(); + SmartDialog.showToast(AppUtils.dioErrorTypeToString(error.type), + alignment: Alignment.center); debugPrint(error); }); if (baseData != null && baseData.isSuccess) {