From 00a7a61df86db969f2ba61c508d02ba4709ce3d4 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 05 六月 2026 10:09:06 +0800
Subject: [PATCH] 改bug
---
admin/src/components/business/OperaOrderDetail.vue | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/admin/src/components/business/OperaOrderDetail.vue b/admin/src/components/business/OperaOrderDetail.vue
index 1ecffcb..2ecf31c 100644
--- a/admin/src/components/business/OperaOrderDetail.vue
+++ b/admin/src/components/business/OperaOrderDetail.vue
@@ -27,7 +27,7 @@
<div class="info-item">
<span class="label">璁㈠崟绫诲瀷锛�</span>
<span class="value">
- <span v-if="detailInfo.order.type === 0">灏卞湴瀛樺彇</span>
+ <span v-if="detailInfo.order.type === 0">灏卞湴瀵勫瓨</span>
<span v-else-if="detailInfo.order.type === 1">鍚屽煄瀵勯��</span>
<span v-else>-</span>
</span>
@@ -118,7 +118,7 @@
<div class="section">
<div class="section-header">
- <span class="section-title">閰嶉�佷俊鎭�</span>
+ <span class="section-title">瀛樺彇淇℃伅</span>
</div>
<div class="info-grid">
<div class="info-item">
@@ -130,23 +130,27 @@
<span class="value">{{ detailInfo.order.takePhone || '-' }}</span>
</div>
<div class="info-item">
+ <span class="label">瀵勪欢闂ㄥ簵锛�</span>
+ <span class="value">{{ detailInfo.depositShopName || '-' }}</span>
+ </div>
+ <div class="info-item">
<span class="label">瀵勪欢鍦板潃锛�</span>
<span class="value">{{ detailInfo.order.depositLocationRemark || '' }}</span>
</div>
- <div class="info-item">
+ <div class="info-item" v-if="detailInfo.order.type === 1 && detailInfo.takeShopId">
+ <span class="label">鏀朵欢闂ㄥ簵锛�</span>
+ <span class="value">{{ detailInfo.takeShopName || '-' }}</span>
+ </div>
+ <div class="info-item" v-if="detailInfo.order.type === 1">
<span class="label">鏀朵欢鍦板潃锛�</span>
<span class="value">{{ detailInfo.order.takeLocationRemark || '' }}</span>
</div>
- <div class="info-item">
- <span class="label">鏄惁鏀朵欢鏈嶅姟鐐癸細</span>
- <span class="value">{{ detailInfo.order.takeShopId ? '鏄�' : '鍚�' }}</span>
- </div>
- <div class="info-item">
+ <div class="info-item" v-if="detailInfo.order.type === 1">
<span class="label">閰嶉�佸徃鏈猴細</span>
<span class="value">{{ detailInfo.driverName || '-' }}</span>
</div>
<div class="info-item full-width">
- <span class="label">闂ㄥ簵鏀朵欢鎷嶇収锛�</span>
+ <span class="label">闂ㄥ簵鏀朵欢鎷嶇収锛�<br/>{{ detailInfo.order.depositTime || '-' }}</span>
<div v-if="detailInfo.depositImages && detailInfo.depositImages.length" class="image-list">
<el-image
v-for="(img, index) in detailInfo.depositImages"
@@ -160,7 +164,7 @@
<span v-else>-</span>
</div>
<div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.type===1">
- <span class="label">鍙告満鍙栦欢鎷嶇収锛�</span>
+ <span class="label">鍙告満鍙栦欢鎷嶇収锛�<br/>{{ detailInfo.order.driverTakeTime || '-' }}</span>
<div v-if="detailInfo.driverTakeImages && detailInfo.driverTakeImages.length" class="image-list">
<el-image
v-for="(img, index) in detailInfo.driverTakeImages"
@@ -174,7 +178,7 @@
<span v-else>-</span>
</div>
<div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.type===1 && detailInfo.order.takeShopId">
- <span class="label">闂ㄥ簵鍏ュ簱鎷嶇収锛�</span>
+ <span class="label">闂ㄥ簵鍏ュ簱鎷嶇収锛�<br/>{{ detailInfo.order.arriveTime || '-' }}</span>
<div v-if="detailInfo.storeInImages && detailInfo.storeInImages.length" class="image-list">
<el-image
v-for="(img, index) in detailInfo.storeInImages"
@@ -188,7 +192,7 @@
<span v-else>-</span>
</div>
<div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.type===1 && !detailInfo.order.takeShopId">
- <span class="label">鍙告満閫佽揪鎷嶇収锛�</span>
+ <span class="label">鍙告満閫佽揪鎷嶇収锛�<br/>{{ detailInfo.order.arriveTime || '-' }}</span>
<div v-if="detailInfo.driverDoneImages && detailInfo.driverDoneImages.length" class="image-list">
<el-image
v-for="(img, index) in detailInfo.driverDoneImages"
@@ -202,7 +206,7 @@
<span v-else>-</span>
</div>
<div class="info-item full-width" v-if="detailInfo.order && detailInfo.order.takeShopId">
- <span class="label">闂ㄥ簵鍑哄簱鎷嶇収锛�</span>
+ <span class="label">闂ㄥ簵鍑哄簱鎷嶇収锛�<br/>{{ detailInfo.order.finishTime || '' }}</span>
<div v-if="detailInfo.storeOutImages && detailInfo.storeOutImages.length" class="image-list">
<el-image
v-for="(img, index) in detailInfo.storeOutImages"
@@ -382,10 +386,10 @@
}
},
methods: {
- headerRowStyle({ rowIndex }) {
+ headerRowStyle ({ rowIndex }) {
return {
- background: '#007bff' ,
- color : '#333',
+ background: '#007bff',
+ color: '#333',
height: '50px'
}
},
--
Gitblit v1.9.3