From 984593109ea1947aceaab0d919f1d4ec1e9ff9b3 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 15:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8D=A2=E8=B4=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/myOrders/afterSale/index.vue  | 13 ++++++---
 packages/myOrders/changeInfo/index.css |  5 +---
 packages/myOrders/changeInfo/index.vue | 38 ++++++++++++++------------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/packages/myOrders/afterSale/index.vue b/packages/myOrders/afterSale/index.vue
index 6beddabd..7ed8844e 100644
--- a/packages/myOrders/afterSale/index.vue
+++ b/packages/myOrders/afterSale/index.vue
@@ -149,10 +149,15 @@ export default {
             });
         },
         pendingPage(item) {
-            NavgateTo(`/packages/myOrders/pending/index?item=${JSON.stringify(item)}`); //拒绝申请
-            // NavgateTo(`/packages/myOrders/sendBack/index?item=${JSON.stringify(item)}`); //自行寄回
-            // NavgateTo(`/packages/myOrders/refundOver/index?item=${JSON.stringify(item)}`); //退款成功
-            // NavgateTo(`/packages/myOrders/changeInfo/index?item=${JSON.stringify(item)}`); //换货
+            console.log("🚀 ~ pendingPage ~ item:", item)
+            if (item.after_sales_type === 3) {
+                NavgateTo(`/packages/myOrders/changeInfo/index?item=${JSON.stringify(item)}`)
+            } else {
+                NavgateTo(`/packages/myOrders/pending/index?item=${JSON.stringify(item)}`); //拒绝申请
+                // NavgateTo(`/packages/myOrders/sendBack/index?item=${JSON.stringify(item)}`); //自行寄回
+                // NavgateTo(`/packages/myOrders/refundOver/index?item=${JSON.stringify(item)}`); //退款成功
+                // NavgateTo(`/packages/myOrders/changeInfo/index?item=${JSON.stringify(item)}`); //换货
+            }
         }
     },
 };
diff --git a/packages/myOrders/changeInfo/index.css b/packages/myOrders/changeInfo/index.css
index 28fedd75..b38d2220 100644
--- a/packages/myOrders/changeInfo/index.css
+++ b/packages/myOrders/changeInfo/index.css
@@ -213,12 +213,9 @@ page {
 
 .goods-desc {
     font-size: 26rpx;
-    color: #ff4d4f;
-    background-color: #fff2f0;
-    padding: 4rpx 12rpx;
+    color: #999999;
     border-radius: 8rpx;
     display: inline-block;
-    margin: 10rpx 0;
 }
 
 .goods-price {
diff --git a/packages/myOrders/changeInfo/index.vue b/packages/myOrders/changeInfo/index.vue
index ad5363f2..e880978f 100644
--- a/packages/myOrders/changeInfo/index.vue
+++ b/packages/myOrders/changeInfo/index.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="container page">
         <!-- 进度指示器 -->
-        <view class="process-steps_top" v-if="false">
+        <view class="process-steps_top" v-if="currentAfterSale.process_status === 1">
             <view class="step-item">
                 <view class="step-line"></view>
                 <view class="step-circle active"></view>
@@ -30,15 +30,15 @@
             </view>
         </view>
 
-        <view class="status-tip" v-if="false">
+        <view class="status-tip" v-if="currentAfterSale.process_status === 3">
             <text class="status-title">换货关闭</text>
-            <text class="status-desc">2025年7月25日 11:30</text>
+            <text class="status-desc">{{ formatDate(currentAfterSale.revoke_time) }}</text>
             <text class="status-desc">由于您主动撤销换货申请,换货关闭。</text>
         </view>
 
-        <view class="status-tip">
+        <view class="status-tip" v-if="currentAfterSale.review_status === 3">
             <text class="status-title">换货关闭</text>
-            <text class="status-desc">2025年7月25日 11:30</text>
+            <text class="status-desc">{{ formatDate(currentAfterSale.review_time) }}</text>
             <text class="status-desc" style="color: #f63b08;">商家拒绝了您的换货申请,换货关闭</text>
         </view>
 
@@ -59,16 +59,14 @@
                                 class="copy-icon" @click="copyRefundNo"/> -->
                             </view>
                         </view>
-                        <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/af_update_address.png" class="icon_2" />
+                        <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/af_update_address.png"
+                            class="icon_2" />
                     </view>
                 </view>
             </view>
             <button class="addOrderIdBtn" @click="addOrderId">填写单号</button>
         </view>
 
-
-
-
         <!-- 商品信息 -->
         <view>
             <view class="goods-info">
@@ -82,7 +80,7 @@
                                 v-if="currentAfterSale.commodity_order_item[0].is_support_same_day === 1">当日达</text>
                             {{ currentAfterSale.commodity_order_item[0].goods_name }}
                         </text>
-                        <text class="goods-desc">{{ ite.after_sales_reason }}</text>
+                        <text class="goods-desc">{{ currentAfterSale.commodity_order_item[0].goods_spec }}</text>
                         <text class="goods-price">
                             {{ '¥' + currentAfterSale.commodity_order_item[0].sales_price.toFixed(2) + '/个' }}
                             <text class="goods-count">X{{ currentAfterSale.commodity_order_item[0].count }}</text>
@@ -105,7 +103,7 @@
                 </view>
                 <view class="info-item">
                     <text class="info-label">换货数量</text>
-                    <text class="info-value">{{ currentAfterSale.commodity_order_item[0].count }}</text>
+                    <text class="info-value">{{ currentAfterSale.change_goods }}</text>
                 </view>
                 <view class="info-item">
                     <text class="info-label">申请时间</text>
@@ -118,7 +116,7 @@
                 </view>
                 <view class="info-item">
                     <text class="info-label">收货地址</text>
-                    <text class="info-value">{{ currentAfterSale.user_address }}</text>
+                    <text class="info-value">{{ currentAfterSale.receiving_address }}</text>
                 </view>
                 <view class="info-item" v-if="false">
                     <text class="info-label">退款完结</text>
@@ -128,7 +126,7 @@
         </view>
 
         <!-- 操作按钮 -->
-        <view class="action-buttons" v-if="false">
+        <view class="action-buttons" v-if="currentAfterSale.process_status === 1">
             <button class="cancel-btn" @click="cancelRefund">撤销申请</button>
             <button class="urge-btn" @click="modifyRefund">修改申请</button>
         </view>
@@ -219,7 +217,7 @@ export default {
     },
     methods: {
         getServiceTypeText(type) {
-            return type === 1 ? '退货退款' : '仅退款';
+            return type === 1 ? '仅退款' : (type === 2 ? '退货退款' : '换货');
         },
 
         // 格式化日期
@@ -281,10 +279,14 @@ export default {
                 confirmColor: "#ff4d4f",
                 success: (res) => {
                     if (res.confirm) {
-                        // 撤销售后接口
-                        uni.showToast({
-                            title: '订单撤销成功',
-                            icon: 'success'
+                        const params = {
+                            id: this.currentAfterSale.id,
+                        }
+                        request(apiArr.revokeApply, "POST", params).then((res) => {
+                            uni.showToast({
+                                title: '订单撤销成功',
+                                icon: 'success'
+                            });
                         });
                     }
                 },