From d1b30dd552fd88fc833a576d4f13651587f136d2 Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Wed, 3 Jul 2024 13:41:18 +0800 Subject: [PATCH 1/8] =?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/index/index.vue | 3 +-- pages/my/fuwuGengduo.vue | 23 +++++++++++++---------- pages/therapist/therapist.vue | 7 ++++--- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index b69155a..df6d367 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -990,6 +990,7 @@ .index-card-image{ width: 100%; height: 100%; + border-radius: 15rpx; } .content_bj{ height:100%; @@ -1413,7 +1414,6 @@ border-radius: 0px 0px 7px 7px; position: absolute; bottom:1px; - padding-bottom: 13px; } .index-fujin-img{ @@ -1701,5 +1701,4 @@ height: 100vh; overflow: auto; } - .jusitify-line-end{} diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue index 90da53e..172093b 100644 --- a/pages/my/fuwuGengduo.vue +++ b/pages/my/fuwuGengduo.vue @@ -30,9 +30,7 @@ {{item.classifyName}} 已售{{item.sales}}w+ | 好评{{item.esteemRate}}% --> - - {{item.content}} - + ￥ @@ -40,9 +38,13 @@ /{{item.type=='104'?'套':item.type=='105'||item.type=='106'?'次':'元'}} ￥{{item.oldPrice}}/{{item.type=='104'?'套':item.type=='105'||item.type=='106'?'次':'元'}} - - 查看 - + + + + {{item.content}} + + + 查看 @@ -179,12 +181,12 @@ background: linear-gradient(90deg, #019C88, #0FA78B, #35C495); border-radius: 10rpx; font-weight: bold; - font-size: 24rpx; + font-size: 26rpx; color: #FFFFFF; + margin-top: 8rpx; } .item-view-bottom-qian span:nth-child(4){ - font-weight: bold; - font-size: 31rpx; + font-size: 28rpx; color: #848484; text-decoration-line: line-through; margin-left: 5px; @@ -210,10 +212,11 @@ flex-direction: row; justify-content: space-between; align-items: center; + margin-top: 12rpx; } .item-view-jianjie{ font-weight: 400; - font-size: 22rpx; + font-size: 24rpx; color: #848484; margin:5px 0px; display: -webkit-box; diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue index d7552a6..68b4bff 100644 --- a/pages/therapist/therapist.vue +++ b/pages/therapist/therapist.vue @@ -50,7 +50,7 @@ - + {{ item.distance }} @@ -1352,10 +1352,11 @@ import permision from "@/components/permission.js"; display: flex; flex-direction: row; align-items: center; - background: linear-gradient(90deg, #fe912e, #ff996a, #35C495); + background: linear-gradient(90deg, #fee9ca, #fde4c6); + border: 1px #decbae solid; border-radius: 30rpx 30rpx 30rpx 2rpx; padding: 3rpx 15rpx; - color:#fff; + color:#8d500f; font-size: 22rpx; margin-left: 15rpx; } From 7f15027dfe1aebfd87d2d3b50ce503e161309c68 Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Wed, 3 Jul 2024 14:10:49 +0800 Subject: [PATCH 2/8] =?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/hongbao/youhuijuanList.vue | 5 +-- pages/my/cureOderDrtail.vue | 60 +++++++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/my/hongbao/youhuijuanList.vue b/my/hongbao/youhuijuanList.vue index d331fec..1d69b97 100644 --- a/my/hongbao/youhuijuanList.vue +++ b/my/hongbao/youhuijuanList.vue @@ -205,6 +205,7 @@ color: #ffffff; line-height: 80rpx; margin-top: 10rpx; + font-size: 34rpx; } .queding{ width: 100%; @@ -270,9 +271,9 @@ color: #333333; } .youhui-view-right-top{ + width: 68%; display: flex; flex-direction: column; - align-items: center; } .youhui-view-right{ width: 502.08rpx; @@ -321,7 +322,7 @@ height: 242rpx; border-radius: 21rpx; background-size: 100%; - margin: 6px auto; + margin:6px 12px; justify-content: space-between; } .you-nav{ diff --git a/pages/my/cureOderDrtail.vue b/pages/my/cureOderDrtail.vue index 23e7f12..d537b03 100644 --- a/pages/my/cureOderDrtail.vue +++ b/pages/my/cureOderDrtail.vue @@ -5,22 +5,23 @@ + + + + 实名认证 + + + + 资质认证 + + + + 平台担保 + + - - - - 实名认证 - - - - 资质认证 - - - - 平台担保 - - + {{getList.title}} @@ -468,6 +469,36 @@ font-size: 10px; color: #029c88; } + .header-bottom-foot-view2-img1{ + width: 35rpx; + height: 35rpx; + } + .header-bottom-foot-view2-img2{ + width: 30rpx; + height: 30rpx; + } + .header-bottom-foot-view2-img3{ + width: 32rpx; + height: 32rpx; + } + .header-bottom-foot-view2 image{ + margin-right: 3px; + } + .header-bottom-foot-view2{ + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + padding: 2px 20px; + height: 24px; + line-height: 24px; + background-color: rgba(230, 246, 243, 1); + border-radius: 30px; + font-weight: 400; + font-size: 11px; + color: #019c88; + margin: 5rpx auto; + } .header-bottom-foot-title{ width:100%; height: 22px; @@ -490,6 +521,7 @@ display: flex; flex-direction: row; align-items: center; + background-color: rgba(230, 246, 243, 0.6); } .header-bottom-foot{ width: 100%; From e07afc1a7a8b9668e52b931501ba4355e4e12fa2 Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Wed, 3 Jul 2024 14:39:09 +0800 Subject: [PATCH 3/8] =?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/payModifyTc.vue | 6 +++--- pages/my/index.vue | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/my/order/payModifyTc.vue b/my/order/payModifyTc.vue index f19c30a..56f7a36 100644 --- a/my/order/payModifyTc.vue +++ b/my/order/payModifyTc.vue @@ -1257,7 +1257,7 @@ align-items: flex-end; } .detail-view-mina{ - width: 68%; + width: 74%; display: flex; flex-direction: column; justify-content: space-around; @@ -1324,7 +1324,6 @@ } .header-bottom-money-zhen span{ color: #F95900 ; - } .header-bottom-money-zhen{ display: flex; @@ -1412,8 +1411,9 @@ } .detail-foot-list-top span:nth-child(1){ font-weight: bold; - font-size: 31rpx; + font-size: 30rpx; color: #3F3F3F; + margin-bottom: 10rpx; } .detail-foot-list-top span:nth-child(2){ width: 76rpx; diff --git a/pages/my/index.vue b/pages/my/index.vue index ab12f27..e8bfe1f 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -20,13 +20,13 @@ - - {{money}} + {{money}} + 我的钱包 - 我的钱包 + 充值 明细 @@ -683,8 +683,7 @@ padding-top: 30rpx; } .my-head-mian-top-yuE{ - font-weight: bold; - font-size: 60rpx; + font-size: 55rpx; color: #f95900; margin-top: 20rpx; } @@ -709,6 +708,7 @@ font-size: 24rpx; color: #999; margin-left: 20rpx; + margin-bottom: 12rpx; } .my-head-mian-top-view{ display: flex; @@ -796,7 +796,7 @@ .money-img{ width: 40rpx; height: 40rpx; - margin-bottom: 10rpx; - margin-left: 8rpx; + margin-bottom: 15rpx; + margin-right: 8rpx; } \ No newline at end of file From 54413ee58739e5ec9c74d85e4d521916445908ea Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Wed, 3 Jul 2024 15:26:53 +0800 Subject: [PATCH 4/8] =?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/payModifyTc.vue | 3 +-- my/order/paydingTc.vue | 21 ++++++++++++--------- pages/my/indextaociliaoList.vue | 29 ++++++++++++++++++++--------- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/my/order/payModifyTc.vue b/my/order/payModifyTc.vue index 56f7a36..83627fc 100644 --- a/my/order/payModifyTc.vue +++ b/my/order/payModifyTc.vue @@ -80,8 +80,7 @@ -￥{{couponDataList}} 选择优惠劵 - - + diff --git a/my/order/paydingTc.vue b/my/order/paydingTc.vue index bdf3b18..b1fe229 100644 --- a/my/order/paydingTc.vue +++ b/my/order/paydingTc.vue @@ -15,7 +15,7 @@ - + {{order.ordersPackageList[0].title}} @@ -65,7 +65,7 @@ 总金额 - ￥{{order.payMoney}} + ￥{{order.payMoney}} @@ -99,7 +99,7 @@ @@ -1286,8 +1286,9 @@ text-overflow: ellipsis; } .fei-view-list span,.fei-view-list-z span{ - font-weight: bold; - font-size: 25rpx; + font-size: 28rpx; + height: 60rpx; + line-height: 60rpx; } .fei-view-list-z{ height: 65rpx; @@ -1300,6 +1301,7 @@ } .fei-view-list span:nth-child(2){ color: #333333; + font-weight: bold; } .fei-view-list,.fei-view-list-z{ width: 100%; @@ -1318,7 +1320,7 @@ width: 100%; text-align: center; font-weight: bold; - font-size: 29rpx; + font-size: 30rpx; color: #333333; padding-bottom: 10px; margin-bottom: 10px; @@ -1422,9 +1424,9 @@ } .pay-title{ font-weight: bold; - font-size: 28rpx; + font-size: 32rpx; color: #333333; - margin-bottom: 5px; + margin-bottom: 8px; } page { background: #f7f7f7; @@ -1591,11 +1593,12 @@ width: 90%; margin: 0 auto; text-align: center; - background: linear-gradient(to right, #223845, #00a85b); + background: linear-gradient(90deg, #019C88, #28BA92, #35C495); height: 80rpx; border-radius: 60rpx; color: #ffffff; line-height: 80rpx; + font-size: 34rpx; } .serverAddress { diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue index d657d75..a2d372d 100644 --- a/pages/my/indextaociliaoList.vue +++ b/pages/my/indextaociliaoList.vue @@ -21,8 +21,9 @@ - - {{item.title}} + + {{item.title}} + {{item.classifyName}} ￥ @@ -36,8 +37,7 @@ - {{item.classifyName}} - 已售{{item.sales}}w+ + 已售{{item.sales}}w+ 查看 @@ -218,7 +218,7 @@ } .item-view-jianjie{ font-weight: 400; - font-size: 22rpx; + font-size: 26rpx; color: #848484; margin:5px 0px; display: -webkit-box; @@ -228,8 +228,8 @@ text-overflow: ellipsis; } .item-view-biao{ - padding: 1px 2px; - border-radius: 6rpx; + padding: 1px 5px; + border-radius: 15rpx 3rpx 15rpx 3rpx; } .tuina{ background-color:#d1f2df; @@ -250,7 +250,11 @@ .item-view-xiangmu span:nth-child(2){ font-weight: normal; color: #666666; - margin-left: 5px; + } + .item-view-xiangmu span:nth-child(1){ + font-weight: normal; + color: #999; + margin-right: 5rpx; } .item-view-xiangmu{ width: 100%; @@ -258,11 +262,14 @@ flex-direction: row; font-weight: 400; font-size: 25rpx; + align-items: flex-end; } .item-view-title{ + width: 80%; font-weight: bold; font-size: 32rpx; color: #333333; + text-overflow: ellipsis; } .item-view{ width: 55%; @@ -423,5 +430,9 @@ position: fixed; z-index: 999; } - + .view-cata{ + display: flex; + flex-direction: row; + align-items: center; + } From 6ae425ad37af32a0e3b02e9cf2719cc5e48a679e Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Wed, 3 Jul 2024 15:40:31 +0800 Subject: [PATCH 5/8] =?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/payModifyJsDetail.vue | 10 +++++----- my/order/payding.vue | 2 +- my/order/paydingTc.vue | 2 +- pages/my/serviceOderDrtail.vue | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/my/order/payModifyJsDetail.vue b/my/order/payModifyJsDetail.vue index c97965c..1675924 100644 --- a/my/order/payModifyJsDetail.vue +++ b/my/order/payModifyJsDetail.vue @@ -68,8 +68,8 @@ - - + + 技师 {{jishiName.technicianTypeName}} @@ -1540,7 +1540,7 @@ } .fuwu-time-view span:nth-child(1),.liliao-bottom span:nth-child(1){ font-weight: 400; - font-size: 29rpx; + font-size: 30rpx; color: #888; } .fuwu-time-view,.liliao-top{ @@ -1550,7 +1550,7 @@ align-items: center; } .fuwu-title,.liliao-top span:nth-child(1){ - font-size: 29rpx; + font-size: 30rpx; color: #222222; } .fuwu-time,.liliao{ @@ -1588,7 +1588,7 @@ } .header-view-text{ width: 170rpx; - font-size: 29rpx; + font-size: 30rpx; color: #222222; } .header-view{ diff --git a/my/order/payding.vue b/my/order/payding.vue index 1d56b45..aaf6e76 100644 --- a/my/order/payding.vue +++ b/my/order/payding.vue @@ -7,7 +7,7 @@ - 服务项目 + 服务项目1111 Date: Wed, 3 Jul 2024 16:10:27 +0800 Subject: [PATCH 6/8] =?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/pay.vue | 84 +++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/my/order/pay.vue b/my/order/pay.vue index d61089a..d141c99 100644 --- a/my/order/pay.vue +++ b/my/order/pay.vue @@ -102,7 +102,7 @@ - + 订单信息 @@ -140,19 +140,19 @@ 订单费用 - + 项目名称 {{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}} - + 服务时长 {{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟 - + 项目价格 ￥{{order.price}} - + 会员折扣 {{order.vipRate}}% @@ -169,31 +169,31 @@ - 出行费用 + 出行费用 - - 出行方式 - 公交 - 出租 - 免费 + + 出行方式 + 公交 + 出租 + 免费 - - 全程距离 - {{order.km}}km + + 全程距离 + {{order.km}}km - - 出行费用 - ￥{{order.taxiMoney}} + + 出行费用 + ￥{{order.taxiMoney}} - + 优惠券信息 - - 优惠券 - -￥{{order.couponMoney}} + + 优惠券 + -￥{{order.couponMoney}} - @@ -201,25 +201,25 @@ 费用明细 - - 订单费用： - ￥{{order.price}} + + 订单费用： + ￥{{order.price}} - - 出行费用： - ￥{{order.taxiMoney}} + + 出行费用： + ￥{{order.taxiMoney}} - - 优惠券： - - -￥{{order.couponMoney}} + + 优惠券： + + -￥{{order.couponMoney}} - - - 合计： - ￥ + + 合计： + ￥ {{order.payMoney}} @@ -2189,17 +2189,21 @@ } .add-con-title{ color: #999; - font-size: 28rpx; + font-size: 30rpx; } .add-con-cont{ color: #666; - font-size: 28rpx; + font-size: 30rpx; + line-height: 80rpx; + text-align:right; } .level_button{ - padding: 5rpx 20rpx; + padding: 2rpx 13rpx; background: linear-gradient(to right, #fe9130, #ff9869); - border-radius: 8rpx 20rpx 8rpx 20rpx; + border-radius: 5rpx 16rpx 5rpx 16rpx; color: #fff; + font-size: 12px; + } .justify-title-nav{ width: 90%; From 3b3353b99e4df0150fcc7a4e3800dc94db52e3d5 Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Wed, 3 Jul 2024 16:38:24 +0800 Subject: [PATCH 7/8] =?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/pay.vue | 6 +++--- my/order/payModifyDzhifu.vue | 22 +++++++++++----------- my/order/payModifyJsDetail.vue | 9 ++++++--- my/order/payModifyTc.vue | 16 ++++++++-------- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/my/order/pay.vue b/my/order/pay.vue index d141c99..2008149 100644 --- a/my/order/pay.vue +++ b/my/order/pay.vue @@ -2198,9 +2198,9 @@ text-align:right; } .level_button{ - padding: 2rpx 13rpx; - background: linear-gradient(to right, #fe9130, #ff9869); - border-radius: 5rpx 16rpx 5rpx 16rpx; + padding: 3rpx 13rpx; + background: linear-gradient(to right, #fe9131, #ff9869); + border-radius: 16rpx 16rpx 16rpx 1rpx ; color: #fff; font-size: 12px; diff --git a/my/order/payModifyDzhifu.vue b/my/order/payModifyDzhifu.vue index c72fa32..9154c12 100644 --- a/my/order/payModifyDzhifu.vue +++ b/my/order/payModifyDzhifu.vue @@ -3,15 +3,15 @@ - 服务项目 + 服务项目11111111 - - + + {{orderXm.ordersMassageList[0].massageType.title}} @@ -1400,9 +1400,9 @@ } .pay-title{ font-weight: bold; - font-size: 28rpx; + font-size: 30rpx; color: #333333; - margin-bottom: 5px; + margin-bottom: 8px; } .view-more{ display:inline-block; @@ -1855,12 +1855,6 @@ width: 100%; background-color: #f7f7f7; } - .pay-title{ - font-weight: bold; - font-size: 28rpx; - color: #333333; - margin-bottom: 5px; - } page { background: #f7f7f7; } @@ -2039,4 +2033,10 @@ justify-content: space-between; align-items: center; } + .head-title{ + font-size: 30rpx; + } + .zhuangtai{ + color: #029D88; + } \ No newline at end of file diff --git a/my/order/payModifyJsDetail.vue b/my/order/payModifyJsDetail.vue index 1675924..f598b76 100644 --- a/my/order/payModifyJsDetail.vue +++ b/my/order/payModifyJsDetail.vue @@ -11,7 +11,7 @@ - + {{orderXm.title}} @@ -1819,9 +1819,9 @@ } .pay-title{ font-weight: bold; - font-size: 28rpx; + font-size: 30rpx; color: #333333; - margin-bottom: 5px; + margin-bottom: 8px; } page { background: #f7f7f7; @@ -2001,4 +2001,7 @@ justify-content: space-between; align-items: center; } + .head-title{ + font-size: 30rpx; + } \ No newline at end of file diff --git a/my/order/payModifyTc.vue b/my/order/payModifyTc.vue index 83627fc..05488d6 100644 --- a/my/order/payModifyTc.vue +++ b/my/order/payModifyTc.vue @@ -1317,9 +1317,9 @@ .pay-title{ font-weight: bold; - font-size: 38rpx; + font-size: 32rpx; color: #333333; - margin-bottom: 5px; + margin-bottom: 8px; } .header-bottom-money-zhen span{ color: #F95900 ; @@ -1857,12 +1857,6 @@ width: 100%; background-color: #f7f7f7; } - .pay-title{ - font-weight: bold; - font-size: 28rpx; - color: #333333; - margin-bottom: 5px; - } page { background: #f7f7f7; } @@ -2040,4 +2034,10 @@ justify-content: space-between; align-items: center; } + .head-title{ + font-size: 30rpx; + } + .zhuangtai{ + color: #029D88; + } \ No newline at end of file From 43de99ab7b8805d174dc55cfb75d32f1d7f2b9aa Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Wed, 3 Jul 2024 16:44:55 +0800 Subject: [PATCH 8/8] =?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/payModifyJsDetail.vue | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/my/order/payModifyJsDetail.vue b/my/order/payModifyJsDetail.vue index f598b76..a992aa2 100644 --- a/my/order/payModifyJsDetail.vue +++ b/my/order/payModifyJsDetail.vue @@ -3,7 +3,7 @@ - 服务项目 + 服务项目 -￥{{couponDataList}} - 选择优惠劵 + 选择优惠劵 @@ -1361,12 +1361,6 @@ border-radius: 24rpx; padding: 29rpx; } - .pay-title{ - font-weight: bold; - font-size: 28rpx; - color: #333333; - margin-bottom: 5px; - } .view-more{ display:inline-block; border-top:1px solid; @@ -1819,7 +1813,7 @@ } .pay-title{ font-weight: bold; - font-size: 30rpx; + font-size: 32rpx; color: #333333; margin-bottom: 8px; }