From 1f013658d7b3835625aacdb17f42cac0cb7671ce Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 25 二月 2025 18:19:48 +0800
Subject: [PATCH] l l

---
 admin/src/views/combo/components/ComboDetail.vue |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/admin/src/views/combo/components/ComboDetail.vue b/admin/src/views/combo/components/ComboDetail.vue
index 6ab44db..98e1ede 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>
 
@@ -72,16 +72,16 @@
     </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