diff --git a/pages_order/components/order/ServiceRemarks.vue b/pages_order/components/order/ServiceRemarks.vue index 70cfa83..609d4be 100644 --- a/pages_order/components/order/ServiceRemarks.vue +++ b/pages_order/components/order/ServiceRemarks.vue @@ -14,9 +14,9 @@ 是否提前熟悉 - + @@ -66,7 +66,7 @@ type: Object, default: () => ({ keyHandoverMethod: '存于快递柜', - isAdvanceFamiliar: true, + isAdvanceFamiliar: false, priceInfo: '价格40元/次', serviceContent: '服务内容: 购买此服务后,伴宠师将在您需要前,按照约定时间提前上门为您照顾宠物', serviceCondition: '服务保障: 购买此服务后,平台支付在提前熟悉店,上门服务第一天前,充电由客服联系您预约一次', diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue index 15c5f40..b72458d 100644 --- a/pages_order/order/orderDetail.vue +++ b/pages_order/order/orderDetail.vue @@ -141,12 +141,39 @@ console.error('解析商品附加数据失败', e); } + // 获取对应的宠物信息 + const pet = data.petVOList && data.petVOList[index] ? { + name: data.petVOList[index].name, + avatar: data.petVOList[index].photo + } : null; + + // 生成模拟的定制服务数据 + const customServices = [ + // { + // name: '基础护理', + // price: 50, + // quantity: 2 + // }, + // { + // name: '美容服务', + // price: 100, + // quantity: 1 + // }, + // { + // name: '特殊护理', + // price: 80, + // quantity: 1 + // } + ]; + return { id: index + 1, name: item.productName, price: item.salePrice, quantity: item.quantity, - customServices: [] + pet: pet ? pet.name : null, + petAvatar: pet ? pet.avatar : null, + customServices: customServices }; }),