From 4c4b85bda47a27d6632e9b9b40efed6401a4e4cd Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Sat, 29 Jun 2024 17:15:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/my/cikarDrtail.vue | 4 ++-- pages/my/fuwuliaochengDetail.vue | 18 +++++++++++++----- pages/my/myCiLiaoDetail.vue | 13 +++++++++++-- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/pages/my/cikarDrtail.vue b/pages/my/cikarDrtail.vue index 8de6391..bf0ecd4 100644 --- a/pages/my/cikarDrtail.vue +++ b/pages/my/cikarDrtail.vue @@ -21,7 +21,7 @@ - + ￥ {{mainData.price}} @@ -1218,7 +1218,7 @@ width: 100%; display: flex; flex-direction: row; - align-items: center; + align-items: baseline; margin-top: 5rpx; } .header-bottom-title-num span{ diff --git a/pages/my/fuwuliaochengDetail.vue b/pages/my/fuwuliaochengDetail.vue index 9769b2e..bc14a32 100644 --- a/pages/my/fuwuliaochengDetail.vue +++ b/pages/my/fuwuliaochengDetail.vue @@ -21,14 +21,14 @@ - + ￥ {{mainData.price}} - /元套 + 元/疗程 - ￥{{mainData.oldPrice}} + ￥{{mainData.oldPrice}}/次 @@ -1185,7 +1185,6 @@ .header-bottom-money-jia{ font-size: 28rpx; color: #848484; - line-height: 37rpx; margin-left: 5px; } .header-bottom-money-zhen span{ @@ -1215,7 +1214,7 @@ margin-top:5px; } .header-bottom-money{ - padding: 5px 15px; + padding: 5px 0; width: 100%; display: flex; flex-direction: row; @@ -1223,6 +1222,15 @@ justify-content: space-between; margin-top: 5rpx; } + .header-bottom-money1{ + padding: 5px 0; + width: 100%; + display: flex; + flex-direction: row; + align-items: center; + margin-top: 5rpx; + align-items: baseline; + } .header-bottom-title-num span{ font-size: 25rpx; } diff --git a/pages/my/myCiLiaoDetail.vue b/pages/my/myCiLiaoDetail.vue index 9fb5b73..98885c4 100644 --- a/pages/my/myCiLiaoDetail.vue +++ b/pages/my/myCiLiaoDetail.vue @@ -21,7 +21,7 @@ - + ￥ {{getList.price}} @@ -521,7 +521,7 @@ line-height: 37rpx; margin-left: 5px; } -.header-bottom-money-zhen span{ + .header-bottom-money-zhen span{ color: #F95900; } .header-bottom-money-zhen span:nth-child(1){ @@ -554,6 +554,15 @@ flex-direction: row; align-items: center; margin-top: 5rpx; + justify-content: space-between; + } + .header-bottom-money1{ + padding: 5px 0; + width: 100%; + display: flex; + flex-direction: row; + align-items: center; + margin-top: 5rpx; } .header-bottom-title-num span{ font-size: 30rpx; From 06c256cb555f50636e27ff1f1cdf64d857c43339 Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Sat, 29 Jun 2024 17:55:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- my/order/payShengji.vue | 54 ++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue index 41f2f02..5877489 100644 --- a/my/order/payShengji.vue +++ b/my/order/payShengji.vue @@ -15,7 +15,7 @@ - + {{order.oldEntryName}} @@ -58,21 +58,21 @@ - - 下单人 - + + 下单人 + {{order.userName}} - - 联系方式 - + + 联系方式 + {{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}} - - 服务地址 - {{order.address}} + + 服务地址 + {{order.address}} @@ -91,7 +91,7 @@ @click="bindphone(order.artificer.phone)"> --> - {{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}} + {{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}} @@ -1834,7 +1834,10 @@ background: linear-gradient(90deg, #019C88, #28BA92, #35C495); } .zhuangtai{ + padding: 5rpx 23rpx; + border: 1px solid #029D88; color: #029D88; + border-radius: 30rpx; } .head-title-right{ display: flex; @@ -1920,8 +1923,8 @@ } .pay-ding-top{ width: 100%; - height: 80rpx; - background-image: linear-gradient(to bottom, rgba(8, 162, 138, 0.5), #fff); + height: 100rpx; + background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff); border-top-left-radius: 24rpx; border-top-right-radius: 24rpx; padding: 0px 29rpx; @@ -1937,14 +1940,15 @@ height: 44rpx; } .d-title{ - font-weight: 400; - font-size: 25rpx; + font-weight: 550; + font-size: 30rpx; color: #333333; } .d-touxiang{ - width: 46rpx; - height: 46rpx; + width: 55rpx; + height: 55rpx; border-radius: 50%; + border: 1px solid #f2fffd; } .money-pay-jia{ font-weight: 400; @@ -1987,9 +1991,9 @@ } .pay-title{ font-weight: bold; - font-size: 28rpx; + font-size: 32rpx; color: #333333; - margin-bottom: 5px; + margin-bottom: 12px; } page { background: #f7f7f7; @@ -2168,4 +2172,16 @@ justify-content: space-between; align-items: center; } + .pay-word{ + font-size: 30rpx; + } + .jusitify-line{ + height: 80rpx; + } + .line-word{ + color: #999; + } + .line-word-r{ + color: #888; + } \ No newline at end of file From 26415530459a7156a073e16860f211f0e3f1ff8f Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Sat, 29 Jun 2024 19:23:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- my/order/payShengji.vue | 282 ++++++++++++++++++++++++---------------- pages/index/index.vue | 4 +- 2 files changed, 175 insertions(+), 111 deletions(-) diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue index 5877489..8e61e78 100644 --- a/my/order/payShengji.vue +++ b/my/order/payShengji.vue @@ -105,58 +105,64 @@ - 订单信息 - - 订单编号 - + + 订单信息 + + + + 订单编号 + {{order.ordersNo}} - - 预约时间 - {{order.serveTime}} + + 预约时间 + {{order.serveTime}} - - 下单时间 - {{order.createTime}} + + 下单时间 + {{order.createTime}} - - 开始服务时间 - {{order.startTime}} + + 开始服务时间 + {{order.startTime}} - - 结束服务时间 - {{order.endTimes}} + + 结束服务时间 + {{order.endTimes}} - - 预估结束时间 - {{order.endTime}} + + 预估结束时间 + {{order.endTime}} - 订单费用 - - 项目名称 - {{order.oldEntryName}} + + + 订单费用 + - + + 项目名称 + {{order.oldEntryName}} + + 服务时长 - {{order.oldMassageDuration}}分钟 + {{order.oldMassageDuration}}分钟 - + 项目价格 - ￥{{order.oldMassagePrice}} + ￥{{order.oldMassagePrice}} - + 下单数量 - {{order.oldMassageNum}} + {{order.oldMassageNum}} - + 会员折扣 - {{order.vipRate}}% + {{order.vipRate}}% - + 小计： @@ -166,116 +172,132 @@ + - 出行费用 - - 出行方式 - 公交 - 出租 - 免费 + + 出行费用 + - - 全程距离 - {{order.km}}km + + 出行方式 + 公交 + 出租 + 免费 - - 出行费用 - ￥{{order.taxiMoney}} + + 全程距离 + {{order.km}}km - 优惠券信息 - - 优惠券 - -￥{{order.couponMoney}} - - + + 出行费用 + ￥{{order.taxiMoney}} + + + 优惠券信息 + + + + 优惠券 + -￥{{order.couponMoney}} + - + + - 加钟信息 - - 加钟项目 - {{order.addEntryName}} + + 加钟信息 + - - 加钟价格 - ￥{{order.addPrice}} + + 加钟项目 + {{order.addEntryName}} - - 加钟时长 - {{order.addTime}}分钟 + + 加钟价格 + ￥{{order.addPrice}} - - 加钟次数 - {{order.addNum}} + + 加钟时长 + {{order.addTime}}分钟 - - 会员折扣 - {{order.vipRate}}% + + 加钟次数 + {{order.addNum}} - + + 会员折扣 + {{order.vipRate}}% + + 小计： ￥{{order.addMoney}} - + - 升级服务 - - 升级项目 - {{order.ordersMassageList[0].massageType.title}} + + 升级服务 + - - 项目价格 - ￥{{order.massagePrice}} + + 升级项目 + {{order.ordersMassageList[0].massageType.title}} - - 服务时长 - {{order.duration}}分钟 + + 项目价格 + ￥{{order.massagePrice}} - - 升级价格 - ￥{{order.sumMoney}} + + 服务时长 + {{order.duration}}分钟 - - 会员折扣 - {{order.vipRate}}% + + 升级价格 + ￥{{order.sumMoney}} - + + 会员折扣 + {{order.vipRate}}% + + 小计： ￥{{order.sumMoney}} - - - - 费用明细 - - 订单费用： - ￥ + + 费用明细 + + + + 订单费用： + ￥{{((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100)).toFixed(2)}} - - 出行费用： - ￥{{order.taxiMoney}} + + 出行费用： + ￥{{order.taxiMoney}} - - 优惠券： + + 优惠券： -￥{{order.couponMoney?order.couponMoney:0}} - - 加钟费用： + + 加钟费用： ￥ {{order.addMoney?order.addMoney:0}} - - 升级费用： + + 升级费用： ￥ {{order.sumMoney}} - - 合计： + + 合计： ￥ {{ @@ -288,9 +310,7 @@ - - 温馨提示：费用随会员等级及技师等级不同而上下浮动 - + 温馨提示：费用随会员等级及技师等级不同而上下浮动