diff --git a/lib/business_system/goods/on_sale/batch_shelf.dart b/lib/business_system/goods/on_sale/batch_shelf.dart index 30e9e571..13453c59 100644 --- a/lib/business_system/goods/on_sale/batch_shelf.dart +++ b/lib/business_system/goods/on_sale/batch_shelf.dart @@ -110,10 +110,6 @@ class _BatchShelf extends State { ///商品列表 queryGoodsList(groupId, {isSing = true}) async { - if (isSing) - EasyLoading.show( - status: S.current.zhengzaijiazai, - maskType: EasyLoadingMaskType.black); try { BaseData baseData = await businessService.findAdminProductLis({ @@ -145,7 +141,6 @@ class _BatchShelf extends State { } finally { if (isSing) { setState(() {}); - EasyLoading.dismiss(); } else { addLoadCount(); } diff --git a/lib/business_system/goods/on_sale/goods_sort.dart b/lib/business_system/goods/on_sale/goods_sort.dart index 40f7e880..4dd8dcf8 100644 --- a/lib/business_system/goods/on_sale/goods_sort.dart +++ b/lib/business_system/goods/on_sale/goods_sort.dart @@ -113,10 +113,6 @@ class _GoodsSort extends State { ///商品列表 queryGoodsList(groupId, {isSing = true}) async { - if (isSing) - EasyLoading.show( - status: S.current.zhengzaijiazai, - maskType: EasyLoadingMaskType.black); try { BaseData baseData = await businessService.findAdminProductLis({ @@ -148,7 +144,6 @@ class _GoodsSort extends State { } finally { if (isSing) { setState(() {}); - EasyLoading.dismiss(); } else { addLoadCount(); } diff --git a/lib/business_system/goods/on_sale/on_sale_page.dart b/lib/business_system/goods/on_sale/on_sale_page.dart index e2a42ed0..cffc8e70 100644 --- a/lib/business_system/goods/on_sale/on_sale_page.dart +++ b/lib/business_system/goods/on_sale/on_sale_page.dart @@ -113,10 +113,6 @@ class _OnSalePage extends State { ///商品列表 queryGoodsList(groupId, {isSing = true}) async { - if (isSing) - EasyLoading.show( - status: S.current.zhengzaijiazai, - maskType: EasyLoadingMaskType.black); try { BaseData baseData = await businessService.findAdminProductLis({ @@ -149,7 +145,6 @@ class _OnSalePage extends State { } finally { if (isSing) { setState(() {}); - EasyLoading.dismiss(); } else { addLoadCount(); } diff --git a/lib/business_system/order/order_list.dart b/lib/business_system/order/order_list.dart index 7688c86b..2bb269d7 100644 --- a/lib/business_system/order/order_list.dart +++ b/lib/business_system/order/order_list.dart @@ -365,7 +365,7 @@ class _OrderList extends State { vertical: 5.h, horizontal: 26.w), margin: EdgeInsets.only( right: (adminOrderDtoList.payStatus == 1 && - adminOrderDtoList.refundStatus == 0) + adminOrderDtoList.refundStatus == 0 && adminOrderDtoList.enableRefundApprover == false) ? 20.w : 0), child: Text(