From 84498e415b9478609d8e1ebbd7a92cee64a87398 Mon Sep 17 00:00:00 2001
From: 18631081161 <2088094923@qq.com>
Date: Sat, 20 Dec 2025 18:40:00 +0800
Subject: [PATCH] .

---
 admin/src/views/appointments/index.vue          | 5 ++++-
 backend/src/services/adminAppointmentService.js | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/admin/src/views/appointments/index.vue b/admin/src/views/appointments/index.vue
index fe1e3f0..40ed2f4 100644
--- a/admin/src/views/appointments/index.vue
+++ b/admin/src/views/appointments/index.vue
@@ -78,10 +78,13 @@
         <el-table-column label="服务项目" min-width="160" show-overflow-tooltip>
           <template #default="{ row }">
             <div class="service-info">
-              <span class="service-name">{{ row.service?.titleZh || '-' }}</span>
+              <span class="service-name">{{ row.service?.titleZh || row.hotService?.name_zh || row.serviceType || '-' }}</span>
               <el-tag size="small" type="info" v-if="row.service?.category">
                 {{ row.service.category.nameZh }}
               </el-tag>
+              <el-tag size="small" type="warning" v-else-if="row.hotService">
+                热门服务
+              </el-tag>
             </div>
           </template>
         </el-table-column>
diff --git a/backend/src/services/adminAppointmentService.js b/backend/src/services/adminAppointmentService.js
index 691a2fb..ba1796a 100644
--- a/backend/src/services/adminAppointmentService.js
+++ b/backend/src/services/adminAppointmentService.js
@@ -1,4 +1,5 @@
 const { Appointment, Service, User, Category } = require('../models');
+const HotService = require('../models/HotService');
 const { Op } = require('sequelize');
 const logger = require('../config/logger');
 
@@ -61,6 +62,7 @@ const getAppointmentList = async (options = {}) => {
       model: Service,
       as: 'service',
       attributes: ['id', 'titleZh', 'titleEn', 'titlePt', 'image', 'price', 'categoryId'],
+      required: false,
       include: [
         {
           model: Category,
@@ -70,6 +72,12 @@ const getAppointmentList = async (options = {}) => {
         },
       ],
     },
+    {
+      model: HotService,
+      as: 'hotService',
+      attributes: ['id', 'name_zh', 'name_en', 'name_pt', 'image_url', 'service_type'],
+      required: false,
+    },
     {
       model: User,
       as: 'user',