bug修改

lib/community/community_details.dart

@@ -19,7 +19,6 @@ import 'package:huixiang/view_widget/tips_dialog.dart';
 import 'package:huixiang/web/web_view/comment_list.dart';
 import 'package:huixiang/web/web_view/input_comment.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 
 class CommunityDetails extends StatefulWidget {

lib/home/help_farmers/help_farmers_page.dart

@@ -68,7 +68,6 @@ class _HelpFarmersPage extends State<HelpFarmersPage> {
       }
     } finally {
       setState(() {});
-      SmartDialog.dismiss();
     }
   }
 

lib/home/home_page.dart

@@ -192,7 +192,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
     _loadCount += 1;
     if (_loadCount == 7) {
       _loadCount = 0;
-      SmartDialog.dismiss();
+      SmartDialog.dismiss(status: SmartStatus.loading);
       String toastText = AppUtils.dioErrorTypeToString(dioErrorType);
       if (toastText.isNotEmpty) {
         SmartDialog.showToast(toastText, alignment: Alignment.center);
@@ -266,7 +266,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
       if (isRefresh)
         addLoadCount();
       else {
-        SmartDialog.dismiss();
+        SmartDialog.dismiss(status: SmartStatus.loading);
         setState(() {});
       }
     }

lib/home/huixiang_brand_page.dart

@@ -88,7 +88,6 @@ class _BrandPage extends State<BrandPage> with SingleTickerProviderStateMixin, A
     } else {
       refreshController.refreshFailed();
     }
-    SmartDialog.dismiss();
     refreshController.refreshCompleted();
     if (mounted) setState(() {});
   }

lib/home/points_mall_page.dart

@@ -132,7 +132,6 @@ class _PointsMallPage extends State<PointsMallPage>
       _refreshController.refreshFailed();
       return BaseData<PageInfo<Goods>>()..isSuccess = false;
     });
-    SmartDialog.dismiss();
     if (baseData?.isSuccess ?? false) {
       if (pageNum == 1) {
         goods.clear();

lib/home/welfare_exchange.dart

@@ -150,7 +150,6 @@ class _WelfareExchange extends State<WelfareExchange>
         refreshController.refreshFailed();
       }
     } finally {
-      SmartDialog.dismiss();
       setState(() {});
     }
   }

lib/home/welfare_page.dart

@@ -75,7 +75,6 @@ class _WelfarePage extends State<WelfarePage> {
         refreshController.refreshFailed();
         return BaseData<PageInfo<Goods>>()..isSuccess = false;
       });
-      SmartDialog.dismiss();
       if (pageGoods?.isSuccess ?? false) {
         goods.clear();
         goods.addAll(pageGoods?.data?.list ?? []);
@@ -129,7 +128,7 @@ class _WelfarePage extends State<WelfarePage> {
     _loadCount += 1;
     if (_loadCount == 2) {
       _loadCount = 0;
-      SmartDialog.dismiss();
+      SmartDialog.dismiss(status: SmartStatus.loading);
       if (refreshController.isRefresh) refreshController.refreshCompleted();
       if (mounted) setState(() {});
     }

lib/im/chat_details_page.dart

@@ -130,8 +130,10 @@ class _ChatDetailsPage extends State<ChatDetailsPage>
       });
       if (scrollController.hasClients) {
         debugPrint("refresh-message-height: ${height}  page: $page");
+        if (scrollController.position.maxScrollExtent > 0) {
           scrollController.position.restoreOffset(height, initialRestore: true);
         }
+      }
       newmessages.addAll(messagePage.reversed.toList());
       newanimatedListKey.currentState?.insertAllItems(0, messagePage.length);
     } else {

lib/im/im_view/im_page.dart

@@ -240,7 +240,7 @@ class _IMPage extends State<IMPage> implements OnChatMessage {
       _refreshController.loadComplete();
       _refreshController.refreshCompleted();
     }
-    SmartDialog.dismiss();
+    SmartDialog.dismiss(status: SmartStatus.loading);
   }
 
   @override

lib/login/login_page.dart

@@ -333,9 +333,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
               "firstLoginCouponList": value.data?.firstLoginCouponList
             },
         );
-        SmartDialog.dismiss();
+        SmartDialog.dismiss(status: SmartStatus.loading);
-      } else {
-        SmartDialog.showToast("${value?.msg}", alignment: Alignment.center);
       }
     });
   }

lib/login/new_login_page.dart

@@ -12,7 +12,9 @@ import 'package:get/get.dart';
 import 'package:huixiang/data/base_data.dart';
 import 'package:huixiang/data/channels.dart';
 import 'package:huixiang/data/examine_instance.dart';
+import 'package:huixiang/data/login_info.dart';
 import 'package:huixiang/data/user_entity.dart';
+import 'package:huixiang/data/user_info.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/main.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
@@ -212,27 +214,24 @@ class _NewLoginPage extends State<NewLoginPage> {
     SmartDialog.showLoading(
       msg: S.of(context).zhengzaijiazai,
     );
-    BaseData? value = await apiService?.memberLogin(param).catchError((error) {
+    BaseData<LoginInfo>? value = await apiService?.memberLogin(param).catchError((error) {
-      return BaseData()..isSuccess = false;
+      return BaseData<LoginInfo>()..isSuccess = false;
     });
     // SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai);
     if (value?.isSuccess ?? false) {
       var userInfo = value!.data;
-      ExamineInstance.instance.isExamine = userInfo.authInfo?.account == "13800138000";
+      ExamineInstance.instance.isExamine = userInfo?.authInfo?.account == "13800138000";
-      saveUserJson(userInfo.authInfo?.toJson());
+      saveUserJson(userInfo?.authInfo?.toJson());
       eventBus.fire(EventType(3));
 
       Navigator.of(context).pushNamedAndRemoveUntil(
           '/router/main_page', (route) => false,
           arguments: {
             "invite": invite,
-            "interviewCouponList": userInfo.interviewCouponList,
+            "interviewCouponList": userInfo?.interviewCouponList,
-            "firstLoginCouponList": userInfo.firstLoginCouponList
+            "firstLoginCouponList": userInfo?.firstLoginCouponList
           });
-    } else {
-      SmartDialog.showToast("${value?.msg}", alignment: Alignment.center);
     }
-    SmartDialog.dismiss();
   }
 
   saveUserJson(userJson) {
@@ -738,7 +737,6 @@ class _NewLoginPage extends State<NewLoginPage> {
                         ),
                         GestureDetector(
                           onTap: () {
-                            print("11111");
                             // if (widget.arguments != null) {
                             //   Navigator.of(context).pop();
                             // } else {

lib/message/system_message.dart

@@ -110,7 +110,6 @@ class _SystemMessagePage extends State<SystemMessagePage> {
       _refreshController.loadComplete();
       _refreshController.refreshCompleted();
     }
-    SmartDialog.dismiss();
   }
 
   RefreshController _refreshController = RefreshController();

lib/mine/invitation_record.dart

@@ -81,7 +81,6 @@ class _InvitationRecord extends State<InvitationRecord>
     } else {
       _refreshController.refreshFailed();
     }
-    SmartDialog.dismiss();
   }
 
   @override

lib/mine/mine_greenery.dart

@@ -56,7 +56,6 @@ class _MineGreenery extends State<MineGreenery> {
       refreshController.refreshFailed();
       return BaseData<PageInfo<Goods>>()..isSuccess = false;
     });
-    SmartDialog.dismiss();
     if (pageGoods?.isSuccess ?? false) {
       if (pageGoods?.data?.list?.isNotEmpty ?? false) {
         setState(() {

lib/mine/mine_page.dart

@@ -208,7 +208,6 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin,
       infoNumber = baseData?.data;
       _refreshController.refreshCompleted();
     }
-    SmartDialog.dismiss();
   }
 
   ///消息数量
@@ -224,7 +223,6 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin,
         });
       });
     }
-    SmartDialog.dismiss();
   }
 
   @override

lib/mine/mine_shop_details.dart

@@ -93,11 +93,11 @@ class _MineShopDetails extends State<MineShopDetails> {
       if (result?.latitude != null && result?.longitude != null) {
         vipDetail(result?.latitude, result?.longitude);
       } else {
-        SmartDialog.dismiss();
+        SmartDialog.dismiss(status: SmartStatus.loading);
       }
     }).then((value) {
       if (!value) {
-        SmartDialog.dismiss();
+        SmartDialog.dismiss(status: SmartStatus.loading);
         refreshController.refreshFailed();
       }
     });

lib/mine/mine_shop_page.dart

@@ -108,7 +108,6 @@ class _MineShopPage extends State<MineShopPage> with WidgetsBindingObserver {
         refreshController.refreshFailed();
       }
     } finally {
-      SmartDialog.dismiss();
       setState(() {});
     }
   }

lib/mine/mine_shop_recharge.dart

@@ -218,7 +218,7 @@ class _MineShopRecharge extends State<MineShopRecharge> {
     _loadCount += 1;
     if (_loadCount == 2) {
       _loadCount = 0;
-      SmartDialog.dismiss();
+      SmartDialog.dismiss(status: SmartStatus.loading);
       if (refreshController.isRefresh) refreshController.refreshCompleted();
       if (mounted) setState(() {});
     }

lib/mine/mine_view/community_follow.dart

@@ -44,14 +44,14 @@ class _CommunityFollow extends State<CommunityFollow>
     apiService = ApiService(Dio(),
         context: context, token: SharedInstance.instance.token, showLoading: true);
 
-    BaseData<SocialInfo>? baseData =
+    BaseData<SocialInfo>? baseData = await apiService?.socialInfo().catchError((onError) {
-        await apiService?.socialInfo().catchError((onError) {});
+      return BaseData<SocialInfo>()..isSuccess = false;
+    });
     if (baseData?.isSuccess ?? false) {
       setState(() {
         infoNumber = baseData?.data;
       });
     }
-    SmartDialog.dismiss();
   }
 
   @override

lib/mine/mine_vip/legal_right_details.dart

@@ -64,7 +64,6 @@ class _LegalRightDetails extends State<LegalRightDetails> {
         }
       });
     }
-    SmartDialog.dismiss();
   }
 
   ///解绑副卡

lib/mine/mine_vip/mine_attainment_page.dart

@@ -89,7 +89,6 @@ class _MineAttainmentPage extends State<MineAttainmentPage> {
         showDeleteDialog(index);
       });
     }
-    SmartDialog.dismiss();
   }
 
   ///个人社交信息(粉丝/关注数量/成就数量)
@@ -111,7 +110,6 @@ class _MineAttainmentPage extends State<MineAttainmentPage> {
         refreshController.refreshCompleted();
       });
     }
-    SmartDialog.dismiss();
   }
 
   _onRefresh() {

lib/mine/mine_vip/mine_vip_core.dart

@@ -136,7 +136,6 @@ class _MineVipCore extends State<MineVipCore> {
       refreshController.refreshCompleted();
       refreshController.loadComplete();
     }
-    SmartDialog.dismiss();
   }
 
   ///会员权益介绍/规则/说明/储值说明
@@ -154,7 +153,6 @@ class _MineVipCore extends State<MineVipCore> {
       refreshController.refreshCompleted();
       refreshController.loadComplete();
     }
-    SmartDialog.dismiss();
   }
 
   ///购买会员等级

lib/mine/recharge_page.dart

@@ -153,7 +153,7 @@ class _RechargePage extends State<RechargePage> {
     _loadCount += 1;
     if (_loadCount == 4) {
       _loadCount = 0;
-      SmartDialog.dismiss();
+      SmartDialog.dismiss(status: SmartStatus.loading);
       if (refreshController.isRefresh) refreshController.refreshCompleted();
       if (mounted) setState(() {});
     }

lib/mine/vip_detail_page.dart

@@ -56,11 +56,11 @@ class _VipDetailPage extends State<VipDetailPage> {
       if (result?.latitude != null && result?.longitude != null) {
         vipDetail(result?.latitude, result?.longitude);
       } else {
-        SmartDialog.dismiss();
+        SmartDialog.dismiss(status: SmartStatus.loading);
       }
     }).then((value) {
       if (!value) {
-        SmartDialog.dismiss();
+        SmartDialog.dismiss(status: SmartStatus.loading);
         refreshController.refreshFailed();
       }
     });

lib/order/bargain_group_order.dart

@@ -181,6 +181,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList>
         ?.queryStoreInfo(activityOrderList[0].storeId ?? "")
         .catchError((error) {
       debugPrint(error.toString());
+      return BaseData()..isSuccess = false;
     });
     if (baseData?.isSuccess ?? false) {
       storeInfo = StoreInfo.fromJson(baseData!.data);
@@ -191,7 +192,6 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList>
         setState(() {});
       }
     }
-    SmartDialog.dismiss();
   }
 
   _refresh() {

lib/order/exchange_history_page.dart

@@ -183,7 +183,6 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList>
         _refreshController.loadFailed();
       }
     } finally {
-      SmartDialog.dismiss();
       setState(() {});
     }
   }

lib/order/invoices_manage/add_invoices_title.dart

@@ -109,17 +109,15 @@ class _AddInvoicesTitle extends State<AddInvoicesTitle> {
       }).catchError((error) {
         SmartDialog.showToast(AppUtils.dioErrorTypeToString(error.type),
             alignment: Alignment.center);
+        return BaseData()..isSuccess = false;
       });
       if (baseData?.isSuccess ?? false) {
         Navigator.of(context).pop();
         Future.delayed(Duration(milliseconds: 500), () {
           SmartDialog.showToast("添加抬头信息成功", alignment: Alignment.center);
         });
-      } else {
-        SmartDialog.showToast("${baseData?.msg}", alignment: Alignment.center);
       }
     } finally {
-      SmartDialog.dismiss();
     }
   }
 

lib/order/invoices_manage/edit_invoices_info.dart

@@ -3,13 +3,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:huixiang/utils/shared_preference.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:shimmer/shimmer.dart';
 
 import '../../data/base_data.dart';
 import '../../generated/l10n.dart';
 import '../../retrofit/retrofit_api.dart';
-import '../../utils/flutter_utils.dart';
 import '../../utils/font_weight.dart';
 import '../../view_widget/my_appbar.dart';
 
@@ -95,16 +93,12 @@ class _EditInvoicesInfo extends State<EditInvoicesInfo> {
             ? mobile
             : editPhoneController.text, //申请人手机号码
       }).catchError((error) {
-        SmartDialog.showToast(AppUtils.dioErrorTypeToString(error.type),
+        return BaseData()..isSuccess = false;
-            alignment: Alignment.center);
       });
       if (baseData?.isSuccess ?? false) {
         Navigator.of(context).pop(1);
-      } else {
-        SmartDialog.showToast("${baseData?.msg}", alignment: Alignment.center);
       }
     } finally {
-      SmartDialog.dismiss();
     }
   }
 
@@ -243,11 +237,11 @@ class _EditInvoicesInfo extends State<EditInvoicesInfo> {
                                         arguments: {
                                           "enterType": 0,
                                         }).then((value) {
-                                      if (value != null) {
+                                      if (value != null && value is Map) {
-                                        invoicesInfo = value as Map?;
+                                        invoicesInfo = value;
-                                        headerId = (value as Map)['id'];
+                                        headerId = value['id'];
-                                        phone = (value as Map)['phone'];
+                                        phone = value['phone'];
-                                        name = (value as Map)['name'];
+                                        name = value['name'];
                                         setState(() {});
                                       }
                                     });

lib/order/invoices_manage/invoices_history.dart

@@ -99,9 +99,8 @@ class _InvoicesHistory extends State<InvoicesHistory> {
         msg: S.current.zhengzaijiazai,
       );
     await queryInvoiceList();
-    SmartDialog.dismiss();
-    if (!mounted) return;
     if (refreshController.isRefresh) refreshController.refreshCompleted();
+    if (!mounted) return;
     setState(() {});
   }
 

lib/order/invoices_manage/invoices_manage_page.dart

@@ -88,9 +88,8 @@ class _InvoicesManagePage extends State<InvoicesManagePage> {
         msg: S.current.zhengzaijiazai,
       );
     await queryInvoiceList();
-    SmartDialog.dismiss();
-    if (!mounted) return;
     if (refreshController.isRefresh) refreshController.refreshCompleted();
+    if (!mounted) return;
     setState(() {});
   }
 

lib/order/invoices_manage/invoices_title_info.dart

@@ -58,7 +58,6 @@ class _InvoicesTitleInfo extends State<InvoicesTitleInfo> {
         msg: S.current.zhengzaijiazai,
       );
     await queryInvoiceHeadersList();
-    SmartDialog.dismiss();
     if (!mounted) return;
     if (refreshController.isRefresh) refreshController.refreshCompleted();
     setState(() {});
@@ -123,11 +122,8 @@ class _InvoicesTitleInfo extends State<InvoicesTitleInfo> {
           SmartDialog.showToast("删除信息成功", alignment: Alignment.center);
         });
         networkStatus = 1;
-      } else {
-        SmartDialog.showToast("${baseData?.msg}", alignment: Alignment.center);
       }
     } finally {
-      SmartDialog.dismiss();
     }
   }
 

lib/order/logistics_information_page.dart

@@ -13,8 +13,6 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:huixiang/view_widget/my_footer.dart';
 import 'package:huixiang/view_widget/no_data_view.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
 
 
 class LogisticsInformationPage extends StatefulWidget {

lib/order/order_detail_page.dart

@@ -129,11 +129,9 @@ class _OrderDetailPage extends State<OrderDetailPage> {
         setState(() {
           statusTitle();
         });
-      SmartDialog.dismiss();
       refreshController.refreshCompleted();
       refreshController.loadComplete();
     } else {
-      SmartDialog.dismiss();
       refreshController.refreshFailed();
       refreshController.loadFailed();
     }
@@ -256,7 +254,6 @@ class _OrderDetailPage extends State<OrderDetailPage> {
   payResult(BaseData baseData) async {
     await queryDetails();
     Future.delayed(Duration(milliseconds: 800), () {
-      SmartDialog.dismiss();
       SmartDialog.showToast(baseData.msg == "ok" ? "订单支付成功" : "${baseData.msg}",
           alignment: Alignment.center);
     });

lib/order/order_history_page.dart

@@ -207,7 +207,6 @@ class _OrderHistoryList extends State<OrderHistoryList>
         refreshController.loadFailed();
       }
     } finally {
-      SmartDialog.dismiss();
     }
   }
 
@@ -592,7 +591,7 @@ class _OrderHistoryList extends State<OrderHistoryList>
                         SmartDialog.show(
                             builder: (ctx) => Tips(
                                   () {
-                                SmartDialog.dismiss();
+                                SmartDialog.dismiss(status: SmartStatus.dialog);
                               },
                               text: "暂不支持此功能",
                             ));

lib/order/order_view/order_address.dart

@@ -159,7 +159,7 @@ class _OrderAddress extends State<OrderAddress> {
                                 callMobile(mobile);
                               }
                             }
-                            SmartDialog.dismiss();
+                            SmartDialog.dismiss(status: SmartStatus.dialog);
                           },
                           leftText: S.of(context).quxiao,
                           width: MediaQuery.of(context).size.width - 30.w,

lib/qr/invite_friends.dart

@@ -98,7 +98,6 @@ class _InviteFriends extends State<InviteFriends> {
     } else {
       refreshController.refreshFailed();
     }
-    SmartDialog.dismiss();
   }
 
   _onRefresh() {

lib/qr/qr_share.dart

@@ -36,7 +36,6 @@ class _QrSharePage extends State<QrSharePage> {
 
   @override
   void dispose() {
-    SmartDialog.dismiss();
     super.dispose();
   }
 

lib/retrofit/min_api.dart

@@ -100,9 +100,6 @@ abstract class MinApiService {
         p(jsonEncode(response.data));
 
         Map map = response.data;
-        if (map["code"] != 0) {
-          SmartDialog.dismiss();
-        }
         if (map["code"] == 40005 || map["code"] == 40001) {
           if (!LoginTipsDialog().isShow) {
             LoginTipsDialog().show(context);
@@ -125,7 +122,7 @@ abstract class MinApiService {
         ErrorInterceptorHandler handler,
       ) {
         if (SmartDialog.checkExist(dialogTypes: {SmartAllDialogType.loading})) {
-          SmartDialog.dismiss();
+          SmartDialog.dismiss(status: SmartStatus.loading);
         }
         debugPrint(
             "\n======================= Min_错误响应数据 =======================");

lib/retrofit/retrofit_api.dart

@@ -138,7 +138,7 @@ abstract class ApiService {
             if (showLoading &&
                 SmartDialog.checkExist(
                     dialogTypes: {SmartAllDialogType.loading})) {
-              SmartDialog.dismiss();
+              SmartDialog.dismiss(status: SmartStatus.loading);
             }
             debugPrint("code = ${response.statusCode}");
             p(jsonEncode(response.data));
@@ -150,8 +150,7 @@ abstract class ApiService {
                   LoginTipsDialog().show(context);
                 }
               }
-              debugPrint(
+              debugPrint("======================= 响应数据结束 =======================\n");
-                  "======================= 响应数据结束 =======================\n");
               if (map["code"] == 0 || map["code"] == 200) {}
             }
           } catch (e2) {
@@ -162,12 +161,10 @@ abstract class ApiService {
           DioException e,
           ErrorInterceptorHandler handler,
         ) {
-          if (SmartDialog.checkExist(
+          if (SmartDialog.checkExist(dialogTypes: {SmartAllDialogType.loading})) {
-              dialogTypes: {SmartAllDialogType.loading})) {
+            SmartDialog.dismiss(status: SmartStatus.loading);
-            SmartDialog.dismiss();
           }
-          debugPrint(
+          debugPrint("\n======================= 错误响应数据 =======================");
-              "\n======================= 错误响应数据 =======================");
           debugPrint("type = ${e.type}");
           debugPrint("message = ${e.message}");
           debugPrint("\n");

lib/settlement/settlement.dart

@@ -302,7 +302,6 @@ class _Settlement extends State<Settlement> {
       }
     } finally {
       setState(() {});
-      SmartDialog.dismiss();
     }
   }
 
@@ -333,7 +332,6 @@ class _Settlement extends State<Settlement> {
         coupons = minOrderInfo?.couponName ?? "";
       });
     }
-    SmartDialog.dismiss();
   }
 
   ///取消优惠券
@@ -694,15 +692,9 @@ class _Settlement extends State<Settlement> {
             queryOrderDetails(parentId);
             setState(() {});
           }
-        } else {
-          // orderButton = false;
-          SmartDialog.showToast(baseData?.msg ?? "",
-              alignment: Alignment.center);
-        }
         }
-    } finally {
-      SmartDialog.dismiss();
       }
+    } finally {}
   }
 
   ///结算
@@ -752,8 +744,6 @@ class _Settlement extends State<Settlement> {
           sign: wxPay.sign!,
         ));
       } else {
-        SmartDialog.dismiss();
-        SmartDialog.showToast("${baseData?.msg}", alignment: Alignment.center);
         Future.delayed(Duration(seconds: 2), () {
           toOrderDetails(placeOrderFirst!.id);
         });

lib/store/shop_details_page.dart

@@ -168,7 +168,6 @@ class _ShopDetailsPage extends State<ShopDetailsPage> {
           }
         });
       });
-      SmartDialog.dismiss();
       refreshController.refreshCompleted();
     } else {
       refreshController.refreshFailed();
@@ -338,7 +337,6 @@ class _ShopDetailsPage extends State<ShopDetailsPage> {
     if (baseData?.isSuccess ?? false) {
       showStoreSelector(baseData!.data, id, count);
     }
-    SmartDialog.dismiss();
   }
 
   ///选规格弹窗

lib/store/shopping/activity_prefecture_details.dart

@@ -116,7 +116,6 @@ class _ActivityPrefectureDetails extends State<ActivityPrefectureDetails> {
           showLoading: false,
         );
         queryFindActListByType(pageType == "2" ? false : true);
-        SmartDialog.dismiss();
       }
     });
   }
@@ -136,7 +135,6 @@ class _ActivityPrefectureDetails extends State<ActivityPrefectureDetails> {
         setState(() {});
       }
     }
-    SmartDialog.dismiss();
   }
 
   ///秒杀/砍价/拼团列表

lib/store/shopping/shopping_goods_details.dart

@@ -137,7 +137,6 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
         );
         queryMemberInfo();
         queryMiNiDetail(productId);
-        SmartDialog.dismiss();
       }
     });
   }
@@ -166,7 +165,6 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
         setState(() {});
       }
     }
-    SmartDialog.dismiss();
   }
 
   ///商品详情
@@ -217,7 +215,6 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
     //     miNiDetail.attrList[0].attrValueList.length == 1) {
     //   _addShopCar(miNiDetail, [], count);
     // } else {
-    SmartDialog.dismiss();
     dialogShowing = true;
     SmartDialog.show(
       builder: (ctx) {
@@ -303,7 +300,6 @@ class _ShoppingGoodsDetails extends State<ShoppingGoodsDetails> {
         },
       ],
     }).catchError((error) => BaseListData<ShoppingCart>()..isSuccess = false);
-    SmartDialog.dismiss();
     if (baseDate?.isSuccess ?? false) {
       SmartDialog.showToast("添加购物车成功", alignment: Alignment.center);
     }

lib/store/shopping/shopping_mall_home.dart

@@ -80,8 +80,6 @@ class _ShoppingMallHome extends State<ShoppingMallHome>
           storeId: storeId,
           showLoading: false,
         );
-
-        SmartDialog.dismiss();
       }
     });
   }
@@ -101,7 +99,6 @@ class _ShoppingMallHome extends State<ShoppingMallHome>
         setState(() {});
       }
     }
-    SmartDialog.dismiss();
   }
 
   @override

lib/store/store_order.dart

@@ -701,7 +701,6 @@ class _StoreOrderPage extends State<StoreOrderPage>
       return;
     }
     BaseData<MiniDetail>? baseData = await minService?.miNiDetail(id);
-    SmartDialog.dismiss();
     if (baseData?.isSuccess ?? false) {
       miniDetail = baseData!.data;
       if (baseData.data != null) {
@@ -862,10 +861,8 @@ class _StoreOrderPage extends State<StoreOrderPage>
     Map<String, dynamic> shopCarTemp = shopCarGoods?.toJson() ?? {};
     cartSkuItem.buyNum = (cartSkuItem.buyNum ?? 0) - 1;
     shopCarTemp["shoppingCartSkuItemList"] = [cartSkuItem.toJson()];
-    BaseListData<ShoppingCart>? baseDate =
+    BaseListData<ShoppingCart>? baseDate = await minService?.shoppingCartSingle(shopCarTemp);
-        await minService?.shoppingCartSingle(shopCarTemp);
     if (baseDate?.isSuccess ?? false) {
-      SmartDialog.dismiss();
       this.shopCarGoods = await queryShopCar();
       if (shopCartKey.currentState != null) {
         shopCartKey.currentState!.setState(() {});

lib/store/store_view/product_meals_sku.dart

@@ -120,7 +120,6 @@ class _ProductMealsSku extends State<ProductMealsSku> {
     BaseListData<ShoppingCart>? baseDate = await minService
         ?.addShoppingCart(requestData)
         .catchError((error) => BaseListData<ShoppingCart>()..isSuccess = false);
-    SmartDialog.dismiss();
     if (baseDate?.isSuccess ?? false) {
       Navigator.of(context).pop();
     } else {

lib/union/union_details_page.dart

@@ -298,7 +298,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
       print("print 下载失败");
     }
     Future.delayed(Duration(seconds: 1), () {
-      SmartDialog.dismiss();
+      SmartDialog.dismiss(status: SmartStatus.loading);
     });
   }
 }

lib/union/union_list.dart

@@ -80,7 +80,6 @@ class _UnionList extends State<UnionList> with AutomaticKeepAliveClientMixin {
       _refreshController.refreshFailed();
       SmartDialog.showToast(baseData?.msg ?? "", alignment: Alignment.center);
     }
-    SmartDialog.dismiss();
     if (!mounted) return;
     setState(() {});
   }

lib/union/union_page.dart

@@ -215,9 +215,9 @@ class UnionPageState extends State<UnionPage>
       }
     } finally {
       getLocation(showLoading: false);
-    }
       SmartDialog.dismiss();
     }
+  }
 
   loadFinish({bool showLoading = true}) {
     SmartDialog.dismiss();

lib/utils/upload_async.dart

@@ -120,17 +120,12 @@ class UploadAsync {
         "location": addressText,
         "longitude": "",
       }).catchError((onError) {
-        SmartDialog.dismiss();
+
       });
       if (baseData?.isSuccess ?? false) {
         SmartDialog.showToast("发布成功！");
         UploadInstance.instance.notifyAllObservers();
-      } else {
-        if (baseData.msg?.isNotEmpty ?? false) {
-          SmartDialog.showToast("${baseData.msg}", alignment: Alignment.center);
-        }
       }
-      SmartDialog.dismiss();
     });
   }
 

lib/view_widget/vip_dialog.dart

@@ -53,7 +53,6 @@ class _VipDialog extends State<VipDialog> {
         }
       });
     }
-    SmartDialog.dismiss();
   }
 
   @override