diff --git a/otherPages/myOrdersManage/clock/index.vue b/otherPages/myOrdersManage/clock/index.vue index 2f9de7a..ae18acc 100644 --- a/otherPages/myOrdersManage/clock/index.vue +++ b/otherPages/myOrdersManage/clock/index.vue @@ -225,10 +225,12 @@ onLoad((options) => { orderId.value = options.id || null; isRead.value = options.isRead || false; + itemOrderID.value = options.itemID GetByOrderId() }); const orderId = ref(0) + const itemOrderID = ref(0) const isRead = ref(false) @@ -372,6 +374,7 @@ // 将所有图片数组转换为逗号分隔的字符串 const params = { orderId: orderId.value, + itemOrderId : itemOrderID.value, glovePhoto: fileList.glove?.map(item => item.url).join(',') || '', shoeCoverPhoto: fileList.ShoeCover?.map(item => item.url).join(',') || '', // 合并所有宠物照片 diff --git a/otherPages/myOrdersManage/service/additionalService.vue b/otherPages/myOrdersManage/service/additionalService.vue new file mode 100644 index 0000000..335b3ae --- /dev/null +++ b/otherPages/myOrdersManage/service/additionalService.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/otherPages/myOrdersManage/service/detail.vue b/otherPages/myOrdersManage/service/detail.vue index 1b609b8..c8ddadf 100644 --- a/otherPages/myOrdersManage/service/detail.vue +++ b/otherPages/myOrdersManage/service/detail.vue @@ -59,7 +59,7 @@ 备注信息 - + @@ -77,7 +77,7 @@ 湿粮喂养重量 - + /次(单位:罐) @@ -86,11 +86,11 @@ 湿粮喂养频率 - + - + @@ -135,7 +135,7 @@ 生骨肉喂食说明 - + @@ -153,7 +153,7 @@ 保健品喂养方式 - + @@ -171,7 +171,7 @@ 零食喂养方式 - + @@ -191,7 +191,7 @@ 备注信息 - + @@ -210,7 +210,7 @@ 饮用水添加要求 - + @@ -223,7 +223,7 @@ 备注信息 - + @@ -249,11 +249,11 @@ 猫砂更换频率 - + - + @@ -303,7 +303,7 @@ 备注信息 - + @@ -311,28 +311,206 @@ - + - 附加服务 + 您需要的附加服务 + + + + + + 陪玩 + + + 陪玩用具摆放位置 + + + + + + 您希望的互动方式和要求 + + + + + + + + + + + 活动区吸毛 + + + 吸毛用品摆放位置 + + + + + + 请说明吸毛区域及要求 + + + + + + + + + + + 毛发梳理 + + + 毛发梳理用品摆放位置 + + + + + + 请说明毛发梳理要求(如: 天数,次数等) + + + + + + + + + + + 食具深度清洁 + + + 需深度清洁的用具及消毒剂摆放位置 + + + + + + 请说明食具/饮水机深度清洁要求(如清洁方式、消毒剂使用方式、频率等) + + + + + + + + + + + 喂药上药 + + + 药品摆放位置 + + + + + + 请说明药品使用方式 + + + + + + + + + + + 遛狗服务 + + + 遛狗用品摆放位置 + + + + + + + + + 狗狗雨具位置 + + + + + + 下雨天遛狗要求 + + + + + + + + + + 遛狗时长 + + + + + + + + + + 狗狗行为 + + + + + + + + + + 偏好区域 + + + + + + + + + + 偏好路线 + + + + + - + + - 备注信息 + 附加服务备注 - + - - + + + 上一页 + + {{ currentStep === 2 ? '完成' : '下一页' }} + + + 下一页 + + @@ -361,11 +539,15 @@ onLoad(options) { this.orderId = options.petId this.getPetCareByPetId() + // 如果有指定步骤,则切换到对应步骤 + if (options.step) { + this.currentStep = parseInt(options.step) + } }, methods: { getPetCareByPetId() { getPetCareByPetId(this.orderId).then(res => { - this.detail = res.data + this.detail = res.data || {} }) }, handleImageUrl(url) { @@ -377,6 +559,12 @@ urls: [url] }) }, + // 切换到上一步 + prevStep() { + if (this.currentStep > 0) { + this.currentStep--; + } + }, // 切换到下一步 nextStep() { if (this.currentStep < 2) { diff --git a/pages/myOrdersManage/components/petServicePopup.vue b/pages/myOrdersManage/components/petServicePopup.vue new file mode 100644 index 0000000..d8d59ee --- /dev/null +++ b/pages/myOrdersManage/components/petServicePopup.vue @@ -0,0 +1,145 @@ + + + + + \ No newline at end of file diff --git a/pages/myOrdersManage/components/systemOrder.vue b/pages/myOrdersManage/components/systemOrder.vue index 099daa5..c533cd9 100644 --- a/pages/myOrdersManage/components/systemOrder.vue +++ b/pages/myOrdersManage/components/systemOrder.vue @@ -23,7 +23,7 @@ 订单为系统派发,请确认订单信息后再抢单 - + + +