diff --git a/lib/pages/home/barcode/qr_scaner_result_page.dart b/lib/pages/home/barcode/qr_scaner_result_page.dart index aeff4da..4725d4d 100644 --- a/lib/pages/home/barcode/qr_scaner_result_page.dart +++ b/lib/pages/home/barcode/qr_scaner_result_page.dart @@ -182,7 +182,9 @@ class _QRScarerResultPageState extends State { .color(Colors.white) .make() .onInkTap(() { - Get.to(() => CommodityDetailPage(arguments: {"goodsID": widget.model.goodsID},)); + Get.to(() => CommodityDetailPage( + arguments: {"goodsID": widget.model.goodsID}, + )); // AppRouter.push(context, RouteName.COMMODITY_PAGE, // arguments: CommodityDetailPage.setArguments(widget.model.goodsId)); }); @@ -290,5 +292,6 @@ class _QRScarerResultPageState extends State { UserManager.instance.refreshShoppingCartNumber.value = true; UserManager.instance.refreshShoppingCartNumberWithPage.value = true; ReToast.success(text: '加入成功'); + Get.back(); } } diff --git a/lib/pages/home/classify/goods_page.dart b/lib/pages/home/classify/goods_page.dart index 869e1ad..f141a89 100644 --- a/lib/pages/home/classify/goods_page.dart +++ b/lib/pages/home/classify/goods_page.dart @@ -1359,7 +1359,7 @@ class _GoodsPageState extends BaseStoreState { skuModel.num = 50; } if (skuModel.selectedIndex == 1) { - GSDialog.of(context).showLoadingDialog(context, ""); + ReToast.loading(text: ''); if (widget.liveId != 0) HttpManager.post(LiveAPI.buyGoodsInform, { "liveItemId": widget.liveId, @@ -1401,25 +1401,23 @@ class _GoodsPageState extends BaseStoreState { skuModel.sku.id, skuModel.des, skuModel.num); - Navigator.pop(context); - GSDialog.of(myGlobals.scaffoldKey.currentContext).dismiss(context); if (!resultData.result) { - GSDialog.of(myGlobals.scaffoldKey.currentContext) - .showError(context, resultData.msg); + ReToast.err(text: resultData.msg); + Get.back(); return; } BaseModel model = BaseModel.fromJson(resultData.data); if (model.code != HttpStatus.SUCCESS) { Toast.showError(model.msg); - // GSDialog.of(myGlobals.scaffoldKey.currentContext).showError(context, model.msg); + Get.back(); return; } UserManager.instance.refreshShoppingCart.value = true; UserManager.instance.refreshShoppingCartNumber.value = true; UserManager.instance.refreshShoppingCartNumberWithPage.value = true; - // GSDialog.of(context).showSuccess(context, model.msg); - GSDialog.of(myGlobals.scaffoldKey.currentContext) - .showSuccess(myGlobals.scaffoldKey.currentContext, model.msg); + ReToast.success(text: '加入成功'); + Get.back(); + Get.back(); } Future _createOrder(SkuChooseModel skuModel, BuildContext context, diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 11d9b66..62ce8d7 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -633,6 +633,7 @@ class _HomePageState extends BaseStoreState padding: EdgeInsets.only(bottom: 5), color: AppColor.frenchColor, child: GoodsItemWidget.rowGoods( + buildCtx: context, isSingleDayGoods: false, onBrandClick: () { AppRouter.push(context, RouteName.BRANDGOODS_LIST_PAGE, diff --git a/lib/pages/user/account_and_safety/delete_account_validation_page.dart b/lib/pages/user/account_and_safety/delete_account_validation_page.dart index a4512bb..b42e600 100644 --- a/lib/pages/user/account_and_safety/delete_account_validation_page.dart +++ b/lib/pages/user/account_and_safety/delete_account_validation_page.dart @@ -136,6 +136,7 @@ class _DeleteAcountValidationPageState return; } UserManager.logout(); + ReToast.success(text:'注销成功'); } Widget _validationCode() {