From 478003cfc100e01295acb83f0e536b4fe9de15a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Sat, 20 Jul 2024 09:55:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- my/order/pay.vue | 5939 ++++++++++++++++---------------- my/order/payJaZ.vue | 4845 +++++++++++++------------- my/order/payModify.vue | 17 + my/order/payModifyDd.vue | 17 + my/order/payModifyTcMyDaiB.vue | 21 +- my/order/payShengji.vue | 197 +- my/order/payding.vue | 21 +- 7 files changed, 5553 insertions(+), 5504 deletions(-) diff --git a/my/order/pay.vue b/my/order/pay.vue index d35a2ff..a8daa15 100644 --- a/my/order/pay.vue +++ b/my/order/pay.vue @@ -1,3038 +1,3013 @@ \ No newline at end of file + image { + width: 220upx; + height: 160upx; + border-radius: 24upx; + } +} + +.jz_btn { + width: 170rpx; + height: 56upx; + background: #096f4b; + margin-left: 40rpx; + border-radius: 35rpx; + line-height: 56upx; + text-align: center; + font-size: 28rpx; + font-family: PingFang SC; + font-weight: bold; + color: #FFFFFF; +} + +.tabber { + width: 100%; + background: #ffffff; + position: fixed; + bottom: 0; + left: 0; + right: 0; + justify-content: center; + height: 110rpx; + padding: 0 30rpx; + border-top: 1px solid #f0f0f0; +} + +.box { + /* border: 1px solid #005dff; */ + background: #E8FAE1; + border-radius: 4rpx; + color: #096f4b; + padding: 5upx 10upx; + font-size: 22rpx; + margin-top: 10rpx; +} + +.popup_pay { + width: 100%; + position: relative; + padding-bottom: 45rpx; + /* height: 160px; */ + /* #ifndef MP-WEIXIN */ + /* height: 130px; */ + /* #endif */ + +} + +.pay_btn { + width: 90%; + margin: 0 auto; + text-align: center; + background: linear-gradient(90deg, #019C88, #28BA92, #35C495); + height: 80rpx; + border-radius: 60rpx; + color: #ffffff; + line-height: 80rpx; + font-size: 36rpx; +} + +.serverAddress { + display: flex; + justify-content: space-between; + align-items: center; +} +.add-content{ + background: #fff; + padding: 30rpx; + border-radius: 24rpx; + margin-top: 24rpx; +} +.add-lin{ + height: 74rpx; + line-height: 74rpx; +} +.add-con-title{ + color: #999; + font-size: 30rpx; +} +.add-con-cont{ + color: #666; + font-size: 30rpx; + line-height: 74rpx; + text-align:right; +} +.level_button{ + padding: 4rpx 20rpx; + background: linear-gradient(to right, #ffc1a9,#fedec9, #fdbb9f); + border-radius: 16rpx 16rpx 16rpx 1rpx ; + color: #e95c3b; + font-size: 12px; + border: 1px solid #fd967c; +} +.justify-title-nav{ + width: 90%; + display: flex; + flex-direction: column; + position: relative; + margin: 10px 0; +} +.justify-title-nav-bor{ + width: 64px; + height: 5px; + border-radius: 3px; + position: absolute; + bottom: 0; + background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7)); +} +.justify-title{ + font-weight: bold; + font-size: 32rpx; + color: #333; +} +.jusitify-line-end{ + height: 1px; + border-bottom: 1px #f4f4f4 solid; + margin: 15px 0; +} +.prompt-text{ + width: 100%; + padding: 4px 7px; + border: #FE912E 1px dashed; + color: #fe912E; + border-radius: 5px; + font-size: 12px; +} +.show-btn-lin{ + width: 86%; + display: flex; + justify-content: space-between; +} + diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue index 510fb4b..bc12792 100644 --- a/my/order/payJaZ.vue +++ b/my/order/payJaZ.vue @@ -1,2472 +1,2473 @@ \ No newline at end of file +.jz_btn { + width: 170rpx; + height: 56upx; + background: #096f4b; + margin-left: 40rpx; + border-radius: 35rpx; + line-height: 56upx; + text-align: center; + font-size: 28rpx; + font-family: PingFang SC; + font-weight: bold; + color: #FFFFFF; +} + +.tabber { + width: 100%; + background: #ffffff; + position: fixed; + bottom: 0; + left: 0; + right: 0; + justify-content: center; + height: 110rpx; + padding: 0 30rpx; + border-top: 1px solid #f5f5f5; +} + +.box { + /* border: 1px solid #005dff; */ + background: #E8FAE1; + border-radius: 4rpx; + color: #096f4b; + padding: 5upx 10upx; + font-size: 22rpx; + margin-top: 10rpx; +} + +.popup_pay { + width: 100%; + position: relative; + padding-bottom: 45rpx; + /* height: 160px; */ + /* #ifndef MP-WEIXIN */ + /* height: 130px; */ + /* #endif */ + +} + +.pay_btn { + width: 90%; + margin: 0 auto; + text-align: center; + background: linear-gradient(to right, #223845, #00a85b); + height: 80rpx; + border-radius: 60rpx; + color: #ffffff; + line-height: 80rpx; +} + +.serverAddress { + display: flex; + justify-content: space-between; + align-items: center; +} +.level_button{ + background: #019C88; + border-radius: 20rpx 8rpx 20rpx 8rpx; + padding: 10rpx 20rpx; + color: #fff; + font-size: 12px; +} +.justify-title-nav{ + width: 90%; + display: flex; + flex-direction: column; + position: relative; + margin: 10px 0; +} +.justify-title{ + font-weight: bold; + font-size: 16px; + color: #333; +} +.justify-title-nav-bor{ + width: 64px; + height: 5px; + border-radius: 3px; + position: absolute; + bottom: 0; + background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7)); +} + diff --git a/my/order/payModify.vue b/my/order/payModify.vue index c2db04c..71f537c 100644 --- a/my/order/payModify.vue +++ b/my/order/payModify.vue @@ -84,6 +84,23 @@ + + + 项目原价 + + + ￥{{orderXm.price}} + + + + + {{jishiName.technicianTypeName}} + 价格 + + + ￥{{technicianRate}} + + 平台优惠劵 diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue index 01a8ac0..5107715 100644 --- a/my/order/payModifyDd.vue +++ b/my/order/payModifyDd.vue @@ -93,6 +93,23 @@ + + + 项目原价 + + + ￥{{orderXm.price}} + + + + + {{jishiName.technicianTypeName}} + 价格 + + + ￥{{technicianRate}} + + - {{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}} + {{order.technicianTypeName}} @@ -129,11 +129,11 @@ {{order.oldEntryName}} - 服务时长 + 服务时长 {{order.duration}}分钟 {{order.oldMassageDuration}}分钟 - + - 会员减免 - -￥{{order.vipReductionMoney}} + 项目原价 + ￥{{order.massagePrice}} + ￥{{order.oldMassagePrice}} + + + {{order.technicianTypeName}}价格 + ￥{{order.priceMarkup}} + ￥{{order.oldPriceMarkup}} + + + 会员减免 + -￥{{order.vipReductionMoney}} + -￥{{order.oldVipReductionMoney}} @@ -178,8 +189,7 @@ 出行费用 - ￥{{order.taxiMoney}} - - + ￥{{order.taxiMoney}} @@ -191,38 +201,6 @@ -￥{{order.couponMoney}} - - - - 加钟信息 - - - - 加钟项目 - {{order.addEntryName}} - - - 加钟价格 - ￥{{order.addPriceMarkup}} - - - 加钟时长 - {{order.addTime}}分钟 - - - 加钟次数 - {{order.addNum}} - - - 会员减免 - -￥{{order.addVipReductionMoney}} - - - - 小计： - ￥{{order.addMoney}} - - @@ -244,13 +222,12 @@ 升级差额 - ￥{{(order.priceMarkup - order.oldPriceMarkup).toFixed(2)}} + ￥{{(order.priceMarkup - order.oldPriceMarkup).toFixed(0)}} - 会员减免 + 会员减免 -￥{{order.vipReductionMoney}} - 小计： @@ -261,6 +238,38 @@ + + + 加钟信息 + + + + 加钟项目 + {{order.addEntryName}} + + + 加钟价格 + ￥{{order.addPriceMarkup}} + + + 加钟时长 + {{order.addTime}}分钟 + + + + 会员减免 + -￥{{order.addVipReductionMoney}} + + + + 小计： + ￥{{order.addMoney}} + + 费用明细 @@ -271,13 +280,10 @@ style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}} ￥{{order.oldMassageMoney}} - - 出行费用： - ￥{{order.taxiMoney}} - - + ￥{{order.taxiMoney}} 优惠券： @@ -288,6 +294,13 @@ - + + 升级费用： + + ￥{{order.payMoney}} + - + + 加钟费用： @@ -297,13 +310,6 @@ - - - 升级费用： - - ￥{{order.payMoney}} - - - - 合计： @@ -362,10 +368,10 @@ ￥{{order.massagePrice}} ￥{{order.oldMassagePrice}} - + 小计： @@ -379,8 +385,7 @@ - - + 出行费用 @@ -410,38 +415,6 @@ -￥{{order.couponMoney}} - - - - 加钟信息 - - - - 加钟项目 - {{order.addEntryName}} - - - 加钟价格 - ￥{{order.addPriceMarkup}} - - - 加钟时长 - {{order.addTime}}分钟 - - - 加钟次数 - {{order.addNum}} - - - 会员减免 - -￥{{order.addVipReductionMoney}} - - - - 小计： - ￥{{order.addMoney}} - - @@ -463,7 +436,7 @@ 升级差额 - ￥{{(order.priceMarkup-order.oldPriceMarkup).toFixed(2)}} + ￥{{(order.priceMarkup-order.oldPriceMarkup).toFixed(0)}} 会员减免 @@ -477,6 +450,37 @@ + + + 加钟信息 + + + + 加钟项目 + {{order.addEntryName}} + + + 加钟价格 + ￥{{order.addPriceMarkup}} + + + 加钟时长 + {{order.addTime}}分钟 + + + + 会员减免 + -￥{{order.addVipReductionMoney}} + + + 小计： + ￥{{order.addMoney}} + + 费用明细 @@ -1432,6 +1436,15 @@ this.loading = false uni.hideLoading() this.order = res.data; + if(res.data["technicianType"] == 3){ + this.order["technicianTypeName"] = "新手" + } + if(res.data["technicianType"] == 4){ + this.order["technicianTypeName"] = "专家" + } + if(res.data["technicianType"] == 5){ + this.order["technicianTypeName"] = "资深" + } var date = new Date(); // 当前日期和时间 var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数 diff --git a/my/order/payding.vue b/my/order/payding.vue index 258fc20..6370f99 100644 --- a/my/order/payding.vue +++ b/my/order/payding.vue @@ -100,7 +100,8 @@ - {{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}} + + {{order.technicianTypeName}}