From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/combo/components/ComboDetail.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/combo/components/ComboDetail.vue b/admin/src/views/combo/components/ComboDetail.vue
index 6ab44db..ea24c96 100644
--- a/admin/src/views/combo/components/ComboDetail.vue
+++ b/admin/src/views/combo/components/ComboDetail.vue
@@ -10,13 +10,13 @@
<span class="title">{{ detail.name }}</span>
<span class="status">{{ detail.status == '0' ? '宸插惎鐢�' : '绂佺敤' }}</span>
</div>
- <div class="placeholder9 mt10">姣忔棩閿�鍞檺閲忥細{{ detail.saleDayLimit }}</div>
+ <div class="placeholder9 mt10">姣忔棩閿�鍞檺閲忥細{{ detail.saleDayLimit || '涓嶉檺棰�' }}</div>
</div>
</div>
<div class="right">
<div class="item">
<div class="key">鎬诲彂鏀炬暟閲�</div>
- <div class="value">{{ detail.saleLimit || '涓嶉檺棰�' }}</div>
+ <div class="value">{{ detail.saleLimit || '-' }}</div>
</div>
<div class="item">
<div class="key">宸查攢鍞暟閲�</div>
@@ -25,15 +25,15 @@
<div class="item">
<div class="key">鍓╀綑鏁伴噺</div>
<div v-if="detail.saleLimit" class="value">{{ detail.saleLimit - detail.saleNum }}</div>
- <div v-else class="value">涓嶉檺棰�</div>
+ <div v-else class="value">-</div>
</div>
</div>
</div>
<div class="createTime_wrap">
<span class="item">鍒涘缓鏃堕棿锛歿{ detail.createDate }}</span>
- <span class="item">鍒涘缓浜猴細{{ detail.creator }}</span>
+ <span class="item">鍒涘缓浜猴細{{ detail.creatorName }}</span>
<span class="item">鏈�鍚庢洿鏂版椂闂达細{{ detail.editDate }}</span>
- <span class="item">鏇存柊浜猴細{{ detail.editor }}</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>
@@ -66,22 +66,22 @@
</div>
<div class="line">
<div class="key">浣跨敤鏃堕棿锛�</div>
- <div class="value" v-if="detail.useType == 0">{{ detail.useStartDate }} 鑷� {{ detail.useEndDate }}</div>
- <div class="value" v-if="detail.useType == 1">璐拱鍚巤{ detail.useDays }}澶╁唴鏈夋晥</div>
- <div class="value" v-if="detail.useType == 2">鑷獅{ detail.useStartDate }} 鍚� {{ detail.useDays }}澶╁唴鏈夋晥</div>
+ <div class="value" v-if="detail.useType == 0">{{ detail.useStartDate }} 鑷� {{ detail.useEndDate }}鍐呮湁鏁�</div>
+ <div class="value" v-if="detail.useType == 1">璐拱鍚庣珛鍗崇敓鏁堬紝鏈夋晥鏈焮{ detail.useDays }}澶�</div>
+ <div class="value" v-if="detail.useType == 2">鑷獅{ detail.useStartDate }}璧穥{ detail.useDays }}澶╁唴鏈夋晥</div>
</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">
<div class="key">鎬婚檺棰濓細</div>
- <div class="value">{{ detail.saleLimit || '涓嶉檺鍒�' }}</div>
+ <div class="value">{{ detail.saleLimit || '涓嶉檺棰�' }}</div>
</div>
<div class="line">
<div class="key">姣忔棩闄愰锛�</div>
--
Gitblit v1.9.3