This commit is contained in:
parent
c4bd08c695
commit
d53ad7a29a
|
@ -45,17 +45,11 @@
|
||||||
<image class="headset-img" :src="order.technicianType=='3'?'../../static/vip/headset1.png':order.technicianType=='4'?'../../static/vip/headset3.png':'../../static/vip/headset2.png'" mode=""></image>
|
<image class="headset-img" :src="order.technicianType=='3'?'../../static/vip/headset1.png':order.technicianType=='4'?'../../static/vip/headset3.png':'../../static/vip/headset2.png'" mode=""></image>
|
||||||
<span class="headset-text2">{{order.technicianTypeName}}</span>
|
<span class="headset-text2">{{order.technicianTypeName}}</span>
|
||||||
</view>
|
</view>
|
||||||
<view class="keyuyue">
|
|
||||||
<view>
|
|
||||||
<view>{{order.status == 1?"可服务":"休息中"}}</view>
|
|
||||||
</view>
|
|
||||||
<view v-if="order.status == 1">{{order.time}}</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
</view>
|
||||||
<view class="jian-view-right">
|
<view class="jian-view-right">
|
||||||
|
|
||||||
<view class="jian-view-right-weizhi">
|
<view class="jian-view-right-weizhi">
|
||||||
<image class="jian-view-right-img" src="../../static/orderDetail/dingwei.png"></image>
|
<!--<image class="jian-view-right-img" src="../../static/orderDetail/dingwei.png"></image>-->
|
||||||
<span>{{order.distance}}</span>
|
<span>{{order.distance}}</span>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -75,20 +69,24 @@
|
||||||
<span>{{order.collectCount}}人关注</span>
|
<span>{{order.collectCount}}人关注</span>
|
||||||
</view>
|
</view>
|
||||||
<view class="oder-mian-tjia">
|
<view class="oder-mian-tjia">
|
||||||
<view style="margin-top: 3rpx; margin-right: 8rpx;">
|
<view class="oder-mian-qing" @click="shangxian" v-if="order.status == 2">请TA上线</view>
|
||||||
<view class="text-center shouchang">
|
<view class="oder-mian-guan" :class="[isFollow?'activeG':'activeQ']" @click="guanzhu(order)">
|
||||||
|
关注
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="flex" style="margin-top: 20rpx;">
|
||||||
<view class="shouchang-view" @click="toggle('center')">
|
<view class="shouchang-view" @click="toggle('center')">
|
||||||
<image class="shouchang-img" src="../../static/orderDetail/technician6.png"></image>
|
<image class="shouchang-img" src="../../static/orderDetail/technician6.png"></image>
|
||||||
<span class="shouchang-text">打赏技师</span>
|
<span class="shouchang-text">打赏技师</span>
|
||||||
<!-- <image src="../../static/orderDetail/technician6-1.png"
|
<!-- <image src="../../static/orderDetail/technician6-1.png"
|
||||||
style="width: 45rpx;height: 45rpx;position: relative;top: 4upx;" v-else></image> -->
|
style="width: 45rpx;height: 45rpx;position: relative;top: 4upx;" v-else></image> -->
|
||||||
</view>
|
</view>
|
||||||
|
<view class="keyuyue">
|
||||||
</view>
|
<view class="flex">
|
||||||
</view>
|
<image class="timea-img" src="../../static/timea.png" mode=""></image>
|
||||||
<view class="oder-mian-qing" @click="shangxian" v-if="order.status == 2">请TA上线</view>
|
<view class="timea-fu">{{order.status == 1?"可服务":"休息中"}}</view>
|
||||||
<view class="oder-mian-guan" :class="[isFollow?'activeG':'activeQ']" @click="guanzhu(order)">
|
<view class="timea-time" v-if="order.status == 1">{{order.time}}</view>
|
||||||
<!--+ 关注-->
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -230,7 +228,7 @@
|
||||||
<view class="popup-content">
|
<view class="popup-content">
|
||||||
<view class="popup-head">
|
<view class="popup-head">
|
||||||
<span>打赏技师</span>
|
<span>打赏技师</span>
|
||||||
<span @click="closePopup(type)">x</span>
|
<span @click="closePopup(type)"><image style="width: 50rpx; height: 50rpx;" src="../../static/close.png" mode=""></image></span>
|
||||||
</view>
|
</view>
|
||||||
<view class="popup-mian">
|
<view class="popup-mian">
|
||||||
<view class="popup-mian-textarea">
|
<view class="popup-mian-textarea">
|
||||||
|
@ -692,9 +690,9 @@
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
.headset-text2{
|
.headset-text2{
|
||||||
background: linear-gradient(90deg, #bd6ed4, #9533b8);
|
background: linear-gradient(90deg, #f8f8f8, #dfdfdf);
|
||||||
font-size: 22rpx;
|
font-size: 22rpx;
|
||||||
color: #f6dcff;
|
color: #333;
|
||||||
height: 30rpx;
|
height: 30rpx;
|
||||||
line-height: 30rpx;
|
line-height: 30rpx;
|
||||||
border-radius:5rpx 30rpx 30rpx 30rpx;
|
border-radius:5rpx 30rpx 30rpx 30rpx;
|
||||||
|
@ -837,7 +835,7 @@
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
margin-top: 10px;
|
margin-top: 40rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.popup-mian{
|
.popup-mian{
|
||||||
|
@ -853,8 +851,6 @@
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 24px;
|
font-size: 24px;
|
||||||
color: #15AB8D;
|
color: #15AB8D;
|
||||||
border-radius: 50%;
|
|
||||||
border: 1px solid #15AB8D;
|
|
||||||
}
|
}
|
||||||
.popup-head span:nth-child(1){
|
.popup-head span:nth-child(1){
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
@ -891,20 +887,27 @@
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
}
|
}
|
||||||
.oder-mian-guan{
|
.oder-mian-guan{
|
||||||
width: 65rpx;
|
width: 116rpx;
|
||||||
height: 65rpx;
|
height: 50rpx;
|
||||||
|
border-radius: 30rpx;
|
||||||
|
font-size: 24rpx;
|
||||||
}
|
}
|
||||||
.activeQ{
|
.activeQ{
|
||||||
background: url('../../static/orderDetail/technician7-1.png');
|
background: url('../../static/follow.png') 14rpx 8rpx;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-size: 100% 100%;
|
background-size:28rpx 28rpx;
|
||||||
padding: 10rpx;
|
line-height: 48rpx;
|
||||||
|
text-indent:46rpx;
|
||||||
|
border: 1px solid #999999;
|
||||||
}
|
}
|
||||||
.activeG{
|
.activeG{
|
||||||
background: url('../../static/orderDetail/technician7.png');
|
background:#2dbe93 url('../../static/follow2.png') 14rpx 8rpx;
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-size: 100% 100%;
|
background-size:28rpx 28rpx;
|
||||||
padding: 10rpx;
|
line-height: 48rpx;
|
||||||
|
text-indent:46rpx;
|
||||||
|
border: 1px solid #2dbe93;
|
||||||
|
color:#ffffff;
|
||||||
}
|
}
|
||||||
.oder-mian-qing{
|
.oder-mian-qing{
|
||||||
width: 70px;
|
width: 70px;
|
||||||
|
@ -987,20 +990,20 @@
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
background: #ffede8;
|
background: linear-gradient(90deg, #ffe0d8, #ffe0d8, #eaeaea);
|
||||||
border-radius: 30rpx;
|
border-radius: 30rpx;
|
||||||
height: 56rpx;
|
height:46rpx;
|
||||||
padding: 0 12rpx;
|
padding: 0 10rpx;
|
||||||
}
|
}
|
||||||
.shouchang-img{
|
.shouchang-img{
|
||||||
width: 50rpx;
|
width: 30rpx;
|
||||||
height:50rpx;
|
height:30rpx;
|
||||||
padding: 10rpx;
|
margin-right: 5rpx;
|
||||||
}
|
}
|
||||||
.shouchang-text{
|
.shouchang-text{
|
||||||
color: #ff7e5b;
|
color: #ff6942;
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
padding: 0 15rpx 0 0 ;
|
padding: 0 12rpx 0 0 ;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.xiangmu-cont-top-left{
|
.xiangmu-cont-top-left{
|
||||||
|
@ -1046,7 +1049,6 @@
|
||||||
font-size: 25rpx;
|
font-size: 25rpx;
|
||||||
}
|
}
|
||||||
.xiangmu-foot-left-dazhe{
|
.xiangmu-foot-left-dazhe{
|
||||||
font-weight: bold;
|
|
||||||
font-size: 31rpx;
|
font-size: 31rpx;
|
||||||
color: #848484;
|
color: #848484;
|
||||||
text-decoration-line: line-through;
|
text-decoration-line: line-through;
|
||||||
|
@ -1215,7 +1217,6 @@
|
||||||
color: #666666;margin-right: 3px;
|
color: #666666;margin-right: 3px;
|
||||||
}
|
}
|
||||||
.oder-mian-left span:nth-child(3){
|
.oder-mian-left span:nth-child(3){
|
||||||
font-size: 26rpx;
|
|
||||||
color: #019c88;
|
color: #019c88;
|
||||||
}
|
}
|
||||||
.oder-mian-left{
|
.oder-mian-left{
|
||||||
|
@ -1348,17 +1349,34 @@
|
||||||
height: 662rpx;
|
height: 662rpx;
|
||||||
}
|
}
|
||||||
.keyuyue{
|
.keyuyue{
|
||||||
height: 20px;
|
width: 200rpx;
|
||||||
|
height: 42rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
background: linear-gradient(90deg, #fee9ca, #fde4c6);
|
border: 1px #2dbe93 solid;
|
||||||
border: 1px #decbae solid;
|
border-radius: 20rpx 30rpx 30rpx 20rpx;
|
||||||
border-radius: 30rpx 30rpx 30rpx 2rpx;
|
|
||||||
padding: 3rpx 18rpx;
|
|
||||||
color:#8d500f;
|
color:#8d500f;
|
||||||
font-size: 22rpx;
|
font-size: 22rpx;
|
||||||
margin-left: 15rpx;
|
margin-left: 6rpx;
|
||||||
|
}
|
||||||
|
.timea-img{
|
||||||
|
background:#2dbe93 url('../../static/timea.png');
|
||||||
|
width: 40rpx;
|
||||||
|
height: 40rpx;
|
||||||
|
border-radius: 8rpx 0 0 8rpx;
|
||||||
|
}
|
||||||
|
.timea-fu{
|
||||||
|
font-size: 22rpx;
|
||||||
|
color: #2dbe93;
|
||||||
|
line-height: 44rpx;
|
||||||
|
margin-left: 8rpx;
|
||||||
|
}
|
||||||
|
.timea-time{
|
||||||
|
font-size: 24rpx;
|
||||||
|
color: #029d88;
|
||||||
|
line-height: 44rpx;
|
||||||
|
|
||||||
}
|
}
|
||||||
.order-sname{
|
.order-sname{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 4.1 KiB |
Binary file not shown.
After Width: | Height: | Size: 4.0 KiB |
Loading…
Reference in New Issue