From 187260164bff736c8009e11c99214e9fdae0ea95 Mon Sep 17 00:00:00 2001 From: lq Date: Fri, 9 Jan 2026 11:04:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9C=A8=E7=BA=BF=E5=A4=8D=E8=AF=8A?= =?UTF-8?q?=E7=9A=84UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat/components/MessageBubble.vue | 158 ++++++++++++++-- .../business/chat/components/MessageInput.vue | 13 -- .../product/medical-device/api/index.ts | 4 + .../medical-device/components/ExcelUpload.vue | 4 + .../medical-device/components/modal.vue | 4 + .../product/medical-device/config/search.ts | 4 + .../product/medical-device/config/table.ts | 4 + .../business/product/medical-device/index.vue | 4 + .../business/product/non-drug/api/index.ts | 4 + .../non-drug/components/ExcelUpload.vue | 4 + .../product/non-drug/components/modal.vue | 4 + .../product/non-drug/config/search.ts | 4 + .../business/product/non-drug/config/table.ts | 4 + .../views/business/product/non-drug/index.vue | 4 + .../components/ConfirmModal.vue | 4 + .../components/EndConsultationCard.vue | 176 +++++++++++++++--- .../components/PatientExperienceCard.vue | 10 +- .../components/PatientInfoPanel.vue | 23 ++- .../components/PatientList.vue | 34 ++++ .../components/ProductCard.vue | 31 +++ .../doctor/online-consultation/index.vue | 3 +- 21 files changed, 429 insertions(+), 71 deletions(-) diff --git a/apps/web-antd/src/views/business/chat/components/MessageBubble.vue b/apps/web-antd/src/views/business/chat/components/MessageBubble.vue index 46900cc4..6e517c5a 100644 --- a/apps/web-antd/src/views/business/chat/components/MessageBubble.vue +++ b/apps/web-antd/src/views/business/chat/components/MessageBubble.vue @@ -12,8 +12,8 @@ import { sendMessage } from '#/views/business/chat/utils/request'; // 辅助函数：按需解析消息内容 const getParsedContent = (messageType, messageContent) => { - // 对于需要 JSON 解析的消息类型：4, 10, 11, 12, 13 - if ([4, 10, 11, 12, 13].includes(messageType)) { + // 对于需要 JSON 解析的消息类型：4, 9, 10, 11, 12, 13 + if ([4, 9, 10, 11, 12, 13].includes(messageType)) { try { return JSON.parse(messageContent); } catch (e) { @@ -373,7 +373,8 @@ if (props.message.message_type === 10) {
- +
+ +
订单价格更新

{{ parsedContent.message }}

-
- 订单号：{{ parsedContent.order_no }} - ¥{{ parsedContent.total_pay_price }} + + +
+
+ + + 订单号 + + {{ parsedContent.order_no }} +
+
+ + +
+
+ + + 运费 + + + + + 包邮 + + ¥{{ parsedContent.trans_expenses || '0.00' }} + +
+
+ + + 总价 + + ¥{{ parsedContent.total_pay_price }} +
@@ -1133,34 +1167,96 @@ if (props.message.message_type === 10) { .price-update-card { @apply rounded-xl border border-orange-200 bg-gradient-to-r from-orange-50 to-amber-50 p-4 shadow-sm dark:border-orange-700 dark:from-orange-900/30 dark:to-amber-900/30; + transition: all 0.3s ease; +} + +.price-update-card:hover { + @apply shadow-md; + transform: translateY(-2px); +} + +.message-bubble.sent .price-update-card { + @apply border-orange-200/50 bg-orange-50/30 dark:border-orange-700/70 dark:bg-orange-900/30; } .price-update-header { - @apply mb-3 flex items-center gap-2; + @apply mb-3 flex items-center gap-3; } -.price-icon { - @apply text-orange-500; +.header-icon { + @apply flex h-10 w-10 items-center justify-center rounded-lg bg-orange-100 text-orange-500 dark:bg-orange-900/50 dark:text-orange-300; } .price-title { - @apply font-semibold text-orange-700 dark:text-orange-300; + @apply flex-1 text-base font-semibold text-orange-700 dark:text-orange-300; } .price-update-content { - @apply space-y-2; + @apply space-y-3; } .price-message { - @apply text-sm text-gray-700 dark:text-gray-300; + @apply rounded-lg bg-white/60 p-2 text-sm text-gray-700 dark:bg-gray-800/60 dark:text-gray-300; } -.price-details { - @apply flex items-center justify-between border-t border-orange-200/50 pt-2 dark:border-orange-700/50; +.order-info { + @apply rounded-lg bg-white/60 p-3 dark:bg-gray-800/60; } -.order-no { - @apply text-xs text-gray-500 dark:text-gray-400; +.info-item { + @apply flex items-center justify-between; +} + +.info-label { + @apply flex items-center gap-1.5 text-xs text-gray-500 dark:text-gray-400; +} + +.info-label i { + @apply text-orange-500 dark:text-orange-400; +} + +.info-value { + @apply text-sm font-medium text-gray-700 dark:text-gray-200; +} + +.price-info-section { + @apply space-y-2 rounded-lg border-t border-orange-200/50 bg-white/60 pt-3 dark:border-orange-700/50 dark:bg-gray-800/60; +} + +.price-info-row { + @apply flex items-center justify-between; +} + +.price-label { + @apply flex items-center gap-1.5 text-sm text-gray-600 dark:text-gray-300; +} + +.price-label i { + @apply text-orange-500 dark:text-orange-400; +} + +.price-value { + @apply text-sm font-medium text-gray-700 dark:text-gray-200; +} + +.shipping-fee { + @apply flex items-center; +} + +.free-shipping-tag { + @apply inline-flex items-center gap-1 rounded-full bg-green-100 px-2 py-0.5 text-xs font-medium text-green-700 dark:bg-green-900/50 dark:text-green-300; +} + +.free-shipping-tag i { + @apply text-green-600 dark:text-green-400; +} + +.total-row { + @apply border-t border-orange-200/50 pt-2 dark:border-orange-700/50; +} + +.total-row .price-label { + @apply text-base font-semibold; } .price-amount { @@ -1170,4 +1266,32 @@ if (props.message.message_type === 10) { .system-message-text { @apply rounded-lg bg-gray-100 p-3 text-center text-sm text-gray-600 dark:bg-gray-700 dark:text-gray-300; } + +/* 患者就诊经历卡片发送样式 */ +.message-bubble.sent .patient-experience-card { + @apply border-blue-200/50 bg-blue-50/30 dark:border-blue-700/70 dark:bg-blue-900/30; +} + +/* 商品卡片发送样式 */ +.message-bubble.sent .product-card { + @apply border-purple-200/50 bg-purple-50/30 dark:border-purple-700/70 dark:bg-purple-900/30; +} + +/* 结束问诊卡片发送样式 */ +.message-bubble.sent .end-consultation-card { + @apply border-gray-200/50 bg-gray-50/30 dark:border-gray-700/70 dark:bg-gray-900/30; +} + +/* 图片和视频消息发送样式 */ +.message-bubble.sent .image-message, +.message-bubble.sent .video-message { + opacity: 0.9; + border: 1px solid rgba(255, 255, 255, 0.2); + border-radius: 12px; +} + +/* 通话消息发送样式 */ +.message-bubble.sent .call-message { + color: white; +} diff --git a/apps/web-antd/src/views/business/chat/components/MessageInput.vue b/apps/web-antd/src/views/business/chat/components/MessageInput.vue index 0e75a39f..56ca330c 100644 --- a/apps/web-antd/src/views/business/chat/components/MessageInput.vue +++ b/apps/web-antd/src/views/business/chat/components/MessageInput.vue @@ -454,19 +454,6 @@ const handleEndConsultation = () => { reason: '医生主动结束' }); - // 发送结束问诊消息卡片 - const endTime = new Date().toLocaleString('zh-CN'); - await sendMessage({ - roomId: chatStore.currentFriend?.room_id, - senderId: userStore.currentUser?.doctor_id, - receiverId: chatStore.currentFriend?.id, - type: 'end-consultation', - content: JSON.stringify({ - end_reason: '医生主动结束', - end_time: endTime - }) - }); - message.success('结束接诊成功'); emit('end-consultation-success'); } catch (error) { diff --git a/apps/web-antd/src/views/business/product/medical-device/api/index.ts b/apps/web-antd/src/views/business/product/medical-device/api/index.ts index bbb3d900..13d1923e 100644 --- a/apps/web-antd/src/views/business/product/medical-device/api/index.ts +++ b/apps/web-antd/src/views/business/product/medical-device/api/index.ts @@ -76,3 +76,7 @@ export async function updateZoneCategory(data: Record) { + + + + diff --git a/apps/web-antd/src/views/business/product/medical-device/components/ExcelUpload.vue b/apps/web-antd/src/views/business/product/medical-device/components/ExcelUpload.vue index 7f86cdac..b3b0be00 100644 --- a/apps/web-antd/src/views/business/product/medical-device/components/ExcelUpload.vue +++ b/apps/web-antd/src/views/business/product/medical-device/components/ExcelUpload.vue @@ -165,3 +165,7 @@ const handleChange = (info: { file: UploadFile }) => { + + + + diff --git a/apps/web-antd/src/views/business/product/medical-device/components/modal.vue b/apps/web-antd/src/views/business/product/medical-device/components/modal.vue index 0fdc45a9..ff05b700 100644 --- a/apps/web-antd/src/views/business/product/medical-device/components/modal.vue +++ b/apps/web-antd/src/views/business/product/medical-device/components/modal.vue @@ -105,3 +105,7 @@ const [Modal, modalApi] = useVbenModal({ + + + + diff --git a/apps/web-antd/src/views/business/product/medical-device/config/search.ts b/apps/web-antd/src/views/business/product/medical-device/config/search.ts index 0b5c8f32..037d12b0 100644 --- a/apps/web-antd/src/views/business/product/medical-device/config/search.ts +++ b/apps/web-antd/src/views/business/product/medical-device/config/search.ts @@ -24,3 +24,7 @@ export const formOptions: VbenFormProps = { + + + + diff --git a/apps/web-antd/src/views/business/product/medical-device/config/table.ts b/apps/web-antd/src/views/business/product/medical-device/config/table.ts index e2bd3af8..9e533569 100644 --- a/apps/web-antd/src/views/business/product/medical-device/config/table.ts +++ b/apps/web-antd/src/views/business/product/medical-device/config/table.ts @@ -91,3 +91,7 @@ export const gridOptions: VxeGridProps = { + + + + diff --git a/apps/web-antd/src/views/business/product/medical-device/index.vue b/apps/web-antd/src/views/business/product/medical-device/index.vue index 34847849..27f052fd 100644 --- a/apps/web-antd/src/views/business/product/medical-device/index.vue +++ b/apps/web-antd/src/views/business/product/medical-device/index.vue @@ -194,3 +194,7 @@ const openExcelUploadModal = () => { + + + + diff --git a/apps/web-antd/src/views/business/product/non-drug/api/index.ts b/apps/web-antd/src/views/business/product/non-drug/api/index.ts index 94fbe028..a49ded19 100644 --- a/apps/web-antd/src/views/business/product/non-drug/api/index.ts +++ b/apps/web-antd/src/views/business/product/non-drug/api/index.ts @@ -76,3 +76,7 @@ export async function updateZoneCategory(data: Record) { + + + + diff --git a/apps/web-antd/src/views/business/product/non-drug/components/ExcelUpload.vue b/apps/web-antd/src/views/business/product/non-drug/components/ExcelUpload.vue index 1405dec1..61ca2a88 100644 --- a/apps/web-antd/src/views/business/product/non-drug/components/ExcelUpload.vue +++ b/apps/web-antd/src/views/business/product/non-drug/components/ExcelUpload.vue @@ -165,3 +165,7 @@ const handleChange = (info: { file: UploadFile }) => { + + + + diff --git a/apps/web-antd/src/views/business/product/non-drug/components/modal.vue b/apps/web-antd/src/views/business/product/non-drug/components/modal.vue index 531e451c..c8a5caad 100644 --- a/apps/web-antd/src/views/business/product/non-drug/components/modal.vue +++ b/apps/web-antd/src/views/business/product/non-drug/components/modal.vue @@ -105,3 +105,7 @@ const [Modal, modalApi] = useVbenModal({ + + + + diff --git a/apps/web-antd/src/views/business/product/non-drug/config/search.ts b/apps/web-antd/src/views/business/product/non-drug/config/search.ts index 4feb4c72..53baef32 100644 --- a/apps/web-antd/src/views/business/product/non-drug/config/search.ts +++ b/apps/web-antd/src/views/business/product/non-drug/config/search.ts @@ -24,3 +24,7 @@ export const formOptions: VbenFormProps = { + + + + diff --git a/apps/web-antd/src/views/business/product/non-drug/config/table.ts b/apps/web-antd/src/views/business/product/non-drug/config/table.ts index 1267c28c..6abb2994 100644 --- a/apps/web-antd/src/views/business/product/non-drug/config/table.ts +++ b/apps/web-antd/src/views/business/product/non-drug/config/table.ts @@ -91,3 +91,7 @@ export const gridOptions: VxeGridProps = { + + + + diff --git a/apps/web-antd/src/views/business/product/non-drug/index.vue b/apps/web-antd/src/views/business/product/non-drug/index.vue index 8220dd70..cca0dacd 100644 --- a/apps/web-antd/src/views/business/product/non-drug/index.vue +++ b/apps/web-antd/src/views/business/product/non-drug/index.vue @@ -194,3 +194,7 @@ const openExcelUploadModal = () => { + + + + diff --git a/apps/web-antd/src/views/doctor/doctor-reception/components/ConfirmModal.vue b/apps/web-antd/src/views/doctor/doctor-reception/components/ConfirmModal.vue index aa93762a..5515f6ae 100644 --- a/apps/web-antd/src/views/doctor/doctor-reception/components/ConfirmModal.vue +++ b/apps/web-antd/src/views/doctor/doctor-reception/components/ConfirmModal.vue @@ -43,3 +43,7 @@ const [Modal, modalApi] = useVbenModal({ + + + + diff --git a/apps/web-antd/src/views/doctor/online-consultation/components/EndConsultationCard.vue b/apps/web-antd/src/views/doctor/online-consultation/components/EndConsultationCard.vue index 5acce098..ef8d3655 100644 --- a/apps/web-antd/src/views/doctor/online-consultation/components/EndConsultationCard.vue +++ b/apps/web-antd/src/views/doctor/online-consultation/components/EndConsultationCard.vue @@ -1,6 +1,5 @@ diff --git a/apps/web-antd/src/views/doctor/online-consultation/components/PatientExperienceCard.vue b/apps/web-antd/src/views/doctor/online-consultation/components/PatientExperienceCard.vue index f68255a7..2b385fb8 100644 --- a/apps/web-antd/src/views/doctor/online-consultation/components/PatientExperienceCard.vue +++ b/apps/web-antd/src/views/doctor/online-consultation/components/PatientExperienceCard.vue @@ -347,25 +347,25 @@ const handleAddToPrescription = async () => { } /* 暗黑模式适配 */ -:global(.dark) .patient-experience-card { +.dark .patient-experience-card { background: linear-gradient(135deg, #1e293b 0%, #0f172a 100%); border-color: #334155; } -:global(.dark) .info-row { +.dark .info-row { background: #1e293b; border-color: #334155; } -:global(.dark) .info-row:hover { +.dark .info-row:hover { background: #334155; } -:global(.dark) .info-value { +.dark .info-value { color: #e2e8f0; } -:global(.dark) .card-footer { +.dark .card-footer { background: #0f172a; border-color: #334155; } diff --git a/apps/web-antd/src/views/doctor/online-consultation/components/PatientInfoPanel.vue b/apps/web-antd/src/views/doctor/online-consultation/components/PatientInfoPanel.vue index 3716dfec..1737896e 100644 --- a/apps/web-antd/src/views/doctor/online-consultation/components/PatientInfoPanel.vue +++ b/apps/web-antd/src/views/doctor/online-consultation/components/PatientInfoPanel.vue @@ -254,10 +254,6 @@ watch( flex-shrink: 0; } -.dark .patient-title { - color: #f3f4f6; -} - .patient-descriptions { margin-bottom: 0; } @@ -318,4 +314,23 @@ watch( font-size: 16px; font-weight: 500; } + +/* 暗色模式适配 */ +.dark .patient-title { + color: #f3f4f6; +} + +.dark .illness-info, +.dark .drug-info { + color: #cbd5e1; +} + +.dark .illness-info strong, +.dark .drug-info strong { + color: #e2e8f0; +} + +.dark .meta-info { + color: #94a3b8; +} diff --git a/apps/web-antd/src/views/doctor/online-consultation/components/PatientList.vue b/apps/web-antd/src/views/doctor/online-consultation/components/PatientList.vue index 312ae9ed..6bee07c8 100644 --- a/apps/web-antd/src/views/doctor/online-consultation/components/PatientList.vue +++ b/apps/web-antd/src/views/doctor/online-consultation/components/PatientList.vue @@ -214,6 +214,7 @@ defineExpose({ align-items: center; justify-content: center; font-size: 14px; + color: #666; } .patient-list { @@ -282,4 +283,37 @@ defineExpose({ .time { font-size: 12px; } + +/* 暗色模式适配 */ +.dark .patient-name { + color: #e2e8f0; +} + +.dark .patient-phone { + color: #94a3b8; +} + +.dark .order-no { + color: #94a3b8; +} + +.dark .status-pending { + background: rgba(245, 108, 108, 0.2); + color: #f87171; +} + +.dark .status-consulting { + background: rgba(103, 194, 58, 0.2); + color: #4ade80; +} + +.dark .status-ended { + background: rgba(144, 147, 153, 0.2); + color: #9ca3af; +} + +.dark .loading-state, +.dark .empty-state { + color: #94a3b8; +} diff --git a/apps/web-antd/src/views/doctor/online-consultation/components/ProductCard.vue b/apps/web-antd/src/views/doctor/online-consultation/components/ProductCard.vue index e99098c7..5cc33e5f 100644 --- a/apps/web-antd/src/views/doctor/online-consultation/components/ProductCard.vue +++ b/apps/web-antd/src/views/doctor/online-consultation/components/ProductCard.vue @@ -113,5 +113,36 @@ const handleClick = () => { color: #ff4d4f; margin-left: 4px; } + +/* 暗色模式适配 */ +.dark .product-card { + background: #1e293b; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3); +} + +.dark .product-card:hover { + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.4); +} + +.dark .product-name { + color: #e2e8f0; +} + +.dark .product-spec, +.dark .product-function { + color: #94a3b8; +} + +.dark .product-price { + border-top-color: #334155; +} + +.dark .price-label { + color: #94a3b8; +} + +.dark .price-value { + color: #f87171; +} diff --git a/apps/web-antd/src/views/doctor/online-consultation/index.vue b/apps/web-antd/src/views/doctor/online-consultation/index.vue index 9d5be1c7..e5a87ca8 100644 --- a/apps/web-antd/src/views/doctor/online-consultation/index.vue +++ b/apps/web-antd/src/views/doctor/online-consultation/index.vue @@ -562,7 +562,8 @@ const handleAddPatientProductsToPrescription = async () => { } .dark .left-panel-wrapper { - border-right-color: #333; + border-right-color: #334155; + background: #1e293b; } .dark .container-box-grid {