From 7e0a1ba8126d6611136e3c1a92a1317f65241ea3 Mon Sep 17 00:00:00 2001
From: lihaoyuan <18278596806@163.com>
Date: Wed, 17 Sep 2025 15:45:40 +0800
Subject: [PATCH] =?UTF-8?q?update:=E8=B0=83=E6=95=B4=E4=BA=86=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E8=AE=A2=E5=8D=95=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 java-mall-app-shop-admin/.hbuilderx/launch.json | 2 +-
 java-mall-app-shop-admin/pages/order/order.vue  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/java-mall-app-shop-admin/.hbuilderx/launch.json b/java-mall-app-shop-admin/.hbuilderx/launch.json
index 1af9410..29b7fb4 100644
--- a/java-mall-app-shop-admin/.hbuilderx/launch.json
+++ b/java-mall-app-shop-admin/.hbuilderx/launch.json
@@ -24,7 +24,7 @@
         },
         {
             "customPlaygroundType" : "device",
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         },
         {
diff --git a/java-mall-app-shop-admin/pages/order/order.vue b/java-mall-app-shop-admin/pages/order/order.vue
index f0dd446..4a4cba6 100644
--- a/java-mall-app-shop-admin/pages/order/order.vue
+++ b/java-mall-app-shop-admin/pages/order/order.vue
@@ -543,7 +543,7 @@ export default {
           width: "170rpx",
         },
       ],
-      salesReturnBtnSearchAcitve: 3105,
+      salesReturnBtnSearchAcitve: null,
       salesReturnOrderList: [],
       showImgList: [],
       showImg: false,
@@ -634,7 +634,7 @@ export default {
           this.pageNum = 1;
           if (newValue == "mchRetrunOrderList") {
             if (this.currentTab2 == 2) {
-              this.getSalesReturnOrderList();
+              this.getSalesReturnOrderList(null);
               console.log("触发getSalesReturnOrderList");
             }
           } else {
@@ -658,6 +658,9 @@ export default {
     } else {
       this.getOrderList();
     }
+	if (this.currentTab2 === 2) {
+	    this.getSalesReturnOrderList(null);
+	  }
   },
   onPullDownRefresh() {
     this.pageNum = 1;
@@ -962,7 +965,7 @@ export default {
       this.isDownNoSalesReturnData = false;
 
       if (this.currentTab2 == 2) {
-        this.getSalesReturnOrderList();
+        this.getSalesReturnOrderList(null);
       } else {
         this.getOrderList();
       }