From 25908f5bd4a2dae4625b49d325525849feb676a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 09:32:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/combo/components/OrderDetail.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/combo/components/OrderDetail.vue b/admin/src/views/combo/components/OrderDetail.vue
index 075ca64..7aac679 100644
--- a/admin/src/views/combo/components/OrderDetail.vue
+++ b/admin/src/views/combo/components/OrderDetail.vue
@@ -1,5 +1,5 @@
<template>
- <GlobalWindow :title="title" width="1000px" :visible.sync="visible" :confirm-working="isWorking">
+ <GlobalWindow :title="title" width="1100px" :visible.sync="visible" :confirm-working="isWorking">
<div class="title">璁㈠崟淇℃伅</div>
<div class="info_warp">
<div class="item">
@@ -32,7 +32,7 @@
</div>
<div class="item">
<div class="la">瀹屾垚鏃堕棿锛�</div>
- <div class="val">{{ info.closeDate }}</div>
+ <div class="val">{{ info.payDate }}</div>
</div>
<div class="item">
<div class="la">澶囨敞锛�</div>
@@ -59,7 +59,7 @@
<el-table-column prop="name" min-width="100px" label="濂楅鍗�" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="refundType" label="鏈夋晥鏈�" min-width="160px" align="center">
<template slot-scope="{row}">
- {{ row.startDate }} 鑷� {{ row.endDate }}
+ {{ row.useStartDate }} 鑷� {{ row.useEndDate }}
</template>
</el-table-column>
<el-table-column label="鏁伴噺" width="80px" align="center">
--
Gitblit v1.9.3