From fb5ddc3e9a1df591b3600757305eda2ab3788126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Fri, 12 Sep 2025 10:34:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=94=AE=E5=90=8E=E9=A1=B5?=
 =?UTF-8?q?=E5=92=8C=E5=A4=84=E7=90=86=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/myOrders/afterSale/index.vue         | 17 +++++++++++++--
 packages/myOrders/index/index.vue             | 21 ++++++++++++-------
 .../myOrders/index/popup/afterSale/index.vue  |  2 +-
 packages/myOrders/pending/index.vue           |  1 +
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/packages/myOrders/afterSale/index.vue b/packages/myOrders/afterSale/index.vue
index a0f4c871..7b62a43c 100644
--- a/packages/myOrders/afterSale/index.vue
+++ b/packages/myOrders/afterSale/index.vue
@@ -6,7 +6,8 @@
                 <view class="header">
                     <view class="company-info">
                         <text class="company-name">{{ item.commodity_order_item[0].goods_name }}</text>
-                        <text class="after-sale-no">{{ item.after_sales_type === 1 ? '退款' : (item.after_sales_type === 2 ? '退货瑞款' : '换货') }}</text>
+                        <text class="after-sale-no">{{ item.after_sales_type === 1 ? '退款' : (item.after_sales_type === 2
+                            ? '退货瑞款' : '换货') }}</text>
                     </view>
                     <text class="order-time">提交订单：{{ formatDate(item.create_time) }}</text>
                 </view>
@@ -74,6 +75,14 @@ export default {
             currentAfterSale: this.afterSaleList,
         };
     },
+    watch: {
+        afterSaleList: {
+            handler(newVal) {
+                this.currentAfterSale = newVal;
+            },
+            deep: true
+        }
+    },
     methods: {
         getList() {
             const params = {
@@ -128,7 +137,11 @@ export default {
                             this.getList();
                             uni.showToast({
                                 title: '订单撤销成功',
-                                icon: 'success'
+                                icon: 'success',
+                                // duration: 1500,
+                                // success: () => {
+                                //     this.$emit('revokeApply');
+                                // }
                             });
                         });
                     }
diff --git a/packages/myOrders/index/index.vue b/packages/myOrders/index/index.vue
index d1c69045..11746670 100644
--- a/packages/myOrders/index/index.vue
+++ b/packages/myOrders/index/index.vue
@@ -16,7 +16,7 @@
         <rated />
       </view>
       <view v-if="selectedTab === 8">
-        <afterSale :afterSaleList="afterSaleList" />
+        <afterSale :afterSaleList="afterSaleList" @revokeApply="revokeApply" />
       </view>
       <view v-else>
         <view v-for="(item, index) in orderData" :key="index">
@@ -337,6 +337,7 @@ export default {
           })
         })
         this.orderData = res.order_list;
+        this.getAfterSaleList();
       });
     },
     getAfterSaleList() {
@@ -345,21 +346,25 @@ export default {
       }
       request(afterSaleApi.afterSalesList, "POST", params).then((res) => {
         res.after_sales_list.forEach(item => {
-          // 处理退货图片，多个URL用逗号分隔
-          if (item.return_images) {
-            const images = item.return_images.split(',');
-            const processedImages = images.map(img => picUrl + img).join(',');
-            item.return_images = processedImages;
-          }
+          item.commodity_order_item?.forEach(good => {
+            good.commodity_pic = picUrl + good.commodity_pic;
+          })
         })
         this.afterSaleList = res.after_sales_list;
       });
+    },
+
+    // 处理订单撤销成功事件
+    revokeApply() {
+      this.getOrderList();
     }
   },
 
   onLoad(options) {
     this.getOrderList();
-    this.getAfterSaleList();
+  },
+  onShow() {
+    this.getOrderList();
   },
 };
 </script>
diff --git a/packages/myOrders/index/popup/afterSale/index.vue b/packages/myOrders/index/popup/afterSale/index.vue
index 41629584..922ad583 100644
--- a/packages/myOrders/index/popup/afterSale/index.vue
+++ b/packages/myOrders/index/popup/afterSale/index.vue
@@ -548,7 +548,7 @@ export default {
             this.currentGGIndex = 0;
             this.refundDescription = '';
             this.imgList = [];
-        }
+        },
     }
 };
 </script>
diff --git a/packages/myOrders/pending/index.vue b/packages/myOrders/pending/index.vue
index fd92c210..d29917a2 100644
--- a/packages/myOrders/pending/index.vue
+++ b/packages/myOrders/pending/index.vue
@@ -194,6 +194,7 @@ export default {
                                 title: '订单撤销成功',
                                 icon: 'success'
                             });
+                            this.$emit('revokeApplySuccess');
                         });
                     }
                 },