From 025efefe977774d9342739e12515d816105bae5d Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Tue, 25 Feb 2025 18:57:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order-details/index.vue | 10 ++++++----
 src/pages/order-list/index.vue    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/order-details/index.vue b/src/pages/order-details/index.vue
index 3e43c47..a91fbf4 100644
--- a/src/pages/order-details/index.vue
+++ b/src/pages/order-details/index.vue
@@ -15,7 +15,7 @@
                         <view class="company-box">
                             <van-image width="1.5rem" height="1.2rem" :src="companyImg" />
                             <view class="company-name">
-                                <view> 安徽送变电公司 </view>
+                                <view> 订单详情 </view>
                                 <van-image fit="cover" height="0.5rem" :src="companyBg" />
                             </view>
                         </view>
@@ -27,7 +27,7 @@
                     </van-col>
                 </van-row>
 
-                <view v-for="goods in orderDetailsList">
+                <view v-for="goods in orderDetailDtoList">
                     <van-row>
                         <van-col span="24">
                             <view class="items-info">
@@ -307,9 +307,11 @@ onLoad(async (options) => {
     }
     console.log('xxxxxxxxxxx', stepList.value)
     orderDetails.value = res
-    orderDetailsList.value = res.detailsList
-    if (res.orderStatus == 20) {
+    // orderDetailsList.value = res.detailsList
+    if (res.orderStatus == 20 || res.orderStatus == 99) {
         getOverhaulData(options?.orderId)
+    } else {
+        orderDetailDtoList.value = res.orderDetailDtoList
     }
 })
 
diff --git a/src/pages/order-list/index.vue b/src/pages/order-list/index.vue
index 3aa46ae..6a56068 100644
--- a/src/pages/order-list/index.vue
+++ b/src/pages/order-list/index.vue
@@ -83,7 +83,7 @@
                                             v-if="item.orderStatus == 20"
                                             style="color: var(--van-submit-bar-price-color)"
                                         >
-                                            {{ item.totalRealPrice }}
+                                            {{ goods.costs }}
                                         </text>
                                     </view>
                                     <!-- <view style="display: flex; justify-content: space-between">