From d4cb7a9b62ee454e533bba12485dd31bd011cd30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 22 Jul 2024 15:36:15 +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 --- components/colorui/main.css | 2 +- my/order/pay.vue | 3 +- my/order/payModify.vue | 235 ++++++++++++++++++------------------ my/order/payModifyTcMy.vue | 142 ++++++++++++++-------- my/order/payShengji.vue | 2 +- 5 files changed, 216 insertions(+), 168 deletions(-) diff --git a/components/colorui/main.css b/components/colorui/main.css index e7a9790..d1d9f33 100644 --- a/components/colorui/main.css +++ b/components/colorui/main.css @@ -3134,7 +3134,7 @@ scroll-view.cu-steps .cu-item { .margin-tb-sm { margin-top: 20upx; - margin-bottom: 20upx; + margin-bottom: 13upx; } .margin-tb { diff --git a/my/order/pay.vue b/my/order/pay.vue index c5ec1c3..123747b 100644 --- a/my/order/pay.vue +++ b/my/order/pay.vue @@ -294,8 +294,7 @@ 出行费用 - ￥{{order.taxiMoney}} - - + ￥{{order.taxiMoney}} diff --git a/my/order/payModify.vue b/my/order/payModify.vue index bf951a5..c6f589a 100644 --- a/my/order/payModify.vue +++ b/my/order/payModify.vue @@ -9,19 +9,19 @@ - + - + {{orderXm.title}} - - - 服务时长：{{orderXm.duration}}分钟 - - + + + 服务时长：{{orderXm.duration}}分钟 + + 项目价格： @@ -43,113 +43,107 @@ - - 请选择地址 - - - 客户姓名 - - {{name}} - 更换 - - - - 联系方式 - - {{mobile}} - - - - 服务地址 - - - {{province}}/{{city}}/{{district}}/{{detailaddress}} - - - - - 备注内容 - - - {{order.remark}} - - - - - - - - - {{jishiName.technicianTypeName}} - 技师 - - - {{jishiName.artificerName}} - 选择不同等级的技师价格不同哦~ - - - - - - 项目原价 - - - ￥{{orderXm.price}} - - - - - {{jishiName.technicianTypeName}} - 价格 - - - ￥{{technicianRate}} - - - - 优惠券 - - - -￥{{couponDataList}} - - 选择优惠券 - + + + 请选择地址 + + + 客户姓名 + + {{name}} + 更换 - 服务时间 - - - - {{startTime}} - 选择预约时间 - - + 联系方式 + + {{mobile}} - - - - - 备注 - - - + + 服务地址 + + + {{province}}/{{city}}/{{district}}/{{detailaddress}} + + + + + 备注内容 + + + {{order.remark}} + - + + + + {{jishiName.technicianTypeName}} + 技师 + + + {{jishiName.artificerName}} + 选择不同等级的技师价格不同哦~ + + + + + + 项目原价 + + + ￥{{orderXm.price}} + + + + + {{jishiName.technicianTypeName}} + 价格 + + + ￥{{technicianRate}} + + + + 优惠券 + + + -￥{{couponDataList}} + + 选择优惠券 + + + + + 服务时间 + + + + {{startTime}} + 选择预约时间 + + + + + + + 备注 + + + + - + + 去支付 - - @@ -1387,7 +1381,7 @@ font-weight: bold; font-size: 32rpx; color: #333333; - margin-bottom: 8px; + margin-bottom: 12px; } .view-more{ display:inline-block; @@ -1585,15 +1579,15 @@ } .xuanzhe{ background: linear-gradient(90deg, #029d88, #2fc094); - color: #ffffff; - margin-left: 5px; - border-radius: 15px; - height: 25px; - line-height: 25px; - width: 50px; - text-align: center; - font-size: 14px; - padding:6rpx 16rpx + color: #ffffff; + margin-left: 5px; + border-radius: 15px; + height: 25px; + line-height: 25px; + width: 50px; + text-align: center; + font-size: 14px; + padding:6rpx 16rpx } .header-view-data{ display: flex; @@ -1617,9 +1611,14 @@ } .header-view{ background-color: #fff; - margin-bottom: 12px; border-radius: 11px; } + .header-padd{ + padding: 36rpx; + } + .header-margin{ + margin: 26rpx; + } .head-foot span:nth-child(1){ margin-right: 5px; } @@ -1690,12 +1689,12 @@ background-color: #ffffff; border-radius: 24rpx; padding: 29rpx; + margin-top: 10px; } .d-title{ font-weight: 400; font-size: 29rpx; color: #222; - padding: 16px 15px 0px 15px; width: 100%; } .checkbox-data{ @@ -1716,7 +1715,6 @@ } .list-pay{ width: 100%; - padding: 0px 29rpx; } .pay-ding-top{ width: 100%; @@ -2012,7 +2010,7 @@ flex-direction: column; align-items: center; margin: 0 auto; - } + } .pay_btn{ display: inline-block; width: 92%; @@ -2047,6 +2045,13 @@ font-size: 32rpx; color: #333333; } + .head-title-right{ + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + font-weight: bold; + } .title-font{ font-size: 30rpx; color: #666666; diff --git a/my/order/payModifyTcMy.vue b/my/order/payModifyTcMy.vue index 50b042a..6a52baf 100644 --- a/my/order/payModifyTcMy.vue +++ b/my/order/payModifyTcMy.vue @@ -9,19 +9,25 @@ - + {{orderXm.title}} - - + + + + 服务时长：{{orderXm.duration}}分钟 + + + + 项目价格： ￥ - {{orderXm.packagePrice}}/次 + {{orderXm.packagePrice}} @@ -37,57 +43,56 @@ 请选择地址 - - 联系人 - + + 客户姓名 + {{name}} - 修改 + 更换 - - 手机号码 - + + 联系方式 + {{mobile}} - - 详细地址 - + + 服务地址 + {{province}}/{{city}}/{{district}}/{{detailaddress}} - - - + + 技师 - - {{jishiName.artificerName}} - 请选择技师 + + {{jishiName.artificerName}} + 选择技师 - - + + 服务时间 - + {{startTime}} - 请选择预约时间 + 请选择预约时间 - 备注 + 备注 @@ -95,8 +100,9 @@ - 去支付 - + + 去支付 + @@ -1392,12 +1398,7 @@ } .money-pay-zhen span{ color: #FF6000; - } - .money-pay-zhen span:nth-child(1){ - font-size: 25rpx; - } - .money-pay-zhen span:nth-child(2){ - font-size: 31.25rpx; + font-size: 32rpx; font-weight: bold; } .money-pay-zhen{ @@ -1708,12 +1709,13 @@ background: linear-gradient(90deg, #029d88, #2fc094); color: #ffffff; margin-left: 5px; - border-radius: 30rpx; - height:50rpx; - line-height: 50rpx; - width: 100rpx; - text-align:center; - font-size: 26rpx; + border-radius: 15px; + height: 25px; + line-height: 25px; + width: 50px; + text-align: center; + font-size: 14px; + padding:6rpx 16rpx } .header-view-data{ display: flex; @@ -1959,10 +1961,10 @@ background-color: #f7f7f7; } .pay-title{ - font-weight: bold; - font-size: 31rpx; - color: #333333; - margin-bottom: 8px; + font-weight: bold; + font-size: 32rpx; + color: #333333; + margin-bottom: 12px; } page { background: #f7f7f7; @@ -2125,16 +2127,27 @@ } - .pay_btn { - width: 90%; + .push-button{ + width: 100%; + height: 48px; + position: fixed; + bottom: 0px; + display: flex; + flex-direction: column; + align-items: center; margin: 0 auto; + } + .pay_btn { + display: inline-block; + width: 92%; text-align: center; background: linear-gradient(90deg, #019C88, #28BA92, #35C495); - height:80rpx; - border-radius: 80rpx; + height: 40px; + border-radius: 28px; color: #ffffff; - line-height: 80rpx; - font-size: 32rpx; + line-height: 40px; + margin-top: 4px; + font-size: 34rpx; } .serverAddress { display: flex; @@ -2151,4 +2164,35 @@ height: 80rpx; align-items: center; } + .head-title{ + font-weight: bold; + font-size: 32rpx; + color: #333333; + } + .head-title-right{ + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + font-weight: bold; + } + .title-font{ + font-size: 30rpx; + color: #666666; + } + .value-font{ + font-size: 30rpx; + color: #333333; + } + .jusitify-line{ + height: 78rpx; + padding: 20rpx 0; + display: flex; + justify-content: space-between; + } + .jusitify-line-end{ + height:1px; + border-bottom: 1px #e5e5e5 solid; + margin: 30rpx 0; + } \ No newline at end of file diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue index b46a7a4..981ce3d 100644 --- a/my/order/payShengji.vue +++ b/my/order/payShengji.vue @@ -2478,7 +2478,7 @@ padding: 29rpx; } .content{ - padding-top: 20px; + padding-top: 11px; width: 100%; background-color: #f7f7f7; }