diff --git a/my/order/pay.vue b/my/order/pay.vue index d1d76f0..f06f1b3 100644 --- a/my/order/pay.vue +++ b/my/order/pay.vue @@ -461,8 +461,7 @@ class="btns">联系客服 - + 取消订单 更多 - + 加钟 - + - - 联系客服 - + 联系客服 + + class="eject-btns"> 去投诉 - + @@ -2097,6 +2097,32 @@ diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue index 3cbb293..63b61c6 100644 --- a/pages/therapist/therapistDingdan.vue +++ b/pages/therapist/therapistDingdan.vue @@ -18,10 +18,9 @@ - - + @@ -32,12 +31,18 @@ {{ item.artificerName }} + + {{item.status == 1?"可服务":"休息中"}} + {{item.time}} + + + @@ -1099,8 +1104,10 @@ } .touxiang-frame{ position: absolute; - width: 230.08rpx; - height: 146px; + width: 100rpx; + height: 38rpx; + left: 44rpx; + top:140rpx; } .dituList{ width: 85%; @@ -1208,18 +1215,37 @@ color: #13141A; } .keyuyue{ - // width: 160rpx; - height: 20px; + padding: 0rpx 10rpx; + height: 44rpx; display: flex; flex-direction: row; align-items: center; - background: linear-gradient(90deg, #fee9ca, #fde4c6); - border: 1px #decbae solid; - border-radius: 30rpx 30rpx 30rpx 2rpx; - padding: 3rpx 18rpx; + background: #eefdf8; + border-radius: 30rpx 20rpx 20rpx 30rpx ; color:#8d500f; - font-size: 22rpx; - margin-left: 15rpx; + font-size: 24rpx; + } + .timea-img{ + background:#2dbe93 url('../../static/timea.png') 2rpx 1rpx; + background-size: 28rpx 28rpx; + background-repeat: no-repeat; + width: 30rpx; + height: 30rpx; + border-radius:8rpx; + margin-top: 8rpx; + } + .timea-fu{ + font-size: 24rpx; + color: #2dbe93; + line-height: 44rpx; + margin-left: 8rpx; + margin-right: 5rpx; + } + .timea-time{ + font-size: 25rpx; + color: #2dbe93; + line-height: 44rpx; + padding-right: 10rpx; } .keyuyue .keyuyue-btn{ width: 50%; @@ -1263,12 +1289,12 @@ align-items: center; } .list-right{ - width: 67%; + width: 72%; height: 100%; display: flex; flex-direction: column; justify-content: space-between; - padding: 10px 5px 0px 5px; + padding: 16rpx; } .zpmore_view { position: absolute; @@ -1314,26 +1340,28 @@ height: 306.94rpx; } .touxiang-left-content{ - //width: 212.08rpx; + width: 180rpx; + //width: 235.08rpx; height: auto; border-radius: 10rpx; + position: relative; } .touxiang-left-content-img{ - width: 230.08rpx; - height: 150px; - border-radius:5rpx; - padding: 20rpx; - position:absolute; + width: 150rpx; + height: 150rpx; + border-radius:120rpx; + margin: 14rpx 22rpx; } .touxiang-left-view{ width: 100%; - height: 150px; - border-radius: 20rpx; + height: 126px; + border-radius: 18rpx; align-items: flex-start; - justify-content: space-between; background: #fff; margin-bottom: 12px; padding-bottom: 10px; + justify-content: space-between; + padding: 10rpx; } .touxiang-left{ @@ -1689,9 +1717,9 @@ .terap-button{ background: linear-gradient(90deg, #019C88, #0FA78B, #35C495); color: #ffffff; - width:200rpx; + width:130rpx; height: 60rpx; - border-radius: 30upx; + border-radius: 10upx; line-height: 58rpx; } \ No newline at end of file