From afc417a4279fac75893ebe4376a0991aa4088540 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 24 二月 2025 16:37:08 +0800
Subject: [PATCH] ll
---
admin/src/views/combo/components/ComboDetail.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/combo/components/ComboDetail.vue b/admin/src/views/combo/components/ComboDetail.vue
index 6ab44db..d2af7fb 100644
--- a/admin/src/views/combo/components/ComboDetail.vue
+++ b/admin/src/views/combo/components/ComboDetail.vue
@@ -31,9 +31,9 @@
</div>
<div class="createTime_wrap">
<span class="item">鍒涘缓鏃堕棿锛歿{ detail.createDate }}</span>
- <span class="item">鍒涘缓浜猴細{{ detail.creator }}</span>
- <span class="item">鏈�鍚庢洿鏂版椂闂达細{{ detail.editDate }}</span>
- <span class="item">鏇存柊浜猴細{{ detail.editor }}</span>
+ <span class="item">鍒涘缓浜猴細{{ detail.creatorName }}</span>
+ <span class="item">鏈�鍚庢洿鏂版椂闂达細{{ detail.endDate }}</span>
+ <span class="item">鏇存柊浜猴細{{ detail.editorName }}</span>
</div>
</div>
<div class="separate" />
@@ -55,7 +55,7 @@
<div class="line">
<div class="key">濂楅绠�浠嬶細</div>
<div class="value">
- <div>{{ detail.desc }}</div>
+ <div>{{ detail.descs }}</div>
</div>
</div>
@@ -72,11 +72,11 @@
</div>
<div class="line">
<div class="key">閫傜敤鑼冨洿锛�</div>
- <div class="value">{{ detail.useWorkday == 1 && '宸ヤ綔鏃�' }} {{ detail.useWorkday && detail.useHoliday && '|' }} {{ detail.useHoliday == 1 && '鑺傚亣鏃�' }}</div>
+ <div class="value">{{ detail.useWorkday == 1 ? '宸ヤ綔鏃�' : ''}} {{ detail.useWorkday && detail.useHoliday ? '|' : '' }} {{ detail.useHoliday == 1 ? '鑺傚亣鏃�' : '' }}</div>
</div>
<div class="line">
<div class="key">閫傜敤椤圭洰锛�</div>
- <div class="value">{{ detail.isbike == 1 && '鑷杞�' }} {{ detail.isbike && detail.iselecbike && '|' }} {{ detail.iselecbike == 1 && '鐢靛姩杞�' }}</div>
+ <div class="value">{{ detail.isbike == 1 ? '鑷杞�' : '' }} {{ detail.isbike && detail.iselecbike ? '|' : '' }} {{ detail.iselecbike == 1 ? '鐢靛姩杞�' :'' }}</div>
</div>
<div class="line">
--
Gitblit v1.9.3