From 9ae7f9e0881b6ef15e7ef721f5c1aa8e17846eff 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 17:13:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E6=AC=BE=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=92=8C=E8=87=AA=E8=A1=8C=E5=AF=84=E5=9B=9E=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       | 28 ++++++++++-----------
 packages/myOrders/refundOver/index.css      | 12 +++++++++
 packages/myOrders/refundOver/index.vue      | 16 ++++++------
 packages/myOrders/returnLogistics/index.vue |  4 +--
 packages/myOrders/sendBack/index.vue        | 25 ++++++++++++++++--
 5 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/packages/myOrders/afterSale/index.vue b/packages/myOrders/afterSale/index.vue
index 5de003a8..ec6cf691 100644
--- a/packages/myOrders/afterSale/index.vue
+++ b/packages/myOrders/afterSale/index.vue
@@ -157,21 +157,21 @@ export default {
         },
         pendingPage(item) {
             console.log("🚀 ~ pendingPage ~ item:", item)
-            NavgateTo(`/packages/myOrders/refundOver/index?item=${JSON.stringify(item)}`);
+            // NavgateTo(`/packages/myOrders/sendBack/index?item=${JSON.stringify(item)}`);
 
-            // if (item.after_sales_type === 3) {
-            //     if (item.review_status === 2) {
-            //         NavgateTo(`/packages/myOrders/sendBack/index?item=${JSON.stringify(item)}`); //自行寄回
-            //         return;
-            //     }
-            //     NavgateTo(`/packages/myOrders/changeInfo/index?item=${JSON.stringify(item)}`)
-            // } else {
-            //     if (item.refund_completed_time) {
-            //         NavgateTo(`/packages/myOrders/refundOver/index?item=${JSON.stringify(item)}`); //退款成功
-            //         return;
-            //     }
-            //     NavgateTo(`/packages/myOrders/pending/index?item=${JSON.stringify(item)}`);
-            // }
+            if (item.after_sales_type === 3) {
+                if (item.review_status === 2) {
+                    NavgateTo(`/packages/myOrders/sendBack/index?item=${JSON.stringify(item)}`); //自行寄回
+                    return;
+                }
+                NavgateTo(`/packages/myOrders/changeInfo/index?item=${JSON.stringify(item)}`)
+            } else {
+                if (item.refund_completed_time) {
+                    NavgateTo(`/packages/myOrders/refundOver/index?item=${JSON.stringify(item)}`); //退款成功
+                    return;
+                }
+                NavgateTo(`/packages/myOrders/pending/index?item=${JSON.stringify(item)}`);
+            }
         }
     },
 };
diff --git a/packages/myOrders/refundOver/index.css b/packages/myOrders/refundOver/index.css
index f09763d6..742b93c0 100644
--- a/packages/myOrders/refundOver/index.css
+++ b/packages/myOrders/refundOver/index.css
@@ -259,6 +259,18 @@
     text-align: center;
 }
 
+.moneyGo-btn{
+    width: 220rpx;
+    height: 80rpx;
+    background-color: #ff370b;
+    color: #ffffff;
+    border: none;
+    border-radius: 40rpx;
+    font-size: 28rpx;
+    line-height: 80rpx;
+    text-align: center;
+}
+
 .bottomImg{
     width: 70rpx;
     height: 80rpx;
diff --git a/packages/myOrders/refundOver/index.vue b/packages/myOrders/refundOver/index.vue
index 39d88e9f..277fc59a 100644
--- a/packages/myOrders/refundOver/index.vue
+++ b/packages/myOrders/refundOver/index.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="container">
         <!-- 进度条 -->
-        <view class="progress-container" v-if="false">
+        <view class="progress-container">
             <view class="progress-item">
                 <text class="progress-text">商家处理</text>
             </view>
@@ -15,7 +15,7 @@
             </view>
         </view>
 
-        <view class="progress-container">
+        <view class="progress-container" v-if="false">
             <view class="progress-item">
                 <text class="progress-text">商家处理</text>
             </view>
@@ -87,12 +87,12 @@
         </view>
 
         <!-- 操作按钮 -->
-        <view class="action-buttons" v-if="false">
-            <button class="modify-btn" @click="modifyRefund">寄件详情</button>
-            <button class="cancel-btn" @click="moneyGo">钱款去向</button>
+        <view class="action-buttons">
+            <button class="modify-btn" @click="shippingDetails">寄件详情</button>
+            <button class="moneyGo-btn" @click="moneyGo">钱款去向</button>
         </view>
 
-        <view class="action-buttons">
+        <view class="action-buttons" v-if="false">
             <button class="cancel-btn" @click="cancelRefund">撤销申请</button>
             <button class="urge-btn" @click="modifyRefund">修改申请</button>
         </view>
@@ -104,7 +104,7 @@
                     <!-- 弹窗头部 -->
                     <view class="popup-header">
                         <text class="header-title">退款总额 ¥{{ currentAfterSale.refund_amount ?
-                            currentAfterSale.refund_amount.toFixed(2) : '34.18' }}</text>
+                            currentAfterSale.refund_amount.toFixed(2) : '0.00' }}</text>
                         <text class="close-btn" @click="closeMoneyGoPopup">取消</text>
                     </view>
 
@@ -118,7 +118,7 @@
                             </view>
                             <text class="method-text">退回微信</text>
                             <text class="method-amount">{{ currentAfterSale.refund_amount ? '¥' +
-                                currentAfterSale.refund_amount.toFixed(2) : '¥34.18' }}</text>
+                                currentAfterSale.refund_amount.toFixed(2) : '¥0.0' }}</text>
                         </view>
                     </view>
                     <!-- 退款状态 -->
diff --git a/packages/myOrders/returnLogistics/index.vue b/packages/myOrders/returnLogistics/index.vue
index 0ec2eded..f129130a 100644
--- a/packages/myOrders/returnLogistics/index.vue
+++ b/packages/myOrders/returnLogistics/index.vue
@@ -137,9 +137,9 @@ export default {
             };
             console.log('提交物流信息:', logisticsInfo);
 
-            // 这里可以添加提交后的处理逻辑
+            // 显示成功提示
             uni.showToast({
-                title: '物流信息提交成功',
+                title: '提交成功',
                 icon: 'success'
             });
         }
diff --git a/packages/myOrders/sendBack/index.vue b/packages/myOrders/sendBack/index.vue
index 5490b5eb..62497442 100644
--- a/packages/myOrders/sendBack/index.vue
+++ b/packages/myOrders/sendBack/index.vue
@@ -26,7 +26,11 @@
                 <text class="copy-icon" @click="copyAdress"></text>
             </view>
 
-            <button class="addOrderIdBtn" @click="addOrderId">填写单号</button>
+            <button class="addOrderIdBtn" @click="addOrderId" v-if="true">填写单号</button>
+            <view class="logistics-info" v-else>
+                <text>退货物流：</text>
+                <text v-if="false"></text>
+            </view>
         </view>
 
         <view class="hr"></view>
@@ -83,6 +87,7 @@
 
         <!-- 操作按钮 -->
         <view class="action-buttons">
+            <!-- 填写完物流单号后不显示图片和平台介入按钮 -->
             <view>
                 <image class="bottomImg" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/secdBack_bottom.png"
                     alt="" />
@@ -107,7 +112,8 @@ export default {
     data() {
         return {
             currentAfterSale: {},
-            pickerDefaultDate: new Date()
+            pickerDefaultDate: new Date(),
+            logisticsInfo: null
         };
     },
     created() {
@@ -118,8 +124,23 @@ export default {
         const item = JSON.parse(options?.item);
         console.log("🚀 ~ onLoad ~ item:", item)
         this.currentAfterSale = item;
+        this.getLogisticsInfo();
+    },
+    onShow() {
+        // 页面显示时检查是否有新的物流信息
+        this.getLogisticsInfo();
     },
     methods: {
+        // 获取物流信息
+        getLogisticsInfo() {
+            const info = uni.getStorageSync('logisticsInfo');
+            if (info) {
+                this.logisticsInfo = info;
+                // 可选：清空storage，避免下次进入还显示旧数据
+                // uni.removeStorageSync('logisticsInfo');
+            }
+        },
+
         getServiceTypeText(type) {
             return type === 1 ? '仅退款' : (type === 2 ? '退货退款' : '换货');
         },