集换卡文本改印章；

点单页，地标按钮点击范围扩大，电话按钮新增判断，如果没有电话就隐藏

lib/order/exchange_order_page.dart

@@ -680,7 +680,7 @@ class _ExchangeOrderPage extends State<ExchangeOrderPage> {
                               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<ExchangeOrderPage> {
         "price": realPay.contains(S.of(context).jifen)
             ? realPay.substring(0, realPay.indexOf(S.of(context).jifen))
             : "0",
-        "happyBeanPrice":realPay.contains(S.of(context).jihuanka)
+        "happyBeanPrice":realPay.contains("印章")
-            ? realPay.substring(0, realPay.indexOf(S.of(context).jihuanka))
+            ? realPay.substring(0, realPay.indexOf("印章"))
             : "0",
         "realPay": realPay,
         "points": points,

lib/order/exchange_order_success_page.dart

@@ -86,8 +86,8 @@ class _ExchangeOrderSuccessPage extends State<ExchangeOrderSuccessPage> {
               height:45.h,
             ),
             Text(
-                widget.arguments["realPay"].toString().contains(S.of(context).xiaofeijihuanka) ?
+                widget.arguments["realPay"].toString().contains("消费印章") ?
-                S.of(context).xiaofeijihuanka: (widget.arguments["realPay"].toString().contains(S.of(context).jifen) ? S.of(context).xiaofeijifen : "消费金额"),
+                "消费印章": (widget.arguments["realPay"].toString().contains(S.of(context).jifen) ? S.of(context).xiaofeijifen : "消费金额"),
               style: TextStyle(
                 color: Color(0xFF727272),
                 fontSize: 14.sp,

lib/store/store_order.dart

@@ -128,6 +128,8 @@ class _StoreOrderPage extends State<StoreOrderPage>
           storeId: storeId,
         );
 
+        EasyLoading.dismiss();
+
         queryMemberInfo();
 
         queryShopCar().then((value) {
@@ -137,7 +139,6 @@ class _StoreOrderPage extends State<StoreOrderPage>
         if (tableId > 0) {
           getParentInfo();
         }
-        EasyLoading.dismiss();
       }
     });
   }

lib/store/store_view/store_info.dart

@@ -179,7 +179,8 @@ class _StoreInfoView extends State<StoreInfoView> {
               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<StoreInfoView> {
                     },
                   );
                 },
-                child: Image.asset(
+                child:Container(
-                  "assets/image/icon_union_location.webp",
+                  padding:EdgeInsets.only(right: 8.w) ,
-                  width: 24.w,
+                  child:  Image.asset(
-                  height: 24.h,
+                    "assets/image/icon_union_location.webp",
+                    width: 24.w,
+                    height: 24.h,
+                  ),
                 ),
               ),
-              SizedBox(
+              if((widget?.storeInfo?.tel ?? "") != "")
-                width: 16.w,
+              GestureDetector(
-              ),
+                behavior: HitTestBehavior.opaque,
-              InkWell(
                 onTap: () {
                   showCallMobile();
                 },
-                child: Image.asset(
+                child: Container(
-                  "assets/image/icon_union_call.webp",
+                  padding:EdgeInsets.only(left: 8.w) ,
-                  width: 24,
+                  child: Image.asset(
-                  height: 24,
+                    "assets/image/icon_union_call.webp",
+                    width: 24,
+                    height: 24,
+                  ),
                 ),
               ),
             ],

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<Activity> activitys;
@@ -94,6 +97,8 @@ class _StoreOrderListPage extends State<StoreOrderListPage> {
       "id": widget.arguments["id"],
     }).catchError((error) {
       // refreshController.refreshFailed();
+          SmartDialog.showToast(AppUtils.dioErrorTypeToString(error.type),
+              alignment: Alignment.center);
       debugPrint(error);
     });
     if (baseData != null && baseData.isSuccess) {