From 0df6e2d32260a40902b2984880ffc9a7b112d105 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 29 十二月 2025 15:35:21 +0800
Subject: [PATCH] fix: bug
---
packages/components/src/Card/MineServiceDetailView.vue | 141 ++++++++++++++++++----------------------------
1 files changed, 56 insertions(+), 85 deletions(-)
diff --git a/packages/components/src/Card/MineServiceDetailView.vue b/packages/components/src/Card/MineServiceDetailView.vue
index a4e49ed..4692699 100644
--- a/packages/components/src/Card/MineServiceDetailView.vue
+++ b/packages/components/src/Card/MineServiceDetailView.vue
@@ -1,52 +1,46 @@
<template>
<div class="mine-service-detail-view-wrapper">
- <div class="mine-service-detail-view-address mine-service-detail-card">
- <div class="mine-service-detail-view-title-wrapper">
- <div class="mine-service-detail-view-title">鏈嶅姟鍦板潃</div>
- </div>
- <div class="mine-service-detail-view-item">娴欐睙鐪佸畞娉㈠競閯炲窞鍖烘渤娓呭寳璺�55鍙峰崥娴ぇ鍘�24灞�</div>
- <div class="mine-service-detail-view-item">闃抽槼 13333333333</div>
- </div>
- <div class="mine-service-detail-card">
- <nut-card
- :img-url="'//img10.360buyimg.com/n2/s240x240_jfs/t1/210890/22/4728/163829/6163a590Eb7c6f4b5/6390526d49791cb9.jpg!q70.jpg'"
- :title="'鏈嶅姟鍚嶇О'"
- :price="'155.00'"
- >
- <template #prolist>
- <div class="card-tag-list">
- <span class="tag">娲婚矞</span>
- <span class="tag">绀肩洅</span>
- <span class="tag">鍥戒骇</span>
- </div>
- </template>
- <template #origin>
- <div></div>
- </template>
- </nut-card>
- </div>
+ <ServiceDetailAddressCard
+ :name="contactName"
+ :contactPhoneNumber="contactPhoneNumber"
+ :addressDetail="addressDetail"
+ />
+ <ServiceDetailGoodCard
+ :name="serviceName"
+ :price="price"
+ :specName="specName"
+ :specNumber="specNumber"
+ :imgUrl="imgUrl"
+ />
- <List>
- <ListItem title="璁㈠崟鐘舵��" :showArrow="false">
+ <List extraFlex>
+ <ListItem :title="statusText" :showArrow="false">
<template #extra>
- <div class="mine-service-detail-view-list-item">{{ '璁㈠崟鐘舵��' }}</div>
+ <div class="mine-service-detail-view-list-item">
+ <slot name="status"> </slot>
+ </div>
</template>
</ListItem>
<ListItem title="鏈嶅姟鏃堕棿" :showArrow="false">
<template #extra>
<div class="mine-service-detail-view-list-item">
- {{ '2025-12-12 12:00-14:00' }}
+ {{ format(beginTime, 'YYYY-MM-DD HH:mm') }}-{{ format(endTime, 'HH:mm') }}
</div>
</template>
</ListItem>
<ListItem title="鏈嶅姟鏈烘瀯" :showArrow="false">
<template #extra>
- <div class="mine-service-detail-view-list-item">{{ 'xxxxx鍏徃' }}</div>
+ <div class="mine-service-detail-view-list-item">{{ supplierEnterpriseName }}</div>
+ </template>
+ </ListItem>
+ <ListItem title="鑱旂郴鐢佃瘽" :showArrow="false" v-if="showServerContactPhoneNumbers">
+ <template #extra>
+ <div class="mine-service-detail-view-list-item">{{ serverContactPhoneNumbers }}</div>
</template>
</ListItem>
<ListItem title="澶囨敞" :showArrow="false">
<template #extra>
- <div class="mine-service-detail-view-list-item">{{ '鎴戞槸澶囨敞淇℃伅' }}</div>
+ <div class="mine-service-detail-view-list-item">{{ remark }}</div>
</template>
</ListItem>
</List>
@@ -54,20 +48,40 @@
</template>
<script setup lang="ts">
-import Taro from '@tarojs/taro';
-import { List, ListItem } from '@12333/components';
+import List from '../List/List.vue';
+import ListItem from '../List/ListItem.vue';
+import ServiceDetailAddressCard from './ServiceDetailAddressCard.vue';
+import ServiceDetailGoodCard from './ServiceDetailGoodCard.vue';
+import { format } from '@12333/utils';
defineOptions({
name: 'MineServiceDetailView',
});
-// type Props = {
+type Props = {
+ contactName?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ /** 鐪佸競鍖�+璇︾粏鍦板潃+闂ㄧ墝鍙� */
+ addressDetail?: string;
+ serviceName?: string;
+ price?: number;
+ specName?: string;
+ specNumber?: number;
+ imgUrl?: string;
+ beginTime?: string;
+ endTime?: string;
+ supplierEnterpriseName?: string;
+ remark?: string;
+ serverContactPhoneNumbers?: string;
+ showServerContactPhoneNumbers?: boolean;
-// }
+ statusText?: string;
+};
-// const props = withDefaults(defineProps<Props>(), {
-
-// })
+const props = withDefaults(defineProps<Props>(), {
+ showServerContactPhoneNumbers: false,
+});
</script>
<style lang="scss">
@@ -79,53 +93,6 @@
margin-bottom: 24px;
background-color: #fff;
border-radius: 12px;
-
- .card-tag-list {
- margin: 6px 0 2px;
- height: 30px;
- overflow: hidden;
- display: flex;
-
- .tag {
- padding: 0 10px;
- border-radius: 2px;
- font-size: 20px;
- height: 30px;
- line-height: 30px;
- color: #999;
- background-color: #f2f2f7;
- margin-right: 10px;
- }
- }
- }
-
- .mine-service-detail-view-address {
- .mine-service-detail-view-title-wrapper {
- display: flex;
- align-items: center;
- margin-bottom: 14px;
-
- .mine-service-detail-view-title {
- flex: 1;
- min-width: 0;
- @include ellipsis;
- font-size: 30px;
- color: boleGetCssVar('text-color', 'primary');
- line-height: 42px;
- }
- }
-
- .mine-service-detail-view-item {
- font-weight: 400;
- @include ellipsis;
- font-size: 24px;
- color: boleGetCssVar('text-color', 'primary');
- line-height: 36px;
-
- & + .mine-service-detail-view-item {
- margin-top: 14px;
- }
- }
}
.mine-service-detail-view-list-item {
@@ -133,6 +100,10 @@
font-size: 28px;
color: boleGetCssVar('text-color', 'secondary');
line-height: 40px;
+ flex: 1;
+ min-width: 0;
+ text-align: right;
+ margin-left: 20px;
}
}
</style>
--
Gitblit v1.10.0