Merge branch 'main' of https://git.gpxscs.cn/front/merchapp

java-mall-app-shop-admin/.hbuilderx/launch.json

@@ -24,7 +24,7 @@
         },
         {
             "customPlaygroundType" : "device",
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         },
         {

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();
       }