diff --git a/pages/myOrdersManage/components/orderListByData.vue b/pages/myOrdersManage/components/orderListByData.vue
index a5e44c8..c824f64 100644
--- a/pages/myOrdersManage/components/orderListByData.vue
+++ b/pages/myOrdersManage/components/orderListByData.vue
@@ -18,12 +18,14 @@
- {{ order.time }}
+
- 已完成{{ order.count }}单
- 待上门{{ order.count }}单
+
+ 已完成
+ 待上门
@@ -50,7 +52,7 @@
{{ pet.name }} {{ pet.tag }}
+ class="pet-tag" :class="{'pet-tag-female': pet.gender === 'female', 'pet-tag-male': pet.gender === 'male'}">{{ pet.gender === 'female' ? '♀' : '♂' }}
{{ pet.desc }}
@@ -107,13 +109,34 @@
pets: [{
avatar: 'https://cdn.catmdogd.com/Work/image/work/tx.png',
name: '小咪',
- tag: '猫',
+ gender: 'female',
desc: '中华田园犬(小型犬) | 专业喂养+提前熟悉+陪玩'
},
{
avatar: 'https://cdn.catmdogd.com/Work/image/work/tx.png',
name: 'Billion',
- tag: '狗',
+ gender: 'male',
+ desc: '狗狗(小型狗) | 上门喂养+陪玩'
+ }
+ ]
+ },
+ {
+ time: '12-04',
+ count: 2,
+ status: 'completed', // 已完成状态
+ address: '湖南省长沙市雨花区人民东路',
+ fullAddress: '湖南省长沙市雨花区人民东路88号',
+ isExpanded: true,
+ pets: [{
+ avatar: 'https://cdn.catmdogd.com/Work/image/work/tx.png',
+ name: '小咪',
+ gender: 'female',
+ desc: '中华田园犬(小型犬) | 专业喂养+提前熟悉+陪玩'
+ },
+ {
+ avatar: 'https://cdn.catmdogd.com/Work/image/work/tx.png',
+ name: 'Billion',
+ gender: 'male',
desc: '狗狗(小型狗) | 上门喂养+陪玩'
}
]
@@ -131,7 +154,7 @@
pets: [{
avatar: 'https://cdn.catmdogd.com/Work/image/work/tx.png',
name: '小黑',
- tag: '狗',
+ gender: 'male',
desc: '中华田园犬(小型犬) | 专业喂养+提前熟悉+陪玩'
}]
}]
@@ -148,7 +171,7 @@
pets: [{
avatar: 'https://cdn.catmdogd.com/Work/image/work/tx.png',
name: '小白',
- tag: '猫',
+ gender: 'female',
desc: '中华田园猫 | 专业喂养+提前熟悉+陪玩'
}]
}]
@@ -330,6 +353,14 @@
font-size: 20rpx;
margin-left: 10rpx;
}
+
+ .pet-tag-female {
+ background: #FF6B9A;
+ }
+
+ .pet-tag-male {
+ background: #4A90E2;
+ }
}
.pet-desc {
@@ -356,7 +387,6 @@
margin-top: 20rpx;
}
- \t
/* 时间线样式 */
.timeline-container {