This commit is contained in:
parent
a3fa35c240
commit
af5d650a01
|
@ -187,7 +187,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="flex justify-between add-lin">
|
<view class="flex justify-between add-lin">
|
||||||
<view class="add-con-title">优惠券</view>
|
<view class="add-con-title">优惠券</view>
|
||||||
<view class="add-con-cont" style="color: #F93731;font-size: 30rpx;font-weight: bold;" v-if="order.couponMoney">-¥{{order.couponMoney}}</view>
|
<view class="add-con-cont" style="color: #F93731;font-weight: bold;" v-if="order.couponMoney">-¥{{order.couponMoney}}</view>
|
||||||
<view class="" v-else>-</view>
|
<view class="" v-else>-</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="jusitify-line-end"></view>
|
<view class="jusitify-line-end"></view>
|
||||||
|
@ -197,7 +197,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="flex justify-between add-lin">
|
<view class="flex justify-between add-lin">
|
||||||
<view class="add-con-title">订单费用:</view>
|
<view class="add-con-title">订单费用:</view>
|
||||||
<view class="add-con-cont">¥<text style="font-size: 26rpx; font-weight: bold;">{{order.priceMarkup}}</text></view>
|
<view class="add-con-cont">¥<text style=" font-weight: bold;">{{order.priceMarkup}}</text></view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="flex justify-between add-lin">
|
<view class="flex justify-between add-lin">
|
||||||
|
@ -421,7 +421,6 @@
|
||||||
class="btns">
|
class="btns">
|
||||||
服务升级
|
服务升级
|
||||||
</u-button>
|
</u-button>
|
||||||
|
|
||||||
<u-button
|
<u-button
|
||||||
v-if="order.addNum ==null&&order.ordersMassageList[0].massageType"
|
v-if="order.addNum ==null&&order.ordersMassageList[0].massageType"
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
|
@ -438,29 +437,28 @@
|
||||||
</u-button>
|
</u-button>
|
||||||
</view>
|
</view>
|
||||||
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
|
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
|
||||||
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
|
<view :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
|
||||||
class="btns">联系客服</u-button>
|
class="eject-btns">联系客服</view>
|
||||||
<u-button @click="cancelOrder(order)" shape="circle" class="btns" :hair-line="false">
|
<view :custom-style="customStyle2" @click="cancelOrder(order)" shape="circle" class="eject-btns" :hair-line="false">
|
||||||
取消订单
|
取消订单
|
||||||
</u-button>
|
</view>
|
||||||
<u-button
|
<view
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId,)"
|
@click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId,)"
|
||||||
class="btns">
|
class="eject-btns">
|
||||||
充值
|
充值
|
||||||
</u-button>
|
</view>
|
||||||
<u-button :custom-style="customStyle2"
|
<view :custom-style="customStyle2"
|
||||||
shape="circle" :plain="true"
|
shape="circle" :plain="true"
|
||||||
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
|
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
|
||||||
class="btns">
|
class="eject-btns">
|
||||||
去投诉
|
去投诉
|
||||||
</u-button>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="showBtn tabber" v-if="order.status ==7">
|
<view class="showBtn tabber" v-if="order.status ==7">
|
||||||
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
|
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
|
||||||
>
|
|
||||||
取消订单
|
取消订单
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button
|
<u-button
|
||||||
|
@ -491,8 +489,7 @@
|
||||||
class="btns">联系客服</u-button>
|
class="btns">联系客服</u-button>
|
||||||
</view>
|
</view>
|
||||||
<view class="showBtn tabber" v-if="order.status ==9">
|
<view class="showBtn tabber" v-if="order.status ==9">
|
||||||
<u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
|
<u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
|
||||||
>
|
|
||||||
取消订单
|
取消订单
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button v-if="order.refusalContent" :custom-style="customStyle2"
|
<u-button v-if="order.refusalContent" :custom-style="customStyle2"
|
||||||
|
@ -505,8 +502,7 @@
|
||||||
class="btns">联系客服</u-button>
|
class="btns">联系客服</u-button>
|
||||||
</view>
|
</view>
|
||||||
<view class="showBtn tabber" v-if="order.status ==10">
|
<view class="showBtn tabber" v-if="order.status ==10">
|
||||||
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
|
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"S>
|
||||||
>
|
|
||||||
取消订单
|
取消订单
|
||||||
</u-button>
|
</u-button>
|
||||||
<u-button :custom-style="customStyle2"
|
<u-button :custom-style="customStyle2"
|
||||||
|
@ -653,7 +649,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"></image></span>
|
||||||
</view>
|
</view>
|
||||||
<view class="popup-mian">
|
<view class="popup-mian">
|
||||||
<textarea placeholder="请输入提前结束服务原因" @input="textareaInp" class="popup-mian-textarea" name="" id="" cols="30" rows="10"></textarea>
|
<textarea placeholder="请输入提前结束服务原因" @input="textareaInp" class="popup-mian-textarea" name="" id="" cols="30" rows="10"></textarea>
|
||||||
|
@ -716,8 +712,7 @@
|
||||||
loading: true,
|
loading: true,
|
||||||
customStyle: {
|
customStyle: {
|
||||||
backgroundColor: '#ffffff',
|
backgroundColor: '#ffffff',
|
||||||
border:' 1px solid #999',
|
color: '',
|
||||||
color: '#333',
|
|
||||||
|
|
||||||
// #ifdef MP-WEIXIN
|
// #ifdef MP-WEIXIN
|
||||||
width: "310upx",
|
width: "310upx",
|
||||||
|
@ -729,8 +724,9 @@
|
||||||
margin: '0 10upx',
|
margin: '0 10upx',
|
||||||
},
|
},
|
||||||
customStyle2: {
|
customStyle2: {
|
||||||
backgroundColor: '',
|
backgroundColor: '#ffffff',
|
||||||
color: '#fff',
|
border: '1px solid #ffffff',
|
||||||
|
color: '#333',
|
||||||
// #ifdef MP-WEIXIN
|
// #ifdef MP-WEIXIN
|
||||||
width: "310upx",
|
width: "310upx",
|
||||||
// #endif
|
// #endif
|
||||||
|
@ -2347,6 +2343,9 @@
|
||||||
|
|
||||||
/deep/.u-size-default{
|
/deep/.u-size-default{
|
||||||
width: 85px !important;
|
width: 85px !important;
|
||||||
|
height:34rpx;
|
||||||
|
line-height: 34rpx;
|
||||||
|
font-size: 28rpx;
|
||||||
}
|
}
|
||||||
/deep/.padding-bottom{
|
/deep/.padding-bottom{
|
||||||
padding-bottom: 20rpx;
|
padding-bottom: 20rpx;
|
||||||
|
@ -2357,7 +2356,7 @@
|
||||||
}
|
}
|
||||||
.xiangmu-cont-top-left{
|
.xiangmu-cont-top-left{
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
font-size: 21rpx;
|
font-size: 23rpx;
|
||||||
color: #049E89;
|
color: #049E89;
|
||||||
margin-top: 1px;
|
margin-top: 1px;
|
||||||
}
|
}
|
||||||
|
@ -2398,8 +2397,7 @@
|
||||||
font-size: 25rpx;
|
font-size: 25rpx;
|
||||||
}
|
}
|
||||||
.xiangmu-foot-left-dazhe{
|
.xiangmu-foot-left-dazhe{
|
||||||
font-weight: bold;
|
font-size: 30rpx;
|
||||||
font-size: 31rpx;
|
|
||||||
color: #848484;
|
color: #848484;
|
||||||
text-decoration-line: line-through;
|
text-decoration-line: line-through;
|
||||||
margin-left:5px;
|
margin-left:5px;
|
||||||
|
@ -2497,12 +2495,6 @@
|
||||||
.popup-head span:nth-child(2){
|
.popup-head span:nth-child(2){
|
||||||
width: 50rpx;
|
width: 50rpx;
|
||||||
height: 50rpx;
|
height: 50rpx;
|
||||||
line-height: 19px;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 24px;
|
|
||||||
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;
|
||||||
|
@ -2530,6 +2522,15 @@
|
||||||
/deep/.btns{
|
/deep/.btns{
|
||||||
color: #666 !important;
|
color: #666 !important;
|
||||||
margin-left: 10rpx !important;
|
margin-left: 10rpx !important;
|
||||||
|
border: 1px solid #ffffff !important;
|
||||||
|
}
|
||||||
|
.eject-btns{
|
||||||
|
height:60rpx;
|
||||||
|
line-height: 60rpx;
|
||||||
|
border-bottom: 1px solid #f7f7f7;
|
||||||
|
padding: 0 20rpx;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
/deep/.u-size-default{
|
/deep/.u-size-default{
|
||||||
// margin: 5px 0px 0px 0px;
|
// margin: 5px 0px 0px 0px;
|
||||||
|
@ -2547,17 +2548,33 @@
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
color: #7D7D7D;
|
color: #7D7D7D;
|
||||||
margin-left: 20rpx;
|
margin-left: 26rpx;
|
||||||
}
|
}
|
||||||
.showBtn-view{
|
.showBtn-view{
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
background-color: #f2f2f2;
|
background-color: #ffffff;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
margin-bottom: 230px;
|
bottom:90rpx;
|
||||||
left:0
|
left:50rpx;
|
||||||
|
box-shadow: 0px 0px 3px 0px #b5b5b5;
|
||||||
|
border-radius: 10rpx;
|
||||||
|
}
|
||||||
|
.showBtn-view:before {
|
||||||
|
position: absolute;
|
||||||
|
left: 20rpx;
|
||||||
|
bottom:-12rpx;
|
||||||
|
width: 20rpx;
|
||||||
|
height: 20rpx;
|
||||||
|
background: #ffffff;
|
||||||
|
margin-top: -2px;
|
||||||
|
border-right: 1px solid #e5e5e5;
|
||||||
|
border-bottom: 1px solid #e5e5e5;
|
||||||
|
transform: rotate(45deg);
|
||||||
|
-webkit-transform: rotate(45deg);
|
||||||
|
content: '';
|
||||||
}
|
}
|
||||||
.showBtn{
|
.showBtn{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
Loading…
Reference in New Issue