diff --git a/my/order/payModify.vue b/my/order/payModify.vue index 2bcbaa2..f7335e4 100644 --- a/my/order/payModify.vue +++ b/my/order/payModify.vue @@ -44,7 +44,7 @@ - + 请选择地址 @@ -78,7 +78,7 @@ - + {{jishiName.technicianTypeName}} @@ -1811,21 +1811,6 @@ text-decoration-line: line-through; margin-left: 5px; } - .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-weight: bold; - } - .money-pay-zhen{ - display: flex; - flex-direction: row; - align-items: center; - } .money-pay{ width: 100%; display: flex; diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue index b4390ea..a0fa5a6 100644 --- a/my/order/payModifyDd.vue +++ b/my/order/payModifyDd.vue @@ -3,14 +3,14 @@ - 服务项目 + 服务项目 - + {{orderXm.entryName}} @@ -19,14 +19,14 @@ - + - {{orderXm.duration}}分钟 - + 服务时长:{{orderXm.duration}}分钟 + 项目价格: {{technicianRate}} @@ -34,6 +34,7 @@ {{orderXm.priceMarkup}} + 项目价格: {{orderXm.priceMarkup}} @@ -46,105 +47,116 @@ - - 请选择地址 - - - 联系人 - - {{name}} - 修改 + + + 请选择地址 + + + 客户姓名 + + {{name}} + 更换 + + + + 联系方式 + + {{mobile}} + + + + 服务地址 + + + {{province}}/{{city}}/{{district}}/{{detailaddress}} + + + + + --> + + + + + + 技师 + {{jishiName.technicianTypeName}} + + + {{jishiName.artificerName}} + 选择不同等级的技师价格不同哦~ + - - - - - 技师 - {{jishiName.technicianTypeName}} - - - {{jishiName.artificerName}} - 选择不同技师价格可能不一样哦~ - - - + - + 项目原价 - ¥{{orderXm.price}} + ¥{{orderXm.price}} - + {{jishiName.technicianTypeName}} 价格 - ¥{{technicianRate}} + ¥{{technicianRate}} - + + + 服务时间 + + - - - 服务时间 - - - - - {{startTime}} - 请选择预约时间 - + + + {{startTime}} + 请选择预约时间 - - 备注 - - - - - + + + 备注 + + + + - @@ -1395,12 +1406,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{ @@ -1606,11 +1612,15 @@ } .xuanzhe{ background: linear-gradient(90deg, #029d88, #2fc094); - color: #ffffff; - margin-left: 5px; - border-radius: 15px; - padding: 3px 8px; - font-size: 13px; + 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; @@ -1639,14 +1649,19 @@ } .header-view-text{ width: 170rpx; - font-size: 30rpx; - color: #999999; + font-size: 29rpx; + color: #222222; } .header-view{ background-color: #fff; - margin-bottom: 10px; border-radius: 11px; } + .header-padd{ + padding: 36rpx; + } + .header-margin{ + margin: 26rpx; + } .head-foot span:nth-child(1){ margin-right: 5px; } @@ -1717,6 +1732,7 @@ background-color: #ffffff; border-radius: 24rpx; padding: 29rpx; + margin-top: 10px; } .d-title{ font-weight: bold; @@ -1741,7 +1757,6 @@ } .list-pay{ width: 100%; - padding: 0px 29rpx; } .pay-ding-top{ width: 100%; @@ -1828,9 +1843,10 @@ } .d-touxiang{ - width: 46rpx; - height: 46rpx; + width: 55rpx; + height: 55rpx; border-radius: 50%; + border: 1px solid #f2fffd; } .money-pay-jia{ font-weight: 400; @@ -1839,21 +1855,6 @@ text-decoration-line: line-through; margin-left: 5px; } - .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-weight: bold; - } - .money-pay-zhen{ - display: flex; - flex-direction: row; - align-items: center; - } .money-pay{ width: 100%; display: flex; @@ -1868,9 +1869,9 @@ } .pay-title{ font-weight: bold; - font-size: 30rpx; + font-size: 32rpx; color: #333333; - margin-bottom: 8px; + margin-bottom: 12px; } page { background: #f7f7f7; @@ -2061,4 +2062,17 @@ justify-content: space-between; align-items: center; } + .head-title{ + font-weight: bold; + font-size: 32rpx; + color: #333333; + } + .title-font{ + font-size: 30rpx; + color: #666666; + } + .value-font{ + font-size: 30rpx; + color: #333333; + } diff --git a/my/order/payModifyTcMyDaiB.vue b/my/order/payModifyTcMyDaiB.vue index 2d44d8d..18eb7fd 100644 --- a/my/order/payModifyTcMyDaiB.vue +++ b/my/order/payModifyTcMyDaiB.vue @@ -226,15 +226,15 @@ - 取消订单 立即支付 + class="dingshi">立即支付 联系客服 + class="dingshi">联系客服 @@ -297,7 +297,7 @@ }, customStyle2: { backgroundColor: '', - color: '', + color: '#FFFFFF', // #ifdef MP-WEIXIN width: "310upx", // #endif @@ -1574,10 +1574,8 @@ flex-direction: column; } /deep/.btns{ - color: #019C88 !important; - margin-left: 10rpx !important; - height:70rpx; - font-size: 30rpx; + background: #019C88 !important; + color: #fff !important; } /deep/.u-size-default{ margin: 5px 0px 0px 0px; diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue index c1da3ae..29fd7e0 100644 --- a/my/order/payShengji.vue +++ b/my/order/payShengji.vue @@ -233,8 +233,8 @@ ¥{{order.payMoney}} - + 加钟信息 @@ -439,8 +439,8 @@ ¥{{order.payMoney}} - + 加钟信息 @@ -2341,7 +2341,7 @@ color: #7D7D7D; margin-left: 26rpx; } - + .showBtn,.hideBtn{ width: 100%; display: flex; diff --git a/my/order/paydingTCX.vue b/my/order/paydingTCX.vue index 72e8ac5..2470240 100644 --- a/my/order/paydingTCX.vue +++ b/my/order/paydingTCX.vue @@ -61,23 +61,23 @@ - + - - 客户姓名 - + + 客户姓名 + {{order.userName}} - - 联系方式 - + + 联系方式 + {{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}} - - 服务地址 - {{order.address}} + + 服务地址 + {{order.address}} @@ -85,8 +85,8 @@ - - + + {{order.artificer.artificerName}} + {{order.technicianTypeName}} - {{order.technicianTypeName}} @@ -152,7 +152,7 @@ ¥{{order.massagePrice}} - 实付金额: + 实付金额: 0 @@ -1811,11 +1811,11 @@ } .pay-ding-top{ width: 100%; - height: 50px; + height: 100rpx; background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff); - border-top-left-radius: 12px; - border-top-right-radius: 12px; - padding: 0px 14px; + border-top-left-radius: 24rpx; + border-top-right-radius: 24rpx; + padding: 0px 29rpx; } .pay-ding,.feiuong{ background-color: #ffffff; @@ -1828,14 +1828,15 @@ height: 44rpx; } .d-title{ + font-weight: bold; font-size: 32rpx; color: #333333; - font-weight: bold; } .d-touxiang{ - width: 60rpx; - height: 60rpx; + width: 55rpx; + height: 55rpx; border-radius: 50%; + border: 1px solid #f2fffd; } .money-pay-jia{ font-weight: 400; @@ -2055,6 +2056,14 @@ justify-content: space-between; align-items: center; } + + .add-content { + background: #fff; + padding: 30rpx; + border-radius: 24rpx; + margin-top: 24rpx; + } + .head-text{ font-size:30rpx; } @@ -2073,11 +2082,12 @@ text-align:right; } .level_button{ - padding: 3rpx 13rpx; - background: linear-gradient(to right, #fe9131, #ff9869); - border-radius: 16rpx 16rpx 16rpx 1rpx ; - color: #fff; + 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%; @@ -2099,6 +2109,13 @@ font-size: 32rpx; color: #333; } + + .jusitify-line { + height: 78rpx; + padding: 20rpx 0; + font-size: 30rpx; + } + .jusitify-line-end{ height:1px; border-bottom: 1px #e5e5e5 solid; diff --git a/static/background-img4.png b/static/background-img4.png index 16bb077..7a50c44 100644 Binary files a/static/background-img4.png and b/static/background-img4.png differ diff --git a/static/cooperate/cooperate1.png b/static/cooperate/cooperate1.png index 6a3902e..3e6a45a 100644 Binary files a/static/cooperate/cooperate1.png and b/static/cooperate/cooperate1.png differ diff --git a/static/seckill5.png b/static/seckill5.png new file mode 100644 index 0000000..f15972a Binary files /dev/null and b/static/seckill5.png differ diff --git a/static/vip/membership5.gif b/static/vip/membership5.gif new file mode 100644 index 0000000..491a8f2 Binary files /dev/null and b/static/vip/membership5.gif differ diff --git a/static/vip/membership5.png b/static/vip/membership5.png index eece04d..7abbcc8 100644 Binary files a/static/vip/membership5.png and b/static/vip/membership5.png differ diff --git a/static/vip/membership6.gif b/static/vip/membership6.gif new file mode 100644 index 0000000..61cb66c Binary files /dev/null and b/static/vip/membership6.gif differ diff --git a/static/vip/membership7.gif b/static/vip/membership7.gif new file mode 100644 index 0000000..f6bbc10 Binary files /dev/null and b/static/vip/membership7.gif differ