From 41c0cc3e56a0c92f8962631d35069a915bb96f83 Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Wed, 16 Apr 2025 18:24:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=97=A5=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增日订单功能，支持按日期查看订单 - 优化订单管理页面的加载状态和空状态显示 - 调整订单详情页的样式和交互逻辑 - 删除不再使用的CSS和Java文件 --- api/order/order.js | 13 + otherPages/myOrdersManage/clock/index.vue | 13 +- otherPages/myOrdersManage/service/PetCare.java | 306 -- otherPages/myOrdersManage/service/detail.css | 9 - otherPages/myOrdersManage/service/detail.vue | 212 +- otherPages/orderTakingManage/detail/index.css | 500 ++-- otherPages/orderTakingManage/detail/index.min.css | 1 + otherPages/orderTakingManage/detail/index.scss | 251 ++ otherPages/orderTakingManage/detail/index.vue | 74 +- .../workbenchManage/myLevel/commponents/myData.vue | 3 +- otherPages/workbenchManage/myLevel/index.vue | 6 +- .../myOrdersManage/components/petServicePopup.vue | 176 +- pages/myOrdersManage/components/systemOrder.vue | 77 +- pages/myOrdersManage/components/testData.json | 958 ------ .../myOrdersManage/components/timelineService.vue | 245 +- pages/myOrdersManage/dateOrder.json | 3123 ++++++++++++++++++++ pages/myOrdersManage/index.vue | 153 +- pages/orderTakingManage/components/list.vue | 20 +- pages/userManage/index.scss | 2 +- static/images/order/address.png | Bin 0 -> 1884 bytes 20 files changed, 4421 insertions(+), 1721 deletions(-) delete mode 100644 otherPages/myOrdersManage/service/PetCare.java delete mode 100644 otherPages/myOrdersManage/service/detail.css create mode 100644 otherPages/orderTakingManage/detail/index.min.css create mode 100644 otherPages/orderTakingManage/detail/index.scss delete mode 100644 pages/myOrdersManage/components/testData.json create mode 100644 pages/myOrdersManage/dateOrder.json create mode 100644 static/images/order/address.png diff --git a/api/order/order.js b/api/order/order.js index 8210e24..858b8c3 100644 --- a/api/order/order.js +++ b/api/order/order.js @@ -12,6 +12,18 @@ export function getAppOrderList() { }) } +// 获取日订单列表 +export function getOrderDateList(params) { + return request({ + headers: { + "isToken": true + }, + url: "/applet/order/myDateList", + method: 'get', + params + }) +} + // 根据订单id获取打卡详情 export function orderItemLogGetByOrderId(orderId) { return request({ @@ -74,4 +86,5 @@ export default { getOrderPetById, getPetById, getPetCareByPetId, + getOrderDateList, } \ No newline at end of file diff --git a/otherPages/myOrdersManage/clock/index.vue b/otherPages/myOrdersManage/clock/index.vue index ae18acc..0b14209 100644 --- a/otherPages/myOrdersManage/clock/index.vue +++ b/otherPages/myOrdersManage/clock/index.vue @@ -226,11 +226,13 @@ orderId.value = options.id || null; isRead.value = options.isRead || false; itemOrderID.value = options.itemID + serviceId.value = options.serviceId; GetByOrderId() }); const orderId = ref(0) const itemOrderID = ref(0) + const serviceId = ref(0) const isRead = ref(false) @@ -311,7 +313,7 @@ } function GetByOrderId(){ - orderItemLogGetByOrderId(orderId.value) + orderItemLogGetByOrderId(serviceId.value) .then(res => { if(res.code == 200 && res.data) { const data = res.data; @@ -375,6 +377,7 @@ const params = { orderId: orderId.value, itemOrderId : itemOrderID.value, + itemDateId : serviceId.value, glovePhoto: fileList.glove?.map(item => item.url).join(',') || '', shoeCoverPhoto: fileList.ShoeCover?.map(item => item.url).join(',') || '', // 合并所有宠物照片 @@ -420,11 +423,9 @@ icon: 'success' }) // 如果是确认提交（非草稿），则返回上一页 - if(flag) { - setTimeout(() => { - uni.navigateBack() - }, 1500) - } + setTimeout(() => { + uni.navigateBack() + }, 1500) } else { uni.showToast({ title: res.msg || '提交失败', diff --git a/otherPages/myOrdersManage/service/PetCare.java b/otherPages/myOrdersManage/service/PetCare.java deleted file mode 100644 index 3aef1c4..0000000 --- a/otherPages/myOrdersManage/service/PetCare.java +++ /dev/null @@ -1,306 +0,0 @@ -package com.cyl.manager.ums.domain; - -import java.math.BigDecimal; - -import com.ruoyi.common.annotation.Excel; -import lombok.Data; -/** - * 宠物服务档案对象 ums_pet_care - * - * @author daixiande - */ -@Data -public class PetCare { - private static final long serialVersionUID = 1L; - - /** 主键，自增长的ID */ - private Integer id; - - /** 所属宠物ID */ - @Excel(name = "所属宠物ID") - private Integer petId; - - /** 是否包含干粮 */ - @Excel(name = "是否包含干粮") - private Boolean includeDryFood; - - /** 干粮摆放位置-图片 */ - @Excel(name = "干粮摆放位置-图片") - private String dryFoodLocation; - - /** 干粮喂养重量 */ - @Excel(name = "干粮喂养重量") - private String dryFoodFeedWeight; - - /** 干粮喂养批次_天 */ - @Excel(name = "干粮喂养批次_天") - private Integer dryFoodFeedFrequencyDays; - - /** 干粮喂养批次_次 */ - @Excel(name = "干粮喂养批次_次") - private Integer dryFoodFeedFrequencyTimes; - - /** 干粮备注 */ - @Excel(name = "干粮备注") - private String dryFoodRemarks; - - /** 是否包含湿粮 */ - @Excel(name = "是否包含湿粮") - private Boolean includeWetFood; - - /** 湿粮摆放位置-图片 */ - @Excel(name = "湿粮摆放位置-图片") - private String wetFoodLocation; - - /** 湿粮喂养重量 */ - @Excel(name = "湿粮喂养重量") - private BigDecimal wetFoodFeedWeight; - - /** 湿粮喂养批次_天 */ - @Excel(name = "湿粮喂养批次_天") - private Integer wetFoodFeedFrequencyDays; - - /** 湿粮喂养批次_次 */ - @Excel(name = "湿粮喂养批次_次") - private Integer wetFoodFeedFrequencyTimes; - - /** 湿粮备注 */ - @Excel(name = "湿粮备注") - private String wetFoodRemarks; - - /** 是否包含自制食品 */ - @Excel(name = "是否包含自制食品") - private Boolean includeHomemadeFood; - - /** 自制食品摆放位置-图片 */ - @Excel(name = "自制食品摆放位置-图片") - private String homemadeFoodLocation; - - /** 自制饭制作和喂食说明（备注） */ - @Excel(name = "自制饭制作和喂食说明", readConverterExp = "备=注") - private String homemadeFoodInstructions; - - /** 是否包含生骨肉 */ - @Excel(name = "是否包含生骨肉") - private Boolean includeRawMeat; - - /** 生骨肉摆放位置-图片 */ - @Excel(name = "生骨肉摆放位置-图片") - private String rawMeatLocation; - - /** 生骨肉喂食说明（备注） */ - @Excel(name = "生骨肉喂食说明", readConverterExp = "备=注") - private String rawMeatFeedingInstructions; - - /** 是否包含保健品 */ - @Excel(name = "是否包含保健品") - private Boolean includeHealthSupplements; - - /** 保健品摆放位置-图片 */ - @Excel(name = "保健品摆放位置-图片") - private String healthSupplementsLocation; - - /** 保健品喂食说明（备注） */ - @Excel(name = "保健品喂食说明", readConverterExp = "备=注") - private String healthSupplementsFeedingInstructions; - - /** 是否包含零食 */ - @Excel(name = "是否包含零食") - private Boolean includeSnacks; - - /** 零食摆放位置-图片 */ - @Excel(name = "零食摆放位置-图片") - private String snacksLocation; - - /** 零食喂养方式（备注） */ - @Excel(name = "零食喂养方式", readConverterExp = "备=注") - private String snacksFeedingMethod; - - /** 零食备注 */ - @Excel(name = "其它备注") - private String otherRemark; - - /** 食盆/自动喂食器摆放位置-图片 */ - @Excel(name = "食盆/自动喂食器摆放位置-图片") - private String feedingTrayAutomaticFeederLocation; - - /** 食盆/自动喂食器备注 */ - @Excel(name = "食盆/自动喂食器备注") - private String feedingTrayAutomaticFeederRemarks; - - /** 水碗、饮用水摆放位置-图片 */ - @Excel(name = "水碗、饮用水摆放位置-图片") - private String waterBowlLocation; - - /** 水碗、饮用水备注 */ - @Excel(name = "水碗、饮用水备注") - private String waterBowlRemarks; - - /** 是否有清洁要求 */ - @Excel(name = "是否有清洁要求") - private Boolean cleaningRequirements; - - - /** 是否更换猫砂 */ - @Excel(name = "厕所、猫砂摆放位置-图片") - private Boolean changeLitterBox; - - /** 厕所、猫砂摆放位置-图片 */ - @Excel(name = "厕所、猫砂摆放位置-图片") - private String litterBoxLocation; - - /** 猫砂更换频次_天 */ - @Excel(name = "猫砂更换频次_天") - private Integer litterBoxChangeFrequencyDays; - - /** 猫砂更换频次_次 */ - @Excel(name = "猫砂更换频次_次") - private Integer litterBoxChangeFrequencyTimes; - - /** 厕所、猫砂备注 */ - @Excel(name = "厕所、猫砂备注") - private String litterBoxRemarks; - - /** 尿垫摆放位置-图片 */ - @Excel(name = "尿垫摆放位置-图片") - private String peePadLocation; - - /** 是否更换尿垫 */ - @Excel(name = "是否更换尿垫") - private Boolean changePeePad; - - /** 尿垫砂更换频次_天 */ - @Excel(name = "尿垫更换频次_天") - private Integer peePadFrequencyDays; - - /** 尿垫更换频次_次 */ - @Excel(name = "尿垫更换频次_次") - private Integer peePadFrequencyTimes; - - - /** 尿垫备注 */ - @Excel(name = "尿垫备注") - private String peePadRemarks; - - /** 是否选择附加服务 */ - @Excel(name = "是否选择附加服务") - private Boolean additionalService; - - /** 是否陪玩*/ - @Excel(name = "是否陪玩") - private Boolean playtimeService; - - /** 陪玩用具摆放位置-图片 */ - @Excel(name = "陪玩用具摆放位置-图片") - private String playtimeToolsLocation; - - /** 希望的互动方式和要求（备注） */ - @Excel(name = "希望的互动方式和要求", readConverterExp = "备=注") - private String playtimeRequirements; - - /** 是否选择活动区吸毛 */ - @Excel(name = "是否选择活动区吸毛") - private Boolean furCleaningService; - - /** 吸毛用品摆放位置-图片 */ - @Excel(name = "吸毛用品摆放位置-图片") - private String furCleaningToolsLocation; - - /** 请说明吸毛区和要求（备注） */ - @Excel(name = "请说明吸毛区和要求", readConverterExp = "备=注") - private String furCleaningRequirements; - - /** 是否选择毛发梳理 */ - @Excel(name = "是否选择毛发梳理") - private Boolean groomingService; - - /** 毛发梳理用品摆放位置-图片 */ - @Excel(name = "毛发梳理用品摆放位置-图片") - private String groomingToolsLocation; - - /** 请说明毛发梳理要求（备注） */ - @Excel(name = "请说明毛发梳理要求", readConverterExp = "备=注") - private String groomingRequirements; - - /** 是否选择食具深度清洁 */ - @Excel(name = "是否选择食具深度清洁") - private Boolean deepCleaningService; - - /** 食具深度清洁用品摆放位置-图片 */ - @Excel(name = "食具深度清洁用品摆放位置-图片") - private String deepCleaningToolsLocation; - - /** 食具深度清洁备注 */ - @Excel(name = "食具深度清洁备注") - private String deepCleaningRemarks; - - /** 是否选择喂药上药 */ - @Excel(name = "是否选择喂药上药") - private Boolean administerMedication; - - /** 药品摆放位置-图片 */ - @Excel(name = "药品摆放位置-图片") - private String administerMedicationLocation; - - /** 喂药上药备注 */ - @Excel(name = "喂药上药备注") - private String administerMedicationRemarks; - - /** 附加服务用品摆放位置-图片 */ - @Excel(name = "附加服务用品摆放位置-图片") - private String additionalServicesPlacement; - - /** 服务用品摆放备注 */ - @Excel(name = "服务用品摆放备注") - private String additionalServicesPlacementRemark; - - /** 服务用品摆放备注 */ - @Excel(name = "附加服务备注") - private String additionalServicesRemarks; - - @Excel(name = "遛狗时长") - private Boolean isWalkDogDuration; - - @Excel(name = "狗狗行为") - private Boolean isDogBehavior; - - @Excel(name = "偏好区域") - private Boolean isFavoriteRegion; - - @Excel(name = "偏好路线") - private Boolean isFavoriteRoute; - - @Excel(name = "狗狗雨具位置") - private String dogRainGearLocation; - - @Excel(name = "下雨天遛狗要求") - private String walkDogRainRemark; - - /** 是否遛狗服务 */ - @Excel(name = "是否遛狗服务") - private Boolean walkDog; - - /** 遛狗用品摆放位置 */ - @Excel(name = "遛狗用品摆放位置") - private String walkDogToolsLocation; - - /** 是否雨天遛狗 */ - @Excel(name = "是否雨天遛狗") - private Boolean walkDogRainyDay; - - /** 遛狗时长 */ - @Excel(name = "遛狗时长") - private String walkDogDuration; - - /** 狗狗行为 */ - @Excel(name = "狗狗行为") - private String dogBehavior; - - /** 偏好区域 */ - @Excel(name = "偏好区域") - private String favoriteRegion; - - /** 偏好路线 */ - @Excel(name = "偏好路线") - private String favoriteRoute; -} diff --git a/otherPages/myOrdersManage/service/detail.css b/otherPages/myOrdersManage/service/detail.css deleted file mode 100644 index 794925a..0000000 --- a/otherPages/myOrdersManage/service/detail.css +++ /dev/null @@ -1,9 +0,0 @@ -.box { - width: 100vw; - height: 100vh; - padding: 0 20rpx; -} - -.box-size { - box-sizing: border-box; -} \ No newline at end of file diff --git a/otherPages/myOrdersManage/service/detail.vue b/otherPages/myOrdersManage/service/detail.vue index c8ddadf..1caebca 100644 --- a/otherPages/myOrdersManage/service/detail.vue +++ b/otherPages/myOrdersManage/service/detail.vue @@ -3,26 +3,31 @@ - + - - - + " --> + + + + 本次喂养过程中，您需要喂养的食品包括 + + + 暂无喂养食品 + 干粮(主粮、冻干等) @@ -31,7 +36,13 @@ 干粮摆放位置 - + + + + 暂无图片 + 干粮喂养重量 @@ -71,7 +82,13 @@ 湿粮摆放位置 - + + + + 暂无图片 + 湿粮喂养重量 @@ -111,7 +128,13 @@ 自制食品摆放位置 - + + + + 暂无图片 + 自制饭制作和喂食说明 @@ -129,7 +152,13 @@ 生骨肉摆放位置 - + + + + 暂无图片 + 生骨肉喂食说明 @@ -147,7 +176,13 @@ 保健品摆放位置 - + + + + 暂无图片 + 保健品喂养方式 @@ -165,7 +200,13 @@ 零食摆放位置 - + + + + 暂无图片 + 零食喂养方式 @@ -185,7 +226,13 @@ 喂食器具摆放位置 - + + + + 暂无图片 + 备注信息 @@ -204,7 +251,13 @@ 饮用水摆放位置 - + + + + 暂无图片 + 饮用水添加要求 @@ -235,6 +288,10 @@ 您需要的清洁内容 + + + 暂无清洁内容 + 猫砂 @@ -243,7 +300,13 @@ 猫砂摆放位置 - + + + + 暂无图片 + 猫砂更换频率 @@ -275,7 +338,13 @@ 尿垫摆放位置 - + + + + 暂无图片 + 更换尿垫 @@ -311,10 +380,14 @@ - + 您需要的附加服务 + + + 暂无附加服务 + @@ -325,7 +398,13 @@ 陪玩用具摆放位置 - + + + + 暂无图片 + 您希望的互动方式和要求 @@ -345,7 +424,13 @@ 吸毛用品摆放位置 - + + + + 暂无图片 + 请说明吸毛区域及要求 @@ -365,7 +450,13 @@ 毛发梳理用品摆放位置 - + + + + 暂无图片 + 请说明毛发梳理要求(如: 天数,次数等) @@ -385,7 +476,13 @@ 需深度清洁的用具及消毒剂摆放位置 - + + + + 暂无图片 + 请说明食具/饮水机深度清洁要求(如清洁方式、消毒剂使用方式、频率等) @@ -581,4 +678,77 @@ \ No newline at end of file diff --git a/otherPages/orderTakingManage/detail/index.css b/otherPages/orderTakingManage/detail/index.css index 4c7f889..f4a45a2 100644 --- a/otherPages/orderTakingManage/detail/index.css +++ b/otherPages/orderTakingManage/detail/index.css @@ -1,248 +1,252 @@ - .box { - width: 100vw; - height: 100vh; - background-color: #F5F5F5; - padding: 2% 3% 0 3%; - } - - .box-size { - box-sizing: border-box; - } - - .level { - display: flex; - } - - /* 垂直、水平居中 */ - .vertically_center { - display: grid; - place-items: center; - } - - .top { - width: 710rpx; - height: 176rpx; - background-color: #FFFFFF; - padding: 1% 2%; - font-size: 22rpx; - display: grid; - justify-content: space-between; - } - - .top_left { - width: 520rpx; - height: auto; - display: flex; - justify-content: space-between; - padding-top: 20rpx; - - } - - .text1 { - color: #FF2A2A; - font-size: 25rpx; - } - - .top_bottom { - /* background-color: aqua; */ - margin-left: 10rpx; - color: #999999; - } - - .top-button { - width: 132rpx; - height: 54rpx; - border: 1rpx solid #FFBF60; - color: #FFBF60; - display: grid; - justify-content: center; - line-height: 54rpx; - position: absolute; - top: 30rpx; - right: 30rpx; - } - - .information { - width: 710rpx; - height: 300rpx; - background-color: #FFFFFF; - /* background-color: pink; */ - margin-top: 2%; - padding: 0 3%; - } - - .time { - width: 650rpx; - /* background-color: gray; */ - padding: 0 2%; - margin-top: 50rpx; - display: flex; - justify-content: space-between; - } - - .service { - width: 710rpx; - height: auto; - background-color: #FFFFFF; - margin-top: 2%; - padding: 0 3% 3% 3%; - } - - .horizontal_distribution { - display: flex; - justify-content: space-between; - } - - .flex { - display: flex; - } - - .service_top { - width: 670rpx; - } - - .text2 { - width: auto; - height: 20rpx; - margin-top: 45rpx; - font-size: 22rpx; - color: #999999; - } - - .pet_information { - width: 670rpx; - height: auto; - /* background-color: pink; */ - padding: 5% 0 0 3%; - } - - .pet_item { - color: #999999; - font-size: 28rpx; - } - - .img image { - width: 140rpx; - height: 140rpx; - border-radius: 100rpx; - margin-right: 20rpx; - } - - .name { - margin-bottom: 15rpx; - } - - .name image { - width: 35rpx; - height: 35rpx; - border-radius: 35rpx; - background-color: red; - margin-left: 15rpx; - } - - .name_text { - color: #000 !important; - font-size: 30rpx !important; - } - - .pet- { - height: 40rpx; - line-height: 40rpx; - color: #999999; - font-size: 28rpx; - margin: 20rpx 0 20rpx 0; - } - - .pet- text { - margin: 0 8rpx 0 30rpx; - color: #000; - } - - .money_total { - width: 670rpx; - height: 45rpx; - /* background-color: pink; */ - margin: 60rpx 0 20rpx 0; - justify-content: space-between; - font-size: 30rpx; - } - - .money_text { - color: red !important; - font-size: 34rpx !important; - } - - .other_information { - width: 710rpx; - height: 350rpx; - background-color: #FFFFFF; - /* background-color: pink; */ - margin-top: 20rpx; - padding: 0 1% 0 3%; - } - - .text3 { - margin: 40rpx 15rpx 0 15rpx; - } - - .bottom { - width: 100vw; - height: 163rpx; - background-color: #FFFFFF; - margin-top: 20rpx; - position: relative; - } - - .bottom_button { - width: 594rpx; - height: 94rpx; - background-color: #FFBF60; - color: #FFFFFF; - font-size: 30rpx; - line-height: 94rpx; - justify-content: center; - position: absolute; - top: 19%; - left: 11%; - } - - .success { - width: 310rpx; - height: 370rpx; - background-color: #FFFFFF; - } - - .pop_top { - width: 310rpx; - height: 100rpx; - background-image: linear-gradient(to bottom, #FFBF60, #FFD494) - } - - .code { - width: 250rpx; - height: 50rpx; - background-color: #F3F3F3; - margin: 30rpx 0 0 30rpx; - } - - .pop_image { - display: grid; - place-items: center; - margin-top: 20rpx; - } - - .copy { - width: 260rpx; - height: 50rpx; - background-color: #FFBF60; - margin: 30rpx 0 0 25rpx; - } - - .cancel { - width: 40rpx; - height: 40rpx; - background-color: #FFFFFF; - position: absolute; - top: -20rpx; - right: -17rpx; - } \ No newline at end of file +@charset "UTF-8"; +.box { + width: 100vw; + height: 100vh; + background-color: #F5F5F5; + padding: 2% 3% 0 3%; +} + +.box-size { + box-sizing: border-box; +} + +.level { + display: flex; +} + +/* 垂直、水平居中 */ +.vertically_center { + display: grid; + place-items: center; +} + +.top { + width: 710rpx; + height: 176rpx; + background-color: #FFFFFF; + padding: 1% 2%; + font-size: 22rpx; + display: grid; + justify-content: space-between; +} + +.top_left { + width: 520rpx; + height: auto; + display: flex; + justify-content: space-between; + padding-top: 20rpx; +} + +.text1 { + color: #FF2A2A; + font-size: 25rpx; +} + +.top_bottom { + /* background-color: aqua; */ + margin-left: 10rpx; + color: #999999; +} + +.top-button { + width: 132rpx; + height: 54rpx; + border: 1rpx solid #FFBF60; + color: #FFBF60; + display: grid; + justify-content: center; + line-height: 54rpx; + position: absolute; + top: 30rpx; + right: 30rpx; +} + +.information { + width: 710rpx; + background-color: #FFFFFF; + /* background-color: pink; */ + margin-top: 10rpx; + padding: 10rpx 10rpx; +} + +.time { + width: 660rpx; + /* background-color: gray; */ + padding: 0 2%; + margin-top: 50rpx; + display: flex; + justify-content: space-between; + align-items: center; +} + +.time .time-content { + width: 500rpx; +} + +.service { + width: 710rpx; + height: auto; + background-color: #FFFFFF; + margin-top: 2%; + padding: 0 3% 3% 3%; +} + +.horizontal_distribution { + display: flex; + justify-content: space-between; +} + +.flex { + display: flex; +} + +.service_top { + width: 670rpx; +} + +.text2 { + width: auto; + height: 20rpx; + margin-top: 45rpx; + font-size: 22rpx; + color: #999999; +} + +.pet_information { + width: 670rpx; + height: auto; + /* background-color: pink; */ + padding: 5% 0 0 3%; +} + +.pet_item { + color: #999999; + font-size: 28rpx; +} + +.img image { + width: 140rpx; + height: 140rpx; + border-radius: 100rpx; + margin-right: 20rpx; +} + +.name { + margin-bottom: 15rpx; +} + +.name image { + width: 35rpx; + height: 35rpx; + border-radius: 35rpx; + background-color: red; + margin-left: 15rpx; +} + +.name_text { + color: #000 !important; + font-size: 30rpx !important; +} + +.pet- { + height: 40rpx; + line-height: 40rpx; + color: #999999; + font-size: 28rpx; + margin: 20rpx 0 20rpx 0; +} + +.pet- text { + margin: 0 8rpx 0 30rpx; + color: #000; +} + +.money_total { + width: 670rpx; + height: 45rpx; + /* background-color: pink; */ + margin: 60rpx 0 20rpx 0; + justify-content: space-between; + font-size: 30rpx; +} + +.money_text { + color: red !important; + font-size: 34rpx !important; +} + +.other_information { + width: 710rpx; + height: 350rpx; + background-color: #FFFFFF; + /* background-color: pink; */ + margin-top: 20rpx; + padding: 0 1% 0 3%; +} + +.text3 { + margin: 40rpx 15rpx 0 15rpx; +} + +.bottom { + width: 100vw; + height: 163rpx; + background-color: #FFFFFF; + margin-top: 20rpx; + position: relative; +} + +.bottom_button { + width: 594rpx; + height: 94rpx; + background-color: #FFBF60; + color: #FFFFFF; + font-size: 30rpx; + line-height: 94rpx; + justify-content: center; + position: absolute; + top: 19%; + left: 11%; +} + +.success { + width: 310rpx; + height: 370rpx; + background-color: #FFFFFF; +} + +.pop_top { + width: 310rpx; + height: 100rpx; + background-image: linear-gradient(to bottom, #FFBF60, #FFD494); +} + +.code { + width: 250rpx; + height: 50rpx; + background-color: #F3F3F3; + margin: 30rpx 0 0 30rpx; +} + +.pop_image { + display: grid; + place-items: center; + margin-top: 20rpx; +} + +.copy { + width: 260rpx; + height: 50rpx; + background-color: #FFBF60; + margin: 30rpx 0 0 25rpx; +} + +.cancel { + width: 40rpx; + height: 40rpx; + background-color: #FFFFFF; + position: absolute; + top: -20rpx; + right: -17rpx; +} diff --git a/otherPages/orderTakingManage/detail/index.min.css b/otherPages/orderTakingManage/detail/index.min.css new file mode 100644 index 0000000..6fe2d99 --- /dev/null +++ b/otherPages/orderTakingManage/detail/index.min.css @@ -0,0 +1 @@ +.box{width:100vw;height:100vh;background-color:#F5F5F5;padding:2% 3% 0 3%}.box-size{box-sizing:border-box}.level{display:flex}.vertically_center{display:grid;place-items:center}.top{width:710rpx;height:176rpx;background-color:#FFFFFF;padding:1% 2%;font-size:22rpx;display:grid;justify-content:space-between}.top_left{width:520rpx;height:auto;display:flex;justify-content:space-between;padding-top:20rpx}.text1{color:#FF2A2A;font-size:25rpx}.top_bottom{margin-left:10rpx;color:#999999}.top-button{width:132rpx;height:54rpx;border:1rpx solid #FFBF60;color:#FFBF60;display:grid;justify-content:center;line-height:54rpx;position:absolute;top:30rpx;right:30rpx}.information{width:710rpx;background-color:#FFFFFF;margin-top:10rpx;padding:10rpx 10rpx}.time{width:660rpx;padding:0 2%;margin-top:50rpx;display:flex;justify-content:space-between;align-items:center}.time .time-content{width:500rpx}.service{width:710rpx;height:auto;background-color:#FFFFFF;margin-top:2%;padding:0 3% 3% 3%}.horizontal_distribution{display:flex;justify-content:space-between}.flex{display:flex}.service_top{width:670rpx}.text2{width:auto;height:20rpx;margin-top:45rpx;font-size:22rpx;color:#999999}.pet_information{width:670rpx;height:auto;padding:5% 0 0 3%}.pet_item{color:#999999;font-size:28rpx}.img image{width:140rpx;height:140rpx;border-radius:100rpx;margin-right:20rpx}.name{margin-bottom:15rpx}.name image{width:35rpx;height:35rpx;border-radius:35rpx;background-color:red;margin-left:15rpx}.name_text{color:#000 !important;font-size:30rpx !important}.pet-{height:40rpx;line-height:40rpx;color:#999999;font-size:28rpx;margin:20rpx 0 20rpx 0}.pet- text{margin:0 8rpx 0 30rpx;color:#000}.money_total{width:670rpx;height:45rpx;margin:60rpx 0 20rpx 0;justify-content:space-between;font-size:30rpx}.money_text{color:red !important;font-size:34rpx !important}.other_information{width:710rpx;height:350rpx;background-color:#FFFFFF;margin-top:20rpx;padding:0 1% 0 3%}.text3{margin:40rpx 15rpx 0 15rpx}.bottom{width:100vw;height:163rpx;background-color:#FFFFFF;margin-top:20rpx;position:relative}.bottom_button{width:594rpx;height:94rpx;background-color:#FFBF60;color:#FFFFFF;font-size:30rpx;line-height:94rpx;justify-content:center;position:absolute;top:19%;left:11%}.success{width:310rpx;height:370rpx;background-color:#FFFFFF}.pop_top{width:310rpx;height:100rpx;background-image:linear-gradient(to bottom, #FFBF60, #FFD494)}.code{width:250rpx;height:50rpx;background-color:#F3F3F3;margin:30rpx 0 0 30rpx}.pop_image{display:grid;place-items:center;margin-top:20rpx}.copy{width:260rpx;height:50rpx;background-color:#FFBF60;margin:30rpx 0 0 25rpx}.cancel{width:40rpx;height:40rpx;background-color:#FFFFFF;position:absolute;top:-20rpx;right:-17rpx} diff --git a/otherPages/orderTakingManage/detail/index.scss b/otherPages/orderTakingManage/detail/index.scss new file mode 100644 index 0000000..483d90a --- /dev/null +++ b/otherPages/orderTakingManage/detail/index.scss @@ -0,0 +1,251 @@ + .box { + width: 100vw; + height: 100vh; + background-color: #F5F5F5; + padding: 2% 3% 0 3%; + } + + .box-size { + box-sizing: border-box; + } + + .level { + display: flex; + } + + /* 垂直、水平居中 */ + .vertically_center { + display: grid; + place-items: center; + } + + .top { + width: 710rpx; + height: 176rpx; + background-color: #FFFFFF; + padding: 1% 2%; + font-size: 22rpx; + display: grid; + justify-content: space-between; + } + + .top_left { + width: 520rpx; + height: auto; + display: flex; + justify-content: space-between; + padding-top: 20rpx; + + } + + .text1 { + color: #FF2A2A; + font-size: 25rpx; + } + + .top_bottom { + /* background-color: aqua; */ + margin-left: 10rpx; + color: #999999; + } + + .top-button { + width: 132rpx; + height: 54rpx; + border: 1rpx solid #FFBF60; + color: #FFBF60; + display: grid; + justify-content: center; + line-height: 54rpx; + position: absolute; + top: 30rpx; + right: 30rpx; + } + + .information { + width: 710rpx; + background-color: #FFFFFF; + /* background-color: pink; */ + margin-top: 10rpx; + padding: 10rpx 10rpx; + } + + .time { + width: 660rpx; + /* background-color: gray; */ + padding: 0 2%; + margin-top: 50rpx; + display: flex; + justify-content: space-between; + align-items: center; + .time-content{ + width: 500rpx; + } + } + + .service { + width: 710rpx; + height: auto; + background-color: #FFFFFF; + margin-top: 2%; + padding: 0 3% 3% 3%; + } + + .horizontal_distribution { + display: flex; + justify-content: space-between; + } + + .flex { + display: flex; + } + + .service_top { + width: 670rpx; + } + + .text2 { + width: auto; + height: 20rpx; + margin-top: 45rpx; + font-size: 22rpx; + color: #999999; + } + + .pet_information { + width: 670rpx; + height: auto; + /* background-color: pink; */ + padding: 5% 0 0 3%; + } + + .pet_item { + color: #999999; + font-size: 28rpx; + } + + .img image { + width: 140rpx; + height: 140rpx; + border-radius: 100rpx; + margin-right: 20rpx; + } + + .name { + margin-bottom: 15rpx; + } + + .name image { + width: 35rpx; + height: 35rpx; + border-radius: 35rpx; + background-color: red; + margin-left: 15rpx; + } + + .name_text { + color: #000 !important; + font-size: 30rpx !important; + } + + .pet- { + height: 40rpx; + line-height: 40rpx; + color: #999999; + font-size: 28rpx; + margin: 20rpx 0 20rpx 0; + } + + .pet- text { + margin: 0 8rpx 0 30rpx; + color: #000; + } + + .money_total { + width: 670rpx; + height: 45rpx; + /* background-color: pink; */ + margin: 60rpx 0 20rpx 0; + justify-content: space-between; + font-size: 30rpx; + } + + .money_text { + color: red !important; + font-size: 34rpx !important; + } + + .other_information { + width: 710rpx; + height: 350rpx; + background-color: #FFFFFF; + /* background-color: pink; */ + margin-top: 20rpx; + padding: 0 1% 0 3%; + } + + .text3 { + margin: 40rpx 15rpx 0 15rpx; + } + + .bottom { + width: 100vw; + height: 163rpx; + background-color: #FFFFFF; + margin-top: 20rpx; + position: relative; + } + + .bottom_button { + width: 594rpx; + height: 94rpx; + background-color: #FFBF60; + color: #FFFFFF; + font-size: 30rpx; + line-height: 94rpx; + justify-content: center; + position: absolute; + top: 19%; + left: 11%; + } + + .success { + width: 310rpx; + height: 370rpx; + background-color: #FFFFFF; + } + + .pop_top { + width: 310rpx; + height: 100rpx; + background-image: linear-gradient(to bottom, #FFBF60, #FFD494) + } + + .code { + width: 250rpx; + height: 50rpx; + background-color: #F3F3F3; + margin: 30rpx 0 0 30rpx; + } + + .pop_image { + display: grid; + place-items: center; + margin-top: 20rpx; + } + + .copy { + width: 260rpx; + height: 50rpx; + background-color: #FFBF60; + margin: 30rpx 0 0 25rpx; + } + + .cancel { + width: 40rpx; + height: 40rpx; + background-color: #FFFFFF; + position: absolute; + top: -20rpx; + right: -17rpx; + } \ No newline at end of file diff --git a/otherPages/orderTakingManage/detail/index.vue b/otherPages/orderTakingManage/detail/index.vue index 7b0e005..ff4cb59 100644 --- a/otherPages/orderTakingManage/detail/index.vue +++ b/otherPages/orderTakingManage/detail/index.vue @@ -44,7 +44,7 @@ 服务日期 - + {{ getTextList().join('，') }} @@ -54,7 +54,7 @@ 服务地址 - + {{ orderDetail.order?.address }} @@ -71,7 +71,9 @@ - + @@ -171,8 +173,8 @@ - - 点击确定 + + {{ confirmStatus[0] ? '已确认' : '点击确定' }} @@ -187,8 +189,8 @@ - - 点击确定 + + {{ confirmStatus[1] ? '已确认' : '点击确定' }} @@ -205,8 +207,8 @@ - - 点击确定 + + {{ confirmStatus[2] ? '已确认' : '点击确定' }} @@ -281,6 +283,7 @@ const showOrderSuccess = ref(false); const value = ref("45619491656") const petList = ref([]) + const confirmStatus = ref([false, false, false]); // 添加确认状态数组，分别对应三个确认项 const userInfo = computed(() => { return store.getters.userInfo }) @@ -330,8 +333,15 @@ showOrderSuccess.value = true; }; + // 处理确认按钮点击事件 + const handleConfirm = (index) => { + confirmStatus.value[index] = true; + } + const conform = async () => { close(); + // 重置确认状态 + confirmStatus.value = [false, false, false]; let response = await startByOrderId({ id: orderId.value, userId: userInfo.value.userId @@ -383,13 +393,29 @@ let orderService = orderServiceList.filter(service => service.petId == petId) - return productList - .filter(product => orderService.filter(service => service.id == product.orderServiceId).length > 0) - .map(product => { + // return productList + // .filter(product => orderService.filter(service => service.id == product.orderServiceId).length > 0) + // .map(product => { + // return { + // time : dayjs(orderService.filter(service => service.id == product.orderServiceId) + // .serviceDate).format('MM-DD'), + // name : product.productName, + // } + // }) + + return orderService.map(item => { + + let name = '' + + productList.forEach(product => { + if(item.id == product.orderServiceId){ + name = product.productName + } + }) + return { - time : dayjs(orderService.filter(service => service.id == product.orderServiceId) - .serviceDate).format('MM-DD'), - name : product.productName, + time : dayjs(item.serviceDate).format('MM-DD'), + name, } }) } @@ -399,6 +425,12 @@ .orderServiceList.map(item => dayjs(item.serviceDate).format('MM-DD')) } + + const toDetail = (id) => { + uni.navigateTo({ + url: `/otherPages/orderTakingManage/pet/detail?id=${id}` + }) + } \ No newline at end of file diff --git a/otherPages/workbenchManage/myLevel/commponents/myData.vue b/otherPages/workbenchManage/myLevel/commponents/myData.vue index e7aaa3f..6ada2ac 100644 --- a/otherPages/workbenchManage/myLevel/commponents/myData.vue +++ b/otherPages/workbenchManage/myLevel/commponents/myData.vue @@ -31,7 +31,8 @@ import cardData from '../../components/cardData.vue' import { ref, - reactive + reactive, + computed, } from "vue" import { useStore } from 'vuex' diff --git a/otherPages/workbenchManage/myLevel/index.vue b/otherPages/workbenchManage/myLevel/index.vue index 4496422..b9f4449 100644 --- a/otherPages/workbenchManage/myLevel/index.vue +++ b/otherPages/workbenchManage/myLevel/index.vue @@ -1,8 +1,10 @@