diff --git a/components/empty.vue b/components/empty.vue index 59b63dd..081d4db 100644 --- a/components/empty.vue +++ b/components/empty.vue @@ -3,7 +3,7 @@ - 小主，您还没有收货地址呢~ + 小主，您还没有服务地址哦~ diff --git a/components/its-calendar/its-calendar.vue b/components/its-calendar/its-calendar.vue index c13064b..958552b 100644 --- a/components/its-calendar/its-calendar.vue +++ b/components/its-calendar/its-calendar.vue @@ -2,7 +2,7 @@ - {{item.weeks}} {{item.days}} @@ -313,7 +313,7 @@ .time_x_sty { background-color: #E8FAE1; - color: #096f4b !important; + color: #019c88 !important; } } @@ -328,6 +328,7 @@ margin: 30rpx auto; color: #FFFFFF; font-size: 30rpx; - background: linear-gradient(to right, #223845, #00a85b); + background: linear-gradient(to right, #019c88, #24b791); } + \ No newline at end of file diff --git a/my/address/Endaddress.vue b/my/address/Endaddress.vue index 967aa5f..5ca7ba2 100644 --- a/my/address/Endaddress.vue +++ b/my/address/Endaddress.vue @@ -301,18 +301,18 @@ } .btn { + margin: 16rpx 30upx; + position: fixed; + bottom: -2upx; width: 92%; - height: 92rpx; + height: 80rpx; background: linear-gradient(90deg, #019C88, #28BA92, #35C495); border-radius: 46rpx; - margin: 6px auto; - color: white; - text-align: center; - line-height: 92rpx; - letter-spacing: 2upx; + line-height: 80rpx; font-weight: 400; font-size: 36rpx; color: #FFFFFF; + text-align: center; } .u-icon__icon{ font-size: 40rpx !important; diff --git a/my/hongbao/youhuijuanList.vue b/my/hongbao/youhuijuanList.vue index 7eee68a..d331fec 100644 --- a/my/hongbao/youhuijuanList.vue +++ b/my/hongbao/youhuijuanList.vue @@ -316,7 +316,6 @@ background-image: url('../../static/youhuijuan/coupons1.png'); } .youhui-list{ - width: 95%; display: flex; flex-direction: row; height: 242rpx; diff --git a/my/order/payModify.vue b/my/order/payModify.vue index 27062f6..f0444c2 100644 --- a/my/order/payModify.vue +++ b/my/order/payModify.vue @@ -68,7 +68,7 @@ - + 技师 {{jishiName.technicianTypeName}} @@ -99,8 +99,7 @@ {{single==''?order.serveTime:single}} --> - + {{startTime}} 请选择预约时间 diff --git a/pages.json b/pages.json index 0962b0b..1624b9b 100644 --- a/pages.json +++ b/pages.json @@ -1061,7 +1061,7 @@ }, "tabBar": { "color": "#333333", - "selectedColor": "#096f4b", + "selectedColor": "#019c88", "backgroundColor": "#FFFFFF", "borderStyle": "black", "list": [{ diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue index dec266e..0813045 100644 --- a/pages/my/fuwuxiangm.vue +++ b/pages/my/fuwuxiangm.vue @@ -39,7 +39,11 @@ ￥ {{item.price}} +<<<<<<< .mine /套 +======= + 元/套 +>>>>>>> .theirs ￥ {{item.oldPrice}} diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue index 7c084c8..a1fea5b 100644 --- a/pages/therapist/therapist.vue +++ b/pages/therapist/therapist.vue @@ -8,7 +8,7 @@ {{ city }} @@ -40,60 +40,57 @@ {{ item.artificerName }} - - {{item.state == 1?"可服务":item.state == 2?"今日可约":"休息中"}} + + {{item.state == 1?"可服务:":item.state == 2?"今日可约":"休息中"}} - {{ item.time + {{ item.time }} - - - - - - 评论 - - {{ item.commentCount ? item.commentCount : 0 }} - - - - - - 收藏 - - {{ item.collectCount ? item.collectCount : 0 }} - + + + + + 评论 + + {{ item.commentCount ? item.commentCount : 0 }} - - - - - {{item.consortiaName}} + + + + 收藏 + + {{ item.collectCount ? item.collectCount : 0 }} + + + {{ item.distance }} - - + + + {{item.consortiaName}} + + + + 立即预约 - 立即预约 - - - @@ -191,12 +188,12 @@ - 立即预约 - 立即预约 @@ -1273,23 +1270,22 @@ import permision from "@/components/permission.js"; // overflow: auto; } .therapist-bottom-dingwei-text{ - font-weight: bold; - font-size: 23rpx; + font-size: 29rpx; color: #848485; } .therapist-bottom-dingwei{ - width: 17.36rpx; - height: 20.14rpx; + width: 26rpx; + height: 30rpx; margin-right:3px; } .therapist-bottom-img{ - width: 22.22rpx; - height: 22.22rpx; + width: 30rpx; + height: 30rpx; margin-right:3px; } .therapist-mian-bottom-text{ font-weight: bold; - font-size: 23rpx; + font-size: 30rpx; color: #222222; } .therapist-mian-bottom{ @@ -1298,22 +1294,22 @@ import permision from "@/components/permission.js"; flex-direction: row; justify-content: space-between; align-items: center; - margin: 5px 0px 3px 0px; + margin-top: 10rpx; } .therapist-mian-view-text span{ font-weight: 500; - font-size: 23rpx; + font-size: 30rpx; color: #222222; } .therapist-mian-view span{ font-weight: 400; - font-size: 23rpx; + font-size: 29rpx; color: #7C8187; - margin-right: 5px; + margin-right: 10px; } .therapist-mian-view image{ - width: 24rpx; - height: 24rpx; + width: 32rpx; + height: 32rpx; margin-right: 1px; } .therapist-mian-view{ @@ -1325,6 +1321,7 @@ import permision from "@/components/permission.js"; width: 100%; display: flex; flex-direction:row; + margin-top: 26rpx; } .therapist-mian{ width: 100%; @@ -1344,32 +1341,28 @@ import permision from "@/components/permission.js"; text-overflow: ellipsis; } .list-right-top-name{ - width: 60px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; text-align: left; font-weight: bold; - font-size: 30rpx; + font-size: 32rpx; color: #13141A; } .keyuyue{ - width: 115px; - height: 24px; + + height: 20px; display: flex; flex-direction: row; align-items: center; - } - .keyuyue .keyuyue-btn{ - width: 50%; - height: 100%; + margin-left:10rpx; + background: linear-gradient(90deg, #fe912e, #28BA92, #35C495); + border-radius: 30rpx 30rpx 30rpx 2rpx; + padding: 3rpx 18rpx; + color:#fff; font-size: 22rpx; - text-align: center; - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; } + .keyuyue-jinri{ border-top-left-radius: 7rpx; border-bottom-left-radius: 7rpx; @@ -1392,7 +1385,6 @@ import permision from "@/components/permission.js"; display: flex; flex-direction: row; align-items: center; - justify-content: space-between; } .list-right-top{ width: 100%; @@ -1401,7 +1393,7 @@ import permision from "@/components/permission.js"; align-items: center; } .list-right{ - width: 67%; + width: 61%; height: 100%; display: flex; flex-direction: column; @@ -1429,15 +1421,15 @@ import permision from "@/components/permission.js"; .img-span{ padding: 1px 5px; font-weight: 400; - font-size: 8px; + font-size: 10px; color: #FFFFFF; background: linear-gradient(-90deg, #FF6F48, #FF9E69); border-radius: 7px 0px 7px 0px; position: absolute; bottom: 0px; right: 0; - margin-bottom: 5px; - margin-right: 5px; + margin-bottom: 10px; + margin-right: 10px; } // .zpmore_view_left image{ // position: absolute; @@ -1452,19 +1444,19 @@ import permision from "@/components/permission.js"; height: 306.94rpx; } .touxiang-left-content{ - width: 202.08rpx; + width: 240.08rpx; height: auto; border-radius: 10rpx; position: relative; } .touxiang-left-content-img{ - width: 202.08rpx; - height: 173px; - border-radius: 0 120rpx 20rpx 0rpx; + width: 230.08rpx; + height: 150px; + border-radius: 10rpx 130rpx 20rpx 10rpx; } .touxiang-left-view{ width: 100%; - height: 173px; + height: 150px; border-radius: 18rpx; align-items: flex-start; justify-content: space-between; diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue index f2046c1..6984711 100644 --- a/pages/therapist/therapistDingdan.vue +++ b/pages/therapist/therapistDingdan.vue @@ -8,7 +8,7 @@ {{ city }} @@ -40,10 +40,10 @@ {{ item.artificerName }} - + {{item.state == 1?"可服务":item.state == 2?"今日可约":"休息中"}} - {{ item.time + {{ item.time }} @@ -1287,7 +1287,8 @@ top: 0rpx; z-index: 999; width: 100%; - background-image: url('../../static/topimg.png'); + background: #fff; + //background-image: url('../../static/topimg.png'); // background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png'); // background-position: center center; // background-repeat: no-repeat; @@ -1366,13 +1367,11 @@ text-overflow: ellipsis; } .list-right-top-name{ - width: 60px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; text-align: left; - font-weight: bold; - font-size: 35rpx; + font-size: 36rpx; color: #13141A; } .keyuyue{ @@ -1415,7 +1414,6 @@ display: flex; flex-direction: row; align-items: center; - justify-content: space-between; } .list-right-top{ width: 100%; @@ -1481,18 +1479,32 @@ position: relative; } .touxiang-left-content-img{ - width: 202.08rpx; - height: 173px; + width: 230rpx; + height: 130px; + border-radius: 20rpx 80rpx 20rpx 20rpx; } .touxiang-left-view{ width: 100%; - height: 173px; - border-radius: 14rpx; + height: 150px; + border-radius: 20rpx; align-items: flex-start; justify-content: space-between; background: #fff; - margin-bottom: 20px; + margin-bottom: 12px; padding-bottom: 10px; + padding: 20rpx; + } + .keyuyue{ + height: 20px; + display: flex; + flex-direction: row; + align-items: center; + margin-left: 5px; + background: linear-gradient(90deg, #fe912e, #28BA92, #35C495); + border-radius: 15px 15px 15px 1px; + padding: 1px 9px; + color: #fff; + font-size: 11px; } .touxiang-left{ width: 100%; @@ -1523,7 +1535,7 @@ flex-direction: row; align-items: center; justify-content: space-between; - } + } /deep/.page-box{ background: none !important; } @@ -1533,7 +1545,6 @@ .content{ width: 100%; height: 100vh; - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png'); background-position: center center; background-repeat: no-repeat; background-size: cover;