From 34d7403a407e827ac96f596adaa68f99fe68e25b Mon Sep 17 00:00:00 2001
From: wurong <953969641@qq.com>
Date: Wed, 22 Nov 2023 17:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8B=E6=9E=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=8E=92=E5=BA=8F=EF=BC=8C=E5=9C=A8=E5=94=AE?=
 =?UTF-8?q?=E5=95=86=E5=93=81=EF=BC=8C=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9=EF=BC=8C=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96=EF=BC=9B?=
 =?UTF-8?q?=20=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AEui?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/business_system/goods/on_sale/batch_shelf.dart  | 5 -----
 lib/business_system/goods/on_sale/goods_sort.dart   | 5 -----
 lib/business_system/goods/on_sale/on_sale_page.dart | 5 -----
 lib/business_system/order/order_list.dart           | 2 +-
 4 files changed, 1 insertion(+), 16 deletions(-)

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<BatchShelf> {
 
   ///商品列表
   queryGoodsList(groupId, {isSing = true}) async {
-    if (isSing)
-      EasyLoading.show(
-          status: S.current.zhengzaijiazai,
-          maskType: EasyLoadingMaskType.black);
     try {
       BaseData<BusinessGoods> baseData =
       await businessService.findAdminProductLis({
@@ -145,7 +141,6 @@ class _BatchShelf extends State<BatchShelf> {
     } 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<GoodsSort> {
 
   ///商品列表
   queryGoodsList(groupId, {isSing = true}) async {
-    if (isSing)
-      EasyLoading.show(
-          status: S.current.zhengzaijiazai,
-          maskType: EasyLoadingMaskType.black);
     try {
       BaseData<BusinessGoods> baseData =
           await businessService.findAdminProductLis({
@@ -148,7 +144,6 @@ class _GoodsSort extends State<GoodsSort> {
     } 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<OnSalePage> {
 
   ///商品列表
   queryGoodsList(groupId, {isSing = true}) async {
-    if (isSing)
-      EasyLoading.show(
-          status: S.current.zhengzaijiazai,
-          maskType: EasyLoadingMaskType.black);
     try {
       BaseData<BusinessGoods> baseData =
           await businessService.findAdminProductLis({
@@ -149,7 +145,6 @@ class _OnSalePage extends State<OnSalePage> {
     } 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<OrderList> {
                               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(