From 873d071bdb7959dc3c837b3ca6c6e9671e61e07c Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 29 十二月 2025 17:23:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
packages/components/src/Card/ReserveServiceCard.vue | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/packages/components/src/Card/ReserveServiceCard.vue b/packages/components/src/Card/ReserveServiceCard.vue
index 9af2e80..6e7dd50 100644
--- a/packages/components/src/Card/ReserveServiceCard.vue
+++ b/packages/components/src/Card/ReserveServiceCard.vue
@@ -3,18 +3,26 @@
<div class="reserve-service-card-title-wrapper">
<div class="reserve-service-card-title">{{ serviceName }}</div>
<slot name="title-right">
- <TaskPrice :value="toThousand(serviceFee ?? 0)" unit="鍏�" />
+ <TaskPrice :value="toThousand(payAmount ?? 0)" unit="鍏�" />
</slot>
</div>
<div class="reserve-service-card-item-list">
<div class="reserve-service-card-item">
- 鏈嶅姟鏃堕棿锛歿{
- `${dayjs(beginTime).format('YYYY骞碝M鏈圖鏃� HH:mm:ss')} - ${dayjs(endTime).format(
- 'YYYY骞碝M鏈圖鏃� HH:mm:ss'
- )}`
- }}
+ <div class="reserve-service-card-item-label">鏈嶅姟鏃堕棿锛�</div>
+ <div class="reserve-service-card-item-content">
+ {{
+ `${dayjs(beginTime).format('YYYY骞碝M鏈圖鏃� HH:mm:ss')} - ${dayjs(endTime).format(
+ 'YYYY骞碝M鏈圖鏃� HH:mm:ss'
+ )}`
+ }}
+ </div>
</div>
- <div class="reserve-service-card-item">鏈嶅姟鍦板潃锛歿{ addressDetail }}</div>
+ <div class="reserve-service-card-item">
+ <div class="reserve-service-card-item-label">鏈嶅姟鍦板潃锛�</div>
+ <div class="reserve-service-card-item-content">
+ {{ addressDetail }}
+ </div>
+ </div>
</div>
<div class="reserve-service-card-footer">
@@ -174,6 +182,13 @@
color: boleGetCssVar('text-color', 'regular');
line-height: 36px;
margin-bottom: 6px;
+ display: flex;
+ align-items: flex-start;
+
+ .reserve-service-card-item-content {
+ flex: 1;
+ min-width: 0;
+ }
&:last-child {
margin-bottom: 0;
--
Gitblit v1.10.0